diff options
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | NEWS | 4 | ||||
| -rwxr-xr-x | configure | 154 | ||||
| -rw-r--r-- | configure.ac | 40 | ||||
| -rw-r--r-- | data/Makefile.in | 1 | ||||
| -rw-r--r-- | data/appdata/Makefile.in | 1 | ||||
| -rw-r--r-- | data/icons/Makefile.in | 1 | ||||
| -rw-r--r-- | help/Makefile.in | 1 | ||||
| -rw-r--r-- | po/ru.po | 13 | ||||
| -rw-r--r-- | po/zh_HK.po | 12 | ||||
| -rw-r--r-- | src/Makefile.in | 1 | ||||
| -rw-r--r-- | src/autosave-manager.c | 68 | ||||
| -rw-r--r-- | src/book-view.c | 2 | ||||
| -rw-r--r-- | src/book.c | 142 | ||||
| -rw-r--r-- | src/page-view.c | 2 | ||||
| -rw-r--r-- | src/page.c | 42 | ||||
| -rw-r--r-- | src/scanner.c | 106 | ||||
| -rw-r--r-- | src/simple-scan.c | 148 | ||||
| -rw-r--r-- | src/ui.c | 2873 |
19 files changed, 2082 insertions, 1530 deletions
diff --git a/Makefile.in b/Makefile.in index 568fb37..eb5a76e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -317,6 +317,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -1,3 +1,7 @@ +Overview of changes in simple-scan 3.19.2 + + * Make colord/packagekit support able to be explicitly disabled + Overview of changes in simple-scan 3.19.1 * Make PackageKit support optional @@ -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.19.1. +# Generated by GNU Autoconf 2.69 for simple-scan 3.19.2. # # # 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.19.1' -PACKAGE_STRING='simple-scan 3.19.1' +PACKAGE_VERSION='3.19.2' +PACKAGE_STRING='simple-scan 3.19.2' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -813,6 +813,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -839,6 +840,8 @@ enable_silent_rules enable_maintainer_mode enable_dependency_tracking enable_schemas_compile +enable_colord +enable_packagekit with_help_dir enable_nls ' @@ -900,6 +903,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1152,6 +1156,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1289,7 +1302,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1402,7 +1415,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.19.1 to adapt to many kinds of systems. +\`configure' configures simple-scan 3.19.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1442,6 +1455,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1468,7 +1482,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of simple-scan 3.19.1:";; + short | recursive ) echo "Configuration of simple-scan 3.19.2:";; esac cat <<\_ACEOF @@ -1487,6 +1501,8 @@ Optional Features: speeds up one-time build --disable-schemas-compile Disable regeneration of gschemas.compiled on install + --enable-colord Enable colord support[[default=auto]] + --enable-packagekit Enable packagekit support[[default=auto]] --disable-nls do not use Native Language Support Optional Packages: @@ -1588,7 +1604,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -simple-scan configure 3.19.1 +simple-scan configure 3.19.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1840,7 +1856,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.19.1, which was +It was created by simple-scan $as_me 3.19.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2703,7 +2719,7 @@ fi # Define the identity of the package. PACKAGE='simple-scan' - VERSION='3.19.1' + VERSION='3.19.2' cat >>confdefs.h <<_ACEOF @@ -4417,6 +4433,15 @@ $as_echo "yes" >&6; } fi +# Check whether --enable-colord was given. +if test "${enable_colord+set}" = set; then : + enableval=$enable_colord; enable_colord=$enableval +else + enable_colord=auto +fi + +have_colord=no +if test x"$enable_colord" != "xno"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for COLORD" >&5 @@ -4427,17 +4452,17 @@ if test -n "$COLORD_CFLAGS"; then elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" - colord -\""; } >&5 + colord + \""; } >&5 ($PKG_CONFIG --exists --print-errors " - colord -") 2>&5 + colord + ") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_COLORD_CFLAGS=`$PKG_CONFIG --cflags " - colord -" 2>/dev/null` + colord + " 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -4450,17 +4475,17 @@ if test -n "$COLORD_LIBS"; then elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" - colord -\""; } >&5 + colord + \""; } >&5 ($PKG_CONFIG --exists --print-errors " - colord -") 2>&5 + colord + ") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_COLORD_LIBS=`$PKG_CONFIG --libs " - colord -" 2>/dev/null` + colord + " 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -4482,21 +4507,33 @@ else fi if test $_pkg_short_errors_supported = yes; then COLORD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " - colord -" 2>&1` + colord + " 2>&1` else COLORD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " - colord -" 2>&1` + colord + " 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$COLORD_PKG_ERRORS" >&5 - have_colord=no + if test x"$enable_colord" = xauto; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "--enable-colord was given, but could not be found +See \`config.log' for more details" "$LINENO" 5; } + fi + elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - have_colord=no + if test x"$enable_colord" = xauto; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "--enable-colord was given, but could not be found +See \`config.log' for more details" "$LINENO" 5; } + fi + else COLORD_CFLAGS=$pkg_cv_COLORD_CFLAGS COLORD_LIBS=$pkg_cv_COLORD_LIBS @@ -4504,6 +4541,7 @@ else $as_echo "yes" >&6; } have_colord=yes fi +fi if test $have_colord = yes; then HAVE_COLORD_TRUE= HAVE_COLORD_FALSE='#' @@ -4513,6 +4551,15 @@ else fi +# Check whether --enable-packagekit was given. +if test "${enable_packagekit+set}" = set; then : + enableval=$enable_packagekit; enable_packagekit=$enableval +else + enable_packagekit=auto +fi + +have_packagekit=no +if test x"$enable_packagekit" != "xno"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PACKAGEKIT" >&5 @@ -4523,17 +4570,17 @@ if test -n "$PACKAGEKIT_CFLAGS"; then elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" - packagekit-glib2 -\""; } >&5 + packagekit-glib2 + \""; } >&5 ($PKG_CONFIG --exists --print-errors " - packagekit-glib2 -") 2>&5 + packagekit-glib2 + ") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PACKAGEKIT_CFLAGS=`$PKG_CONFIG --cflags " - packagekit-glib2 -" 2>/dev/null` + packagekit-glib2 + " 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -4546,17 +4593,17 @@ if test -n "$PACKAGEKIT_LIBS"; then elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" - packagekit-glib2 -\""; } >&5 + packagekit-glib2 + \""; } >&5 ($PKG_CONFIG --exists --print-errors " - packagekit-glib2 -") 2>&5 + packagekit-glib2 + ") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PACKAGEKIT_LIBS=`$PKG_CONFIG --libs " - packagekit-glib2 -" 2>/dev/null` + packagekit-glib2 + " 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -4578,21 +4625,33 @@ else fi if test $_pkg_short_errors_supported = yes; then PACKAGEKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " - packagekit-glib2 -" 2>&1` + packagekit-glib2 + " 2>&1` else PACKAGEKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " - packagekit-glib2 -" 2>&1` + packagekit-glib2 + " 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$PACKAGEKIT_PKG_ERRORS" >&5 - have_packagekit=no + if test x"$enable_packagekit" = xauto; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "--enable-packagekit was given, but could not be found +See \`config.log' for more details" "$LINENO" 5; } + fi + elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - have_packagekit=no + if test x"$enable_packagekit" = xauto; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "--enable-packagekit was given, but could not be found +See \`config.log' for more details" "$LINENO" 5; } + fi + else PACKAGEKIT_CFLAGS=$pkg_cv_PACKAGEKIT_CFLAGS PACKAGEKIT_LIBS=$pkg_cv_PACKAGEKIT_LIBS @@ -4600,6 +4659,7 @@ else $as_echo "yes" >&6; } have_packagekit=yes fi +fi if test $have_packagekit = yes; then HAVE_PACKAGEKIT_TRUE= HAVE_PACKAGEKIT_FALSE='#' @@ -6467,7 +6527,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.19.1, which was +This file was extended by simple-scan $as_me 3.19.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6524,7 +6584,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.19.1 +simple-scan config.status 3.19.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 80dd44a..b299882 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.19.1) +AC_INIT(simple-scan, 3.19.2) AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign]) AM_SILENT_RULES([yes]) AM_MAINTAINER_MODE @@ -31,14 +31,40 @@ PKG_CHECK_MODULES(SIMPLE_SCAN, [ gusb ]) -PKG_CHECK_MODULES(COLORD, [ - colord -], have_colord=yes, have_colord=no) +AC_ARG_ENABLE([colord], + AS_HELP_STRING([--enable-colord], + [Enable colord support[[default=auto]]]), + [enable_colord=$enableval], + [enable_colord=auto]) +have_colord=no +if test x"$enable_colord" != "xno"; then + PKG_CHECK_MODULES(COLORD, [ + colord + ], + [have_colord=yes], + [if test x"$enable_colord" = xauto; then + AC_MSG_FAILURE([--enable-colord was given, but could not be found]) + fi + ]) +fi AM_CONDITIONAL(HAVE_COLORD, test $have_colord = yes) -PKG_CHECK_MODULES(PACKAGEKIT, [ - packagekit-glib2 -], have_packagekit=yes, have_packagekit=no) +AC_ARG_ENABLE([packagekit], + AS_HELP_STRING([--enable-packagekit], + [Enable packagekit support[[default=auto]]]), + [enable_packagekit=$enableval], + [enable_packagekit=auto]) +have_packagekit=no +if test x"$enable_packagekit" != "xno"; then + PKG_CHECK_MODULES(PACKAGEKIT, [ + packagekit-glib2 + ], + [have_packagekit=yes], + [if test x"$enable_packagekit" = xauto; then + AC_MSG_FAILURE([--enable-packagekit was given, but could not be found]) + fi + ]) +fi AM_CONDITIONAL(HAVE_PACKAGEKIT, test $have_packagekit = yes) AC_CHECK_HEADERS([sane/sane.h],[],[AC_MSG_ERROR([SANE not found])]) diff --git a/data/Makefile.in b/data/Makefile.in index a2aa206..5d380ac 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -329,6 +329,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/data/appdata/Makefile.in b/data/appdata/Makefile.in index 8f862fb..5bc8036 100644 --- a/data/appdata/Makefile.in +++ b/data/appdata/Makefile.in @@ -266,6 +266,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in index 953ee81..b3e2fec 100644 --- a/data/icons/Makefile.in +++ b/data/icons/Makefile.in @@ -236,6 +236,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/help/Makefile.in b/help/Makefile.in index 88af88b..053b070 100644 --- a/help/Makefile.in +++ b/help/Makefile.in @@ -236,6 +236,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: simple-scan\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2015-09-29 11:41+1300\n" -"PO-Revision-Date: 2015-09-02 21:09+0000\n" -"Last-Translator: Alexandre Prokoudine <alexandre.prokoudine@gmail.com>\n" +"PO-Revision-Date: 2015-11-01 17:49+0000\n" +"Last-Translator: Sandro <Unknown>\n" "Language-Team: Russian <ru@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n" -"X-Generator: Launchpad (build 17812)\n" +"X-Launchpad-Export-Date: 2015-11-02 05:16+0000\n" +"X-Generator: Launchpad (build 17838)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -672,6 +672,7 @@ msgstr "" " Oleg https://launchpad.net/~oleg-devyatilov\n" " Oleg Koptev https://launchpad.net/~koptev-oleg\n" " Pavel Nazarov https://launchpad.net/~alsvartr\n" +" Sandro https://launchpad.net/~regipool\n" " Sergey Loshakov https://launchpad.net/~sergeylo\n" " Sergey Sedov https://launchpad.net/~serg-sedov\n" " Stanislav Bazhenov https://launchpad.net/~stanislav-bajenov\n" @@ -776,7 +777,7 @@ msgstr "Не удалось установить драйверы." #: ../src/ui.vala:1677 #, c-format msgid "You need to install the %s package(s)." -msgstr "" +msgstr "Необходимо установить пакет(-ы) %s." #. Preferences dialog: Label for default resolution in resolution list #: ../src/ui.vala:1775 @@ -838,7 +839,7 @@ msgstr "Сменить _сканер" #. Button in error infobar to prompt user to install drivers #: ../src/ui.vala:1882 msgid "_Install Drivers" -msgstr "" +msgstr "_Установить драйверы" #. Combo box value for automatic paper size #: ../src/ui.vala:1888 diff --git a/po/zh_HK.po b/po/zh_HK.po index 7b970f5..0783126 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.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-09-29 11:41+1300\n" -"PO-Revision-Date: 2015-10-03 17:18+0000\n" +"PO-Revision-Date: 2015-11-08 20:18+0000\n" "Last-Translator: Roy Chan <roy.chan@linux.org.hk>\n" "Language-Team: Chinese (Hong Kong) <zh_HK@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-10-20 05:15+0000\n" -"X-Generator: Launchpad (build 17812)\n" +"X-Launchpad-Export-Date: 2015-11-09 05:11+0000\n" +"X-Generator: Launchpad (build 17838)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -275,7 +275,7 @@ msgstr "掃描面：" #. Label beside page size combo box #: ../data/simple-scan.ui.h:99 msgid "Page Size:" -msgstr "" +msgstr "頁面大小：" #. Label beside brightness scale #: ../data/simple-scan.ui.h:101 @@ -471,7 +471,7 @@ msgstr "關閉(_C)" #: ../src/ui.vala:326 #, c-format msgid "Username and password required to access '%s'" -msgstr "" +msgstr "需要提供使用者名稱和密碼以存取 '%s'" #. Warning displayed when no scanners are detected #: ../src/ui.vala:374 @@ -544,7 +544,7 @@ msgstr "檔案格式：" #. Title of error dialog when save failed #: ../src/ui.vala:649 msgid "Failed to save file" -msgstr "" +msgstr "儲存檔案失敗" #. Text in dialog warning when a document is about to be lost #: ../src/ui.vala:672 diff --git a/src/Makefile.in b/src/Makefile.in index cf77ad8..451e4ff 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -301,6 +301,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/src/autosave-manager.c b/src/autosave-manager.c index 6542f8c..779f501 100644 --- a/src/autosave-manager.c +++ b/src/autosave-manager.c @@ -1,4 +1,4 @@ -/* autosave-manager.c generated by valac 0.28.1, the Vala compiler +/* autosave-manager.c generated by valac 0.30.0, the Vala compiler * generated from autosave-manager.vala, do not modify */ /* @@ -277,11 +277,11 @@ void autosave_manager_load (AutosaveManager* self) { #line 72 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 280 "autosave-manager.c" - goto __catch28_g_error; + goto __catch29_g_error; } } - goto __finally28; - __catch28_g_error: + goto __finally29; + __catch29_g_error: { GError* e = NULL; GError* _tmp6_ = NULL; @@ -313,7 +313,7 @@ void autosave_manager_load (AutosaveManager* self) { return; #line 314 "autosave-manager.c" } - __finally28: + __finally29: #line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" @@ -721,11 +721,11 @@ void autosave_manager_load (AutosaveManager* self) { #line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 723 "autosave-manager.c" - goto __catch29_g_error; + goto __catch30_g_error; } } - goto __finally29; - __catch29_g_error: + goto __finally30; + __catch30_g_error: { GError* e = NULL; #line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" @@ -756,7 +756,7 @@ void autosave_manager_load (AutosaveManager* self) { continue; #line 757 "autosave-manager.c" } - __finally29: + __finally30: #line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" @@ -914,7 +914,7 @@ static gchar* autosave_manager_get_value (AutosaveManager* self, GKeyFile* file, #line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 916 "autosave-manager.c" - goto __catch30_g_error; + goto __catch31_g_error; } #line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" _tmp5_ = _tmp0_; @@ -928,8 +928,8 @@ static gchar* autosave_manager_get_value (AutosaveManager* self, GKeyFile* file, return result; #line 929 "autosave-manager.c" } - goto __finally30; - __catch30_g_error: + goto __finally31; + __catch31_g_error: { GError* e = NULL; const gchar* _tmp6_ = NULL; @@ -950,7 +950,7 @@ static gchar* autosave_manager_get_value (AutosaveManager* self, GKeyFile* file, return result; #line 951 "autosave-manager.c" } - __finally30: + __finally31: #line 159 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 159 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" @@ -992,7 +992,7 @@ static gint autosave_manager_get_integer (AutosaveManager* self, GKeyFile* file, #line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 994 "autosave-manager.c" - goto __catch31_g_error; + goto __catch32_g_error; } #line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" result = _tmp0_; @@ -1000,8 +1000,8 @@ static gint autosave_manager_get_integer (AutosaveManager* self, GKeyFile* file, return result; #line 1001 "autosave-manager.c" } - goto __finally31; - __catch31_g_error: + goto __finally32; + __catch32_g_error: { GError* e = NULL; gint _tmp5_ = 0; @@ -1019,7 +1019,7 @@ static gint autosave_manager_get_integer (AutosaveManager* self, GKeyFile* file, return result; #line 1020 "autosave-manager.c" } - __finally31: + __finally32: #line 171 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 171 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" @@ -1061,7 +1061,7 @@ static gboolean autosave_manager_get_boolean (AutosaveManager* self, GKeyFile* f #line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1063 "autosave-manager.c" - goto __catch32_g_error; + goto __catch33_g_error; } #line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" result = _tmp0_; @@ -1069,8 +1069,8 @@ static gboolean autosave_manager_get_boolean (AutosaveManager* self, GKeyFile* f return result; #line 1070 "autosave-manager.c" } - goto __finally32; - __catch32_g_error: + goto __finally33; + __catch33_g_error: { GError* e = NULL; gboolean _tmp5_ = FALSE; @@ -1088,7 +1088,7 @@ static gboolean autosave_manager_get_boolean (AutosaveManager* self, GKeyFile* f return result; #line 1089 "autosave-manager.c" } - __finally32: + __finally33: #line 183 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 183 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" @@ -1136,7 +1136,7 @@ void autosave_manager_cleanup (AutosaveManager* self) { #line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1138 "autosave-manager.c" - goto __catch33_g_error; + goto __catch34_g_error; } #line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" _tmp5_ = _tmp2_; @@ -1150,8 +1150,8 @@ void autosave_manager_cleanup (AutosaveManager* self) { _g_dir_close0 (_tmp2_); #line 1151 "autosave-manager.c" } - goto __finally33; - __catch33_g_error: + goto __finally34; + __catch34_g_error: { GError* e = NULL; GError* _tmp6_ = NULL; @@ -1174,7 +1174,7 @@ void autosave_manager_cleanup (AutosaveManager* self) { return; #line 1175 "autosave-manager.c" } - __finally33: + __finally34: #line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" @@ -1984,17 +1984,17 @@ static void autosave_manager_real_save (AutosaveManager* self) { #line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" _tmp115_ = _tmp114_; #line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" - g_file_set_contents (_tmp112_, _tmp115_, (gssize) (-1), &_inner_error_); + g_file_set_contents (_tmp112_, _tmp115_, (gssize) -1, &_inner_error_); #line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" _g_free0 (_tmp115_); #line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1992 "autosave-manager.c" - goto __catch34_g_error; + goto __catch35_g_error; } } - goto __finally34; - __catch34_g_error: + goto __finally35; + __catch35_g_error: { GError* e = NULL; GError* _tmp116_ = NULL; @@ -2013,7 +2013,7 @@ static void autosave_manager_real_save (AutosaveManager* self) { _g_error_free0 (e); #line 2014 "autosave-manager.c" } - __finally34: + __finally35: #line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" @@ -2102,11 +2102,11 @@ static void autosave_manager_save_pixels (AutosaveManager* self, Page* page) { #line 354 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2104 "autosave-manager.c" - goto __catch35_g_error; + goto __catch36_g_error; } } - goto __finally35; - __catch35_g_error: + goto __finally36; + __catch36_g_error: { GError* e = NULL; GError* _tmp14_ = NULL; @@ -2125,7 +2125,7 @@ static void autosave_manager_save_pixels (AutosaveManager* self, Page* page) { _g_error_free0 (e); #line 2126 "autosave-manager.c" } - __finally35: + __finally36: #line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" diff --git a/src/book-view.c b/src/book-view.c index 9514351..94d1929 100644 --- a/src/book-view.c +++ b/src/book-view.c @@ -1,4 +1,4 @@ -/* book-view.c generated by valac 0.28.1, the Vala compiler +/* book-view.c generated by valac 0.30.0, the Vala compiler * generated from book-view.vala, do not modify */ /* @@ -1,4 +1,4 @@ -/* book.c generated by valac 0.28.1, the Vala compiler +/* book.c generated by valac 0.30.0, the Vala compiler * generated from book.vala, do not modify */ /* @@ -832,33 +832,33 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start gunichar _tmp1_ = 0U; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 930 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 930 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 931 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 931 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp0_ = start_index; -#line 931 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 931 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp1_ = c; -#line 931 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) (-1), _tmp1_); -#line 931 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 931 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" + _tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_); +#line 931 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 933 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 933 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp3_ = _result_; -#line 933 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 933 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { #line 850 "book.c" gchar* _tmp4_ = NULL; -#line 934 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 934 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 934 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 934 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" result = (gint) (_tmp4_ - ((gchar*) self)); -#line 934 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 934 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" return result; #line 858 "book.c" } else { -#line 936 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 936 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" result = -1; -#line 936 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 936 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" return result; #line 864 "book.c" } @@ -882,103 +882,103 @@ static gchar* string_slice (const gchar* self, glong start, glong end) { glong _tmp19_ = 0L; glong _tmp20_ = 0L; gchar* _tmp21_ = NULL; -#line 1230 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1230 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1231 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1231 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1231 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1231 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1231 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1231 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1232 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1232 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp2_ = start; -#line 1232 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1232 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" if (_tmp2_ < ((glong) 0)) { #line 898 "book.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; -#line 1233 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1233 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1233 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1233 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp4_ = start; -#line 1233 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1233 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" start = _tmp3_ + _tmp4_; #line 907 "book.c" } -#line 1235 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1235 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1235 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1235 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" if (_tmp5_ < ((glong) 0)) { #line 913 "book.c" glong _tmp6_ = 0L; glong _tmp7_ = 0L; -#line 1236 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1236 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp6_ = string_length; -#line 1236 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1236 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp7_ = end; -#line 1236 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1236 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" end = _tmp6_ + _tmp7_; #line 922 "book.c" } -#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp9_ = start; -#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" if (_tmp9_ >= ((glong) 0)) { #line 928 "book.c" glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp10_ = start; -#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp11_ = string_length; -#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp8_ = _tmp10_ <= _tmp11_; #line 937 "book.c" } else { -#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp8_ = FALSE; #line 941 "book.c" } -#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp8_, NULL); -#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp13_ = end; -#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" if (_tmp13_ >= ((glong) 0)) { #line 949 "book.c" glong _tmp14_ = 0L; glong _tmp15_ = 0L; -#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp14_ = end; -#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ <= _tmp15_; #line 958 "book.c" } else { -#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 962 "book.c" } -#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_, NULL); -#line 1240 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1240 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp16_ = start; -#line 1240 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1240 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp17_ = end; -#line 1240 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1240 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1241 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp18_ = start; -#line 1241 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp19_ = end; -#line 1241 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp20_ = start; -#line 1241 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1241 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" result = _tmp21_; -#line 1241 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" return result; #line 984 "book.c" } @@ -4902,47 +4902,47 @@ static gchar* string_to_utf8 (const gchar* self, int* result_length1) { gint _tmp6_ = 0; gchar* _tmp7_ = NULL; gint _tmp7__length1 = 0; -#line 1307 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1307 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1308 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1308 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1308 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp2_ = g_new0 (gchar, _tmp1_ + 1); -#line 1308 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 1308 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _result__length1 = _tmp1_ + 1; -#line 1308 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" __result__size_ = _result__length1; -#line 1309 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1309 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp3_ = _result__length1; -#line 1309 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1309 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _result__length1 = _tmp3_ - 1; -#line 1310 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1310 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 1310 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1310 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp4__length1 = _result__length1; -#line 1310 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1310 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp5_ = strlen (self); -#line 1310 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1310 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp6_ = _tmp5_; -#line 1310 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1310 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" memcpy (_tmp4_, self, (gsize) _tmp6_); -#line 1311 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp7_ = _result_; -#line 1311 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp7__length1 = _result__length1; -#line 1311 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" if (result_length1) { -#line 1311 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" *result_length1 = _tmp7__length1; #line 4942 "book.c" } -#line 1311 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" result = _tmp7_; -#line 1311 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" return result; #line 4948 "book.c" } diff --git a/src/page-view.c b/src/page-view.c index 102fb15..c8d7cbb 100644 --- a/src/page-view.c +++ b/src/page-view.c @@ -1,4 +1,4 @@ -/* page-view.c generated by valac 0.28.1, the Vala compiler +/* page-view.c generated by valac 0.30.0, the Vala compiler * generated from page-view.vala, do not modify */ /* @@ -1,4 +1,4 @@ -/* page.c generated by valac 0.28.1, the Vala compiler +/* page.c generated by valac 0.30.0, the Vala compiler * generated from page.vala, do not modify */ /* @@ -2711,47 +2711,47 @@ static gchar* string_to_utf8 (const gchar* self, int* result_length1) { gint _tmp6_ = 0; gchar* _tmp7_ = NULL; gint _tmp7__length1 = 0; -#line 1307 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1307 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1308 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1308 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1308 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp2_ = g_new0 (gchar, _tmp1_ + 1); -#line 1308 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 1308 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _result__length1 = _tmp1_ + 1; -#line 1308 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" __result__size_ = _result__length1; -#line 1309 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1309 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp3_ = _result__length1; -#line 1309 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1309 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _result__length1 = _tmp3_ - 1; -#line 1310 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1310 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 1310 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1310 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp4__length1 = _result__length1; -#line 1310 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1310 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp5_ = strlen (self); -#line 1310 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1310 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp6_ = _tmp5_; -#line 1310 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1310 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" memcpy (_tmp4_, self, (gsize) _tmp6_); -#line 1311 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp7_ = _result_; -#line 1311 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp7__length1 = _result__length1; -#line 1311 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" if (result_length1) { -#line 1311 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" *result_length1 = _tmp7__length1; #line 2751 "page.c" } -#line 1311 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" result = _tmp7_; -#line 1311 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" return result; #line 2757 "page.c" } diff --git a/src/scanner.c b/src/scanner.c index 740d99f..8c8f493 100644 --- a/src/scanner.c +++ b/src/scanner.c @@ -1,4 +1,4 @@ -/* scanner.c generated by valac 0.28.1, the Vala compiler +/* scanner.c generated by valac 0.30.0, the Vala compiler * generated from scanner.vala, do not modify */ /* @@ -4421,17 +4421,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) { gboolean result = FALSE; const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 1278 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1278 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1278 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1278 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1279 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1279 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp0_ = needle; -#line 1279 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1279 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1279 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1279 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" result = _tmp1_ != NULL; -#line 1279 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1279 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" return result; #line 4437 "scanner.c" } @@ -4738,11 +4738,11 @@ static gchar* sane_status_to_string (SANE_Status status) { static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { gchar* result = NULL; GError * _inner_error_ = NULL; -#line 1282 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1282 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1282 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1282 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1282 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1282 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); #line 4748 "scanner.c" { @@ -4757,73 +4757,73 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* const gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; -#line 1284 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp0_ = old; -#line 1284 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp1_ = g_regex_escape_string (_tmp0_, -1); -#line 1284 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp2_ = _tmp1_; -#line 1284 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_); -#line 1284 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp4_ = _tmp3_; -#line 1284 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _g_free0 (_tmp2_); -#line 1284 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" regex = _tmp4_; -#line 1284 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1284 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { #line 4779 "scanner.c" goto __catch15_g_regex_error; } -#line 1284 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1284 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1284 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" return NULL; #line 4788 "scanner.c" } -#line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp6_ = regex; -#line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp7_ = replacement; -#line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) (-1), 0, _tmp7_, 0, &_inner_error_); -#line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" + _tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_); +#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_; -#line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { #line 4804 "scanner.c" goto __catch15_g_regex_error; } -#line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" return NULL; #line 4815 "scanner.c" } -#line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp9_ = _tmp5_; -#line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp5_ = NULL; -#line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" result = _tmp9_; -#line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _g_free0 (_tmp5_); -#line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" return result; #line 4829 "scanner.c" } @@ -4831,24 +4831,24 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* __catch15_g_regex_error: { GError* e = NULL; -#line 1283 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1283 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1283 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1283 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1287 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1287 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1283 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1283 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _g_error_free0 (e); #line 4843 "scanner.c" } __finally15: -#line 1283 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1283 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1283 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1283 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1283 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1283 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1283 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1283 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" return NULL; #line 4854 "scanner.c" } @@ -6274,15 +6274,15 @@ static gchar string_get (const gchar* self, glong index) { gchar result = '\0'; glong _tmp0_ = 0L; gchar _tmp1_ = '\0'; -#line 996 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 996 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, '\0'); -#line 997 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 997 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp0_ = index; -#line 997 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 997 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp1_ = ((gchar*) self)[_tmp0_]; -#line 997 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 997 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" result = _tmp1_; -#line 997 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 997 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" return result; #line 6282 "scanner.c" } diff --git a/src/simple-scan.c b/src/simple-scan.c index 739fd00..07f8d96 100644 --- a/src/simple-scan.c +++ b/src/simple-scan.c @@ -1,4 +1,4 @@ -/* simple-scan.c generated by valac 0.28.1, the Vala compiler +/* simple-scan.c generated by valac 0.30.0, the Vala compiler * generated from simple-scan.vala, do not modify */ /* @@ -325,11 +325,11 @@ static void simple_scan_scanner_failed_cb (SimpleScan* self, Scanner* scanner, g static void _simple_scan_scanner_failed_cb_scanner_scan_failed (Scanner* _sender, gint error_code, const gchar* error_string, gpointer self); static void simple_scan_scanner_scanning_changed_cb (SimpleScan* self, Scanner* scanner); static void _simple_scan_scanner_scanning_changed_cb_scanner_scanning_changed (Scanner* _sender, gpointer self); -static void ___lambda20_ (SimpleScan* self); +static void ___lambda22_ (SimpleScan* self); void scanner_redetect (Scanner* self); -static void ____lambda20__g_usb_context_device_added (GUsbContext* _sender, GUsbDevice* device, gpointer self); -static void ___lambda21_ (SimpleScan* self); -static void ____lambda21__g_usb_context_device_removed (GUsbContext* _sender, GUsbDevice* device, gpointer self); +static void ____lambda22__g_usb_context_device_added (GUsbContext* _sender, GUsbDevice* device, gpointer self); +static void ___lambda23_ (SimpleScan* self); +static void ____lambda23__g_usb_context_device_removed (GUsbContext* _sender, GUsbDevice* device, gpointer self); void user_interface_set_scan_devices (UserInterface* self, GList* devices, const gchar* missing_driver); void user_interface_set_selected_device (UserInterface* self, const gchar* value); static void _scan_device_unref0_ (gpointer var); @@ -535,7 +535,7 @@ static void _simple_scan_scanner_scanning_changed_cb_scanner_scanning_changed (S } -static void ___lambda20_ (SimpleScan* self) { +static void ___lambda22_ (SimpleScan* self) { Scanner* _tmp0_ = NULL; #line 68 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" _tmp0_ = self->priv->scanner; @@ -545,14 +545,14 @@ static void ___lambda20_ (SimpleScan* self) { } -static void ____lambda20__g_usb_context_device_added (GUsbContext* _sender, GUsbDevice* device, gpointer self) { +static void ____lambda22__g_usb_context_device_added (GUsbContext* _sender, GUsbDevice* device, gpointer self) { #line 68 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" - ___lambda20_ ((SimpleScan*) self); + ___lambda22_ ((SimpleScan*) self); #line 552 "simple-scan.c" } -static void ___lambda21_ (SimpleScan* self) { +static void ___lambda23_ (SimpleScan* self) { Scanner* _tmp0_ = NULL; #line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" _tmp0_ = self->priv->scanner; @@ -562,9 +562,9 @@ static void ___lambda21_ (SimpleScan* self) { } -static void ____lambda21__g_usb_context_device_removed (GUsbContext* _sender, GUsbDevice* device, gpointer self) { +static void ____lambda23__g_usb_context_device_removed (GUsbContext* _sender, GUsbDevice* device, gpointer self) { #line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" - ___lambda21_ ((SimpleScan*) self); + ___lambda23_ ((SimpleScan*) self); #line 569 "simple-scan.c" } @@ -712,11 +712,11 @@ static void simple_scan_real_startup (GApplication* base) { #line 68 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" _tmp21_ = self->priv->usb_context; #line 68 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" - g_signal_connect_object (_tmp21_, "device-added", (GCallback) ____lambda20__g_usb_context_device_added, self, 0); + g_signal_connect_object (_tmp21_, "device-added", (GCallback) ____lambda22__g_usb_context_device_added, self, 0); #line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" _tmp22_ = self->priv->usb_context; #line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" - g_signal_connect_object (_tmp22_, "device-removed", (GCallback) ____lambda21__g_usb_context_device_removed, self, 0); + g_signal_connect_object (_tmp22_, "device-removed", (GCallback) ____lambda23__g_usb_context_device_removed, self, 0); #line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" _g_object_unref0 (_tmp18_); #line 723 "simple-scan.c" @@ -973,13 +973,13 @@ static void _g_free0_ (gpointer var) { static gint g_ptr_array_get_length (GPtrArray* self) { gint result; guint _tmp0_ = 0U; -#line 4428 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 4442 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 4428 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 4442 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp0_ = self->len; -#line 4428 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 4442 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" result = (gint) _tmp0_; -#line 4428 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 4442 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" return result; #line 985 "simple-scan.c" } @@ -987,11 +987,11 @@ static gint g_ptr_array_get_length (GPtrArray* self) { static void g_ptr_array_set_length (GPtrArray* self, gint value) { gint _tmp0_ = 0; -#line 4429 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 4443 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_return_if_fail (self != NULL); -#line 4429 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 4443 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp0_ = value; -#line 4429 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 4443 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_ptr_array_set_size (self, _tmp0_); #line 997 "simple-scan.c" } @@ -3022,37 +3022,37 @@ static glong string_strnlen (gchar* str, glong maxlen) { glong _tmp1_ = 0L; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 1197 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1197 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp0_ = str; -#line 1197 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1197 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp1_ = maxlen; -#line 1197 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1197 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1197 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1197 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" end = _tmp2_; -#line 1198 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1198 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp3_ = end; -#line 1198 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1198 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" if (_tmp3_ == NULL) { #line 3037 "simple-scan.c" glong _tmp4_ = 0L; -#line 1199 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1199 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp4_ = maxlen; -#line 1199 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1199 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" result = _tmp4_; -#line 1199 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1199 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" return result; #line 3045 "simple-scan.c" } else { gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; -#line 1201 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1201 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1201 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1201 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp6_ = str; -#line 1201 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1201 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" result = (glong) (_tmp5_ - _tmp6_); -#line 1201 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1201 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" return result; #line 3057 "simple-scan.c" } @@ -3072,112 +3072,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { glong _tmp20_ = 0L; glong _tmp21_ = 0L; gchar* _tmp22_ = NULL; -#line 1208 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1208 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1210 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp1_ = offset; -#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1210 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" if (_tmp1_ >= ((glong) 0)) { #line 3081 "simple-scan.c" glong _tmp2_ = 0L; -#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1210 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp2_ = len; -#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1210 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp0_ = _tmp2_ >= ((glong) 0); #line 3087 "simple-scan.c" } else { -#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1210 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp0_ = FALSE; #line 3091 "simple-scan.c" } -#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1210 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" if (_tmp0_) { #line 3095 "simple-scan.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; glong _tmp5_ = 0L; -#line 1212 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1212 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp3_ = offset; -#line 1212 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1212 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp4_ = len; -#line 1212 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1212 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1212 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1212 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" string_length = _tmp5_; #line 3107 "simple-scan.c" } else { gint _tmp6_ = 0; gint _tmp7_ = 0; -#line 1214 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1214 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp6_ = strlen (self); -#line 1214 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1214 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp7_ = _tmp6_; -#line 1214 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1214 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" string_length = (glong) _tmp7_; #line 3117 "simple-scan.c" } -#line 1217 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1217 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp8_ = offset; -#line 1217 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1217 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" if (_tmp8_ < ((glong) 0)) { #line 3123 "simple-scan.c" glong _tmp9_ = 0L; glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1218 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1218 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp9_ = string_length; -#line 1218 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1218 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp10_ = offset; -#line 1218 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1218 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" offset = _tmp9_ + _tmp10_; -#line 1219 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1219 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp11_ = offset; -#line 1219 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1219 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); #line 3137 "simple-scan.c" } else { glong _tmp12_ = 0L; glong _tmp13_ = 0L; -#line 1221 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1221 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp12_ = offset; -#line 1221 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1221 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp13_ = string_length; -#line 1221 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1221 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); #line 3147 "simple-scan.c" } -#line 1223 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1223 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp14_ = len; -#line 1223 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1223 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" if (_tmp14_ < ((glong) 0)) { #line 3153 "simple-scan.c" glong _tmp15_ = 0L; glong _tmp16_ = 0L; -#line 1224 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1224 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1224 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1224 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp16_ = offset; -#line 1224 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1224 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" len = _tmp15_ - _tmp16_; #line 3162 "simple-scan.c" } -#line 1226 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1226 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp17_ = offset; -#line 1226 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1226 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp18_ = len; -#line 1226 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1226 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp19_ = string_length; -#line 1226 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1226 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1227 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1227 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp20_ = offset; -#line 1227 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1227 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp21_ = len; -#line 1227 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1227 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1227 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1227 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" result = _tmp22_; -#line 1227 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1227 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" return result; #line 3182 "simple-scan.c" } @@ -3410,7 +3410,7 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) { #line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" _tmp33_ = _tmp32_->str; #line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" - _tmp34_ = string_substring (_tmp33_, (glong) 1, (glong) (-1)); + _tmp34_ = string_substring (_tmp33_, (glong) 1, (glong) -1); #line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" _tmp35_ = _tmp34_; #line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" @@ -3462,7 +3462,7 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) { #line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" _tmp43_ = _tmp42_->str; #line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" - _tmp44_ = string_substring (_tmp43_, (glong) 2, (glong) (-1)); + _tmp44_ = string_substring (_tmp43_, (glong) 2, (glong) -1); #line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" _tmp45_ = _tmp44_; #line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" @@ -3670,7 +3670,7 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) { #line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" _tmp89_ = _tmp88_->str; #line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" - _tmp90_ = string_substring (_tmp89_, (glong) 2, (glong) (-1)); + _tmp90_ = string_substring (_tmp89_, (glong) 2, (glong) -1); #line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" _tmp91_ = _tmp90_; #line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala" @@ -1,4 +1,4 @@ -/* ui.c generated by valac 0.28.1, the Vala compiler +/* ui.c generated by valac 0.30.0, the Vala compiler * generated from ui.vala, do not modify */ /* @@ -25,6 +25,7 @@ #include <math.h> #include <cairo.h> #include <gdk-pixbuf/gdk-pixbuf.h> +#include "packagekit-glib2/packagekit.h" #include <glib/gstdio.h> #include <unistd.h> @@ -138,6 +139,9 @@ typedef struct _Block2Data Block2Data; typedef struct _PageIcon PageIcon; typedef struct _PageIconClass PageIconClass; #define _cairo_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_destroy (var), NULL))) +typedef struct _Block3Data Block3Data; +#define _g_ptr_array_unref0(var) ((var == NULL) ? NULL : (var = (g_ptr_array_unref (var), NULL))) +typedef struct _UserInterfaceInstallPackagesData UserInterfaceInstallPackagesData; #define _g_key_file_unref0(var) ((var == NULL) ? NULL : (var = (g_key_file_unref (var), NULL))) typedef struct _ProgressBarDialogPrivate ProgressBarDialogPrivate; typedef struct _PageIconPrivate PageIconPrivate; @@ -305,6 +309,87 @@ struct _Block2Data { GtkWindow* dialog; }; +struct _Block3Data { + int _ref_count_; + UserInterface* self; + GtkStack* stack; + GtkSpinner* spinner; + GtkLabel* status_label; + GtkLabel* instructions_label; +}; + +struct _UserInterfaceInstallPackagesData { + int _state_; + GObject* _source_object_; + GAsyncResult* _res_; + GSimpleAsyncResult* _async_result; + UserInterface* self; + gchar** packages; + gint packages_length1; + PkProgressCallback progress_callback; + gpointer progress_callback_target; + PkResults* result; + PkTask* task; + PkTask* _tmp0_; + PkResults* results; + PkResults* _tmp1_; + PkTask* _tmp2_; + gchar** _tmp3_; + gint _tmp3__length1; + PkProgressCallback _tmp4_; + void* _tmp4__target; + PkResults* _tmp5_; + PkResults* _tmp6_; + gboolean _tmp7_; + PkResults* _tmp8_; + PkResults* _tmp9_; + PkError* _tmp10_; + PkError* _tmp11_; + GPtrArray* package_array; + PkResults* _tmp12_; + GPtrArray* _tmp13_; + gchar** package_ids; + GPtrArray* _tmp14_; + gint _tmp15_; + gint _tmp16_; + gchar** _tmp17_; + gint package_ids_length1; + gint _package_ids_size_; + gchar** _tmp18_; + gint _tmp18__length1; + GPtrArray* _tmp19_; + gint _tmp20_; + gint _tmp21_; + gchar* _tmp22_; + gint i; + gboolean _tmp23_; + gint _tmp24_; + gint _tmp25_; + GPtrArray* _tmp26_; + gint _tmp27_; + gint _tmp28_; + gchar** _tmp29_; + gint _tmp29__length1; + gint _tmp30_; + GPtrArray* _tmp31_; + gpointer* _tmp32_; + gint _tmp32__length1; + gint _tmp33_; + PkPackage* _tmp34_; + const gchar* _tmp35_; + gchar* _tmp36_; + gchar* _tmp37_; + PkResults* _tmp38_; + PkTask* _tmp39_; + gchar** _tmp40_; + gint _tmp40__length1; + PkProgressCallback _tmp41_; + void* _tmp41__target; + PkResults* _tmp42_; + PkResults* _tmp43_; + GError * _inner_error_; +}; + struct _ProgressBarDialog { GtkWindow parent_instance; ProgressBarDialogPrivate * priv; @@ -605,6 +690,17 @@ static gboolean user_interface_simple_scan_window_configure_event_cb (UserInterf static gboolean _user_interface_simple_scan_window_configure_event_cb_gtk_widget_configure_event (GtkWidget* _sender, GdkEventConfigure* event, gpointer self); static void user_interface_info_bar_response_cb (UserInterface* self, GtkInfoBar* widget, gint response_id); static void user_interface_install_drivers (UserInterface* self); +static Block3Data* block3_data_ref (Block3Data* _data3_); +static void block3_data_unref (void * _userdata_); +static void user_interface_install_packages (UserInterface* self, gchar** packages, int packages_length1, PkProgressCallback progress_callback, void* progress_callback_target, GAsyncReadyCallback _callback_, gpointer _user_data_); +static PkResults* user_interface_install_packages_finish (UserInterface* self, GAsyncResult* _res_, GError** error); +static void ___lambda12_ (UserInterface* self); +static void ____lambda12__pk_progress_callback (PkProgress* progress, PkProgressType type, gpointer self); +static void ___lambda13_ (Block3Data* _data3_, GObject* object, GAsyncResult* _result_); +static void ____lambda13__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self); +static void user_interface_install_packages_data_free (gpointer _data); +static gboolean user_interface_install_packages_co (UserInterfaceInstallPackagesData* _data_); +static void user_interface_install_packages_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); static gboolean user_interface_simple_scan_window_window_state_event_cb (UserInterface* self, GtkWidget* widget, GdkEventWindowState* event); static gboolean _user_interface_simple_scan_window_window_state_event_cb_gtk_widget_window_state_event (GtkWidget* _sender, GdkEventWindowState* event, gpointer self); static gboolean user_interface_window_delete_event_cb (UserInterface* self, GtkWidget* widget, GdkEventAny* event); @@ -617,23 +713,23 @@ static void _user_interface_page_scan_direction_changed_cb_page_scan_direction_c static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* combo, gint default_dpi, gint current_dpi); static gboolean user_interface_is_desktop (UserInterface* self, const gchar* name); static void _user_interface_info_bar_response_cb_gtk_info_bar_response (GtkInfoBar* _sender, gint response_id, gpointer self); -static void __lambda12_ (UserInterface* self); -static void ___lambda12__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self); -static void __lambda13_ (UserInterface* self); -static void ___lambda13__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self); static void __lambda14_ (UserInterface* self); static void ___lambda14__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self); static void __lambda15_ (UserInterface* self); static void ___lambda15__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self); -void user_interface_set_brightness (UserInterface* self, gint value); static void __lambda16_ (UserInterface* self); -static void ___lambda16__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self); -void user_interface_set_contrast (UserInterface* self, gint value); +static void ___lambda16__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self); static void __lambda17_ (UserInterface* self); -static void ___lambda17__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self); -void user_interface_set_quality (UserInterface* self, gint value); +static void ___lambda17__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self); +void user_interface_set_brightness (UserInterface* self, gint value); static void __lambda18_ (UserInterface* self); static void ___lambda18__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self); +void user_interface_set_contrast (UserInterface* self, gint value); +static void __lambda19_ (UserInterface* self); +static void ___lambda19__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self); +void user_interface_set_quality (UserInterface* self, gint value); +static void __lambda20_ (UserInterface* self); +static void ___lambda20__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self); BookView* book_view_new (Book* book); BookView* book_view_construct (GType object_type, Book* book); static void _user_interface_page_selected_cb_book_view_page_selected (BookView* _sender, Page* page, gpointer self); @@ -650,8 +746,8 @@ static gboolean user_interface_state_get_boolean (UserInterface* self, GKeyFile* static gchar* user_interface_state_get_string (UserInterface* self, GKeyFile* f, const gchar* group_name, const gchar* key, const gchar* _default_); static gboolean ___lambda11_ (UserInterface* self); static gboolean ____lambda11__gsource_func (gpointer self); -static gboolean ___lambda19_ (UserInterface* self); -static gboolean ____lambda19__gsource_func (gpointer self); +static gboolean ___lambda21_ (UserInterface* self); +static gboolean ____lambda21__gsource_func (gpointer self); void progress_bar_dialog_set_fraction (ProgressBarDialog* self, gdouble value); void progress_bar_dialog_set_message (ProgressBarDialog* self, const gchar* value); void user_interface_start (UserInterface* self); @@ -695,98 +791,98 @@ static const GActionEntry USER_INTERFACE_action_entries[10] = {{"new_document", static void _user_interface_page_added_cb_book_page_added (Book* _sender, Page* page, gpointer self) { #line 287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_page_added_cb ((UserInterface*) self, _sender, page); -#line 699 "ui.c" +#line 795 "ui.c" } static void _user_interface_reordered_cb_book_reordered (Book* _sender, gpointer self) { #line 288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_reordered_cb ((UserInterface*) self, _sender); -#line 706 "ui.c" +#line 802 "ui.c" } static void _user_interface_page_removed_cb_book_page_removed (Book* _sender, Page* page, gpointer self) { #line 289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_page_removed_cb ((UserInterface*) self, _sender, page); -#line 713 "ui.c" +#line 809 "ui.c" } static void _user_interface_new_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_new_document_activate_cb ((UserInterface*) self); -#line 720 "ui.c" +#line 816 "ui.c" } static void _user_interface_reorder_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_reorder_document_activate_cb ((UserInterface*) self); -#line 727 "ui.c" +#line 823 "ui.c" } static void _user_interface_save_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_save_document_activate_cb ((UserInterface*) self); -#line 734 "ui.c" +#line 830 "ui.c" } static void _user_interface_save_as_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_save_as_document_activate_cb ((UserInterface*) self); -#line 741 "ui.c" +#line 837 "ui.c" } static void _user_interface_email_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_email_document_activate_cb ((UserInterface*) self); -#line 748 "ui.c" +#line 844 "ui.c" } static void _user_interface_print_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_print_document_activate_cb ((UserInterface*) self); -#line 755 "ui.c" +#line 851 "ui.c" } static void _user_interface_preferences_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_preferences_activate_cb ((UserInterface*) self); -#line 762 "ui.c" +#line 858 "ui.c" } static void _user_interface_help_contents_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_help_contents_activate_cb ((UserInterface*) self); -#line 769 "ui.c" +#line 865 "ui.c" } static void _user_interface_about_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_about_activate_cb ((UserInterface*) self); -#line 776 "ui.c" +#line 872 "ui.c" } static void _user_interface_quit_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_quit_activate_cb ((UserInterface*) self); -#line 783 "ui.c" +#line 879 "ui.c" } static void _user_interface_needs_saving_cb_book_needs_saving_changed (Book* _sender, gpointer self) { #line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_needs_saving_cb ((UserInterface*) self, _sender); -#line 790 "ui.c" +#line 886 "ui.c" } @@ -864,7 +960,7 @@ UserInterface* user_interface_construct (GType object_type) { _tmp13_ = _tmp12_; #line 276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp13_ == ((guint) 0)) { -#line 868 "ui.c" +#line 964 "ui.c" Book* _tmp14_ = NULL; #line 278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_add_default_page (self); @@ -872,7 +968,7 @@ UserInterface* user_interface_construct (GType object_type) { _tmp14_ = self->priv->_book; #line 279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" book_set_needs_saving (_tmp14_, FALSE); -#line 876 "ui.c" +#line 972 "ui.c" } else { BookView* _tmp15_ = NULL; Book* _tmp16_ = NULL; @@ -890,18 +986,18 @@ UserInterface* user_interface_construct (GType object_type) { book_view_set_selected_page (_tmp15_, _tmp18_); #line 282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _page_unref0 (_tmp18_); -#line 894 "ui.c" +#line 990 "ui.c" } #line 260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return self; -#line 898 "ui.c" +#line 994 "ui.c" } UserInterface* user_interface_new (void) { #line 260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return user_interface_construct (TYPE_USER_INTERFACE); -#line 905 "ui.c" +#line 1001 "ui.c" } @@ -926,14 +1022,14 @@ static gboolean user_interface_find_scan_device (UserInterface* self, const gcha _vala_iter = _tmp1_; #line 296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp2_) { -#line 930 "ui.c" +#line 1026 "ui.c" { gboolean _tmp3_ = FALSE; #line 298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp3_ = TRUE; #line 298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" while (TRUE) { -#line 937 "ui.c" +#line 1033 "ui.c" gchar* d = NULL; GtkListStore* _tmp8_ = NULL; GtkTreeIter _tmp9_ = {0}; @@ -941,14 +1037,14 @@ static gboolean user_interface_find_scan_device (UserInterface* self, const gcha const gchar* _tmp11_ = NULL; #line 298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (!_tmp3_) { -#line 945 "ui.c" +#line 1041 "ui.c" gboolean _tmp4_ = FALSE; gboolean _tmp5_ = FALSE; #line 304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp5_ = have_iter; #line 304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (!_tmp5_) { -#line 952 "ui.c" +#line 1048 "ui.c" GtkListStore* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; #line 304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -957,17 +1053,17 @@ static gboolean user_interface_find_scan_device (UserInterface* self, const gcha _tmp7_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp6_, &_vala_iter); #line 304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp4_ = _tmp7_; -#line 961 "ui.c" +#line 1057 "ui.c" } else { #line 304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp4_ = FALSE; -#line 965 "ui.c" +#line 1061 "ui.c" } #line 304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (!_tmp4_) { #line 304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 971 "ui.c" +#line 1067 "ui.c" } } #line 298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -986,11 +1082,11 @@ static gboolean user_interface_find_scan_device (UserInterface* self, const gcha if (g_strcmp0 (_tmp10_, _tmp11_) == 0) { #line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" have_iter = TRUE; -#line 990 "ui.c" +#line 1086 "ui.c" } #line 298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _g_free0 (d); -#line 994 "ui.c" +#line 1090 "ui.c" } } } @@ -1000,11 +1096,11 @@ static gboolean user_interface_find_scan_device (UserInterface* self, const gcha if (iter) { #line 307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" *iter = _vala_iter; -#line 1004 "ui.c" +#line 1100 "ui.c" } #line 307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 1008 "ui.c" +#line 1104 "ui.c" } @@ -1042,7 +1138,7 @@ static void user_interface_show_error_dialog (UserInterface* self, const gchar* gtk_widget_destroy ((GtkWidget*) dialog); #line 310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _g_object_unref0 (dialog); -#line 1046 "ui.c" +#line 1142 "ui.c" } @@ -1133,21 +1229,21 @@ void user_interface_authorize (UserInterface* self, const gchar* resource, gchar if (username) { #line 323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" *username = _vala_username; -#line 1137 "ui.c" +#line 1233 "ui.c" } else { #line 323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _g_free0 (_vala_username); -#line 1141 "ui.c" +#line 1237 "ui.c" } #line 323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (password) { #line 323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" *password = _vala_password; -#line 1147 "ui.c" +#line 1243 "ui.c" } else { #line 323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _g_free0 (_vala_password); -#line 1151 "ui.c" +#line 1247 "ui.c" } } @@ -1168,7 +1264,7 @@ static void user_interface_device_combo_changed_cb (UserInterface* self, GtkWidg if (_tmp0_) { #line 344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return; -#line 1172 "ui.c" +#line 1268 "ui.c" } #line 345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" self->priv->user_selected_device = TRUE; @@ -1184,7 +1280,7 @@ static void user_interface_device_combo_changed_cb (UserInterface* self, GtkWidg _g_free0 (_tmp3_); #line 346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp4_) { -#line 1188 "ui.c" +#line 1284 "ui.c" GSettings* _tmp5_ = NULL; gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; @@ -1201,7 +1297,7 @@ static void user_interface_device_combo_changed_cb (UserInterface* self, GtkWidg g_settings_set_string (_tmp5_, "selected-device", _tmp8_); #line 347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _g_free0 (_tmp8_); -#line 1205 "ui.c" +#line 1301 "ui.c" } } @@ -1209,7 +1305,7 @@ static void user_interface_device_combo_changed_cb (UserInterface* self, GtkWidg static void _user_interface_device_combo_changed_cb_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_device_combo_changed_cb ((UserInterface*) self, _sender); -#line 1213 "ui.c" +#line 1309 "ui.c" } @@ -1251,7 +1347,7 @@ static void user_interface_update_info_bar (UserInterface* self) { _tmp0_ = self->priv->have_error; #line 358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp0_) { -#line 1255 "ui.c" +#line 1351 "ui.c" gchar* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; @@ -1288,7 +1384,7 @@ static void user_interface_update_info_bar (UserInterface* self) { _tmp6_ = self->priv->error_change_scanner_hint; #line 365 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" show_change_scanner_button = _tmp6_; -#line 1292 "ui.c" +#line 1388 "ui.c" } else { GtkListStore* _tmp7_ = NULL; gint _tmp8_ = 0; @@ -1298,7 +1394,7 @@ static void user_interface_update_info_bar (UserInterface* self) { _tmp8_ = gtk_tree_model_iter_n_children ((GtkTreeModel*) _tmp7_, NULL); #line 367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp8_ == 0) { -#line 1302 "ui.c" +#line 1398 "ui.c" gchar* _tmp9_ = NULL; const gchar* _tmp10_ = NULL; #line 369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -1313,7 +1409,7 @@ static void user_interface_update_info_bar (UserInterface* self) { _tmp10_ = self->priv->missing_driver; #line 371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp10_ == NULL) { -#line 1317 "ui.c" +#line 1413 "ui.c" const gchar* _tmp11_ = NULL; gchar* _tmp12_ = NULL; const gchar* _tmp13_ = NULL; @@ -1334,7 +1430,7 @@ static void user_interface_update_info_bar (UserInterface* self) { _g_free0 (text); #line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" text = _tmp14_; -#line 1338 "ui.c" +#line 1434 "ui.c" } else { const gchar* _tmp15_ = NULL; gchar* _tmp16_ = NULL; @@ -1358,7 +1454,7 @@ static void user_interface_update_info_bar (UserInterface* self) { text = _tmp18_; #line 384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" show_install_button = TRUE; -#line 1362 "ui.c" +#line 1458 "ui.c" } } else { GtkInfoBar* _tmp19_ = NULL; @@ -1374,7 +1470,7 @@ static void user_interface_update_info_bar (UserInterface* self) { _g_free0 (title); #line 390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return; -#line 1378 "ui.c" +#line 1474 "ui.c" } } #line 393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -1433,14 +1529,14 @@ static void user_interface_update_info_bar (UserInterface* self) { _g_free0 (text); #line 350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _g_free0 (title); -#line 1437 "ui.c" +#line 1533 "ui.c" } static gpointer _scan_device_ref0 (gpointer self) { #line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return self ? scan_device_ref (self) : NULL; -#line 1444 "ui.c" +#line 1540 "ui.c" } @@ -1471,7 +1567,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const _tmp2_ = self->priv->user_selected_device; #line 414 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp2_) { -#line 1475 "ui.c" +#line 1571 "ui.c" GtkComboBox* _tmp3_ = NULL; gint _tmp4_ = 0; gint _tmp5_ = 0; @@ -1483,13 +1579,13 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const _tmp5_ = _tmp4_; #line 415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" have_selection = _tmp5_ >= 0; -#line 1487 "ui.c" +#line 1583 "ui.c" } #line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" index = 0; #line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp6_ = devices; -#line 1493 "ui.c" +#line 1589 "ui.c" { GList* device_collection = NULL; GList* device_it = NULL; @@ -1497,14 +1593,14 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const device_collection = _tmp6_; #line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" for (device_it = device_collection; device_it != NULL; device_it = device_it->next) { -#line 1501 "ui.c" +#line 1597 "ui.c" ScanDevice* _tmp7_ = NULL; ScanDevice* device = NULL; #line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp7_ = _scan_device_ref0 ((ScanDevice*) device_it->data); #line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" device = _tmp7_; -#line 1508 "ui.c" +#line 1604 "ui.c" { gint n_delete = 0; GtkListStore* _tmp8_ = NULL; @@ -1525,18 +1621,18 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const iter = _tmp10_; #line 424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp11_) { -#line 1529 "ui.c" +#line 1625 "ui.c" gint i = 0; #line 426 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" i = 0; -#line 1533 "ui.c" +#line 1629 "ui.c" { gboolean _tmp12_ = FALSE; #line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp12_ = TRUE; #line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" while (TRUE) { -#line 1540 "ui.c" +#line 1636 "ui.c" gchar* name = NULL; gboolean matched = FALSE; GtkListStore* _tmp15_ = NULL; @@ -1548,7 +1644,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const gint _tmp22_ = 0; #line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (!_tmp12_) { -#line 1552 "ui.c" +#line 1648 "ui.c" GtkListStore* _tmp13_ = NULL; gboolean _tmp14_ = FALSE; #line 441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -1559,7 +1655,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const if (!_tmp14_) { #line 441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 1563 "ui.c" +#line 1659 "ui.c" } } #line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -1582,7 +1678,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const _tmp20_ = matched; #line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp20_) { -#line 1586 "ui.c" +#line 1682 "ui.c" gint _tmp21_ = 0; #line 437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp21_ = i; @@ -1592,7 +1688,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const _g_free0 (name); #line 438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 1596 "ui.c" +#line 1692 "ui.c" } #line 440 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp22_ = i; @@ -1600,7 +1696,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const i = _tmp22_ + 1; #line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _g_free0 (name); -#line 1604 "ui.c" +#line 1700 "ui.c" } } } @@ -1608,7 +1704,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const _tmp23_ = n_delete; #line 445 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp23_ >= 0) { -#line 1612 "ui.c" +#line 1708 "ui.c" gint i = 0; GtkListStore* _tmp24_ = NULL; GtkTreeIter _tmp25_ = {0}; @@ -1624,7 +1720,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const _tmp27_ = _tmp26_->label; #line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_list_store_set (_tmp24_, &_tmp25_, 1, _tmp27_, -1, -1); -#line 1628 "ui.c" +#line 1724 "ui.c" { gboolean _tmp28_ = FALSE; #line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -1633,7 +1729,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const _tmp28_ = TRUE; #line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" while (TRUE) { -#line 1637 "ui.c" +#line 1733 "ui.c" gint _tmp30_ = 0; gint _tmp31_ = 0; GtkListStore* _tmp32_ = NULL; @@ -1643,13 +1739,13 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const GtkTreeIter _tmp36_ = {0}; #line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (!_tmp28_) { -#line 1647 "ui.c" +#line 1743 "ui.c" gint _tmp29_ = 0; #line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp29_ = i; #line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" i = _tmp29_ + 1; -#line 1653 "ui.c" +#line 1749 "ui.c" } #line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp28_ = FALSE; @@ -1661,7 +1757,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const if (!(_tmp30_ < _tmp31_)) { #line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 1665 "ui.c" +#line 1761 "ui.c" } #line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp32_ = self->priv->device_model; @@ -1677,7 +1773,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const _tmp36_ = iter; #line 455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_list_store_remove (_tmp35_, &_tmp36_); -#line 1681 "ui.c" +#line 1777 "ui.c" } } } else { @@ -1712,7 +1808,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const _tmp45_ = _tmp44_->label; #line 461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_list_store_set (_tmp40_, &_tmp41_, 0, _tmp43_, 1, _tmp45_, -1, -1); -#line 1716 "ui.c" +#line 1812 "ui.c" } #line 463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp46_ = index; @@ -1720,13 +1816,13 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const index = _tmp46_ + 1; #line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _scan_device_unref0 (device); -#line 1724 "ui.c" +#line 1820 "ui.c" } } } #line 467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" while (TRUE) { -#line 1730 "ui.c" +#line 1826 "ui.c" GtkListStore* _tmp47_ = NULL; gint _tmp48_ = 0; GtkTreeIter _tmp49_ = {0}; @@ -1745,7 +1841,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const if (!_tmp50_) { #line 467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 1749 "ui.c" +#line 1845 "ui.c" } #line 468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp51_ = self->priv->device_model; @@ -1753,13 +1849,13 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const _tmp52_ = iter; #line 468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_list_store_remove (_tmp51_, &_tmp52_); -#line 1757 "ui.c" +#line 1853 "ui.c" } #line 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp53_ = have_selection; #line 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (!_tmp53_) { -#line 1763 "ui.c" +#line 1859 "ui.c" gchar* device = NULL; GSettings* _tmp54_ = NULL; gchar* _tmp55_ = NULL; @@ -1775,7 +1871,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const _tmp57_ = device; #line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp57_ != NULL) { -#line 1779 "ui.c" +#line 1875 "ui.c" const gchar* _tmp58_ = NULL; GtkTreeIter _tmp59_ = {0}; gboolean _tmp60_ = FALSE; @@ -1787,15 +1883,15 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const iter = _tmp59_; #line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp56_ = _tmp60_; -#line 1791 "ui.c" +#line 1887 "ui.c" } else { #line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp56_ = FALSE; -#line 1795 "ui.c" +#line 1891 "ui.c" } #line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp56_) { -#line 1799 "ui.c" +#line 1895 "ui.c" GtkComboBox* _tmp61_ = NULL; GtkTreeIter _tmp62_ = {0}; #line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -1804,24 +1900,24 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const _tmp62_ = iter; #line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_combo_box_set_active_iter (_tmp61_, &_tmp62_); -#line 1808 "ui.c" +#line 1904 "ui.c" } else { GtkComboBox* _tmp63_ = NULL; #line 477 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp63_ = self->priv->device_combo; #line 477 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_combo_box_set_active (_tmp63_, 0); -#line 1815 "ui.c" +#line 1911 "ui.c" } #line 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _g_free0 (device); -#line 1819 "ui.c" +#line 1915 "ui.c" } #line 480 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" self->priv->setting_devices = FALSE; #line 482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_update_info_bar (self); -#line 1825 "ui.c" +#line 1921 "ui.c" } @@ -1858,7 +1954,7 @@ static void user_interface_add_default_page (UserInterface* self) { book_view_set_selected_page (_tmp6_, page); #line 485 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _page_unref0 (page); -#line 1862 "ui.c" +#line 1958 "ui.c" } @@ -1867,7 +1963,7 @@ static Block1Data* block1_data_ref (Block1Data* _data1_) { g_atomic_int_inc (&_data1_->_ref_count_); #line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return _data1_; -#line 1871 "ui.c" +#line 1967 "ui.c" } @@ -1876,7 +1972,7 @@ static void block1_data_unref (void * _userdata_) { _data1_ = (Block1Data*) _userdata_; #line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { -#line 1880 "ui.c" +#line 1976 "ui.c" UserInterface* self; #line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" self = _data1_->self; @@ -1888,7 +1984,7 @@ static void block1_data_unref (void * _userdata_) { _g_object_unref0 (self); #line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_slice_free (Block1Data, _data1_); -#line 1892 "ui.c" +#line 1988 "ui.c" } } @@ -1896,7 +1992,7 @@ static void block1_data_unref (void * _userdata_) { static gpointer _g_object_ref0 (gpointer self) { #line 523 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return self ? g_object_ref (self) : NULL; -#line 1900 "ui.c" +#line 1996 "ui.c" } @@ -1907,35 +2003,35 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start gunichar _tmp1_ = 0U; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 930 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 930 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 931 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 931 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp0_ = start_index; -#line 931 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 931 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp1_ = c; -#line 931 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) (-1), _tmp1_); -#line 931 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 931 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" + _tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_); +#line 931 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 933 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 933 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp3_ = _result_; -#line 933 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 933 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 1925 "ui.c" +#line 2021 "ui.c" gchar* _tmp4_ = NULL; -#line 934 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 934 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 934 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 934 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" result = (gint) (_tmp4_ - ((gchar*) self)); -#line 934 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 934 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" return result; -#line 1933 "ui.c" +#line 2029 "ui.c" } else { -#line 936 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 936 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" result = -1; -#line 936 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 936 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" return result; -#line 1939 "ui.c" +#line 2035 "ui.c" } } @@ -1957,105 +2053,105 @@ static gchar* string_slice (const gchar* self, glong start, glong end) { glong _tmp19_ = 0L; glong _tmp20_ = 0L; gchar* _tmp21_ = NULL; -#line 1230 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1230 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1231 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1231 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1231 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1231 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1231 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1231 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1232 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1232 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp2_ = start; -#line 1232 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1232 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" if (_tmp2_ < ((glong) 0)) { -#line 1973 "ui.c" +#line 2069 "ui.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; -#line 1233 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1233 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1233 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1233 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp4_ = start; -#line 1233 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1233 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" start = _tmp3_ + _tmp4_; -#line 1982 "ui.c" +#line 2078 "ui.c" } -#line 1235 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1235 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1235 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1235 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" if (_tmp5_ < ((glong) 0)) { -#line 1988 "ui.c" +#line 2084 "ui.c" glong _tmp6_ = 0L; glong _tmp7_ = 0L; -#line 1236 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1236 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp6_ = string_length; -#line 1236 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1236 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp7_ = end; -#line 1236 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1236 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" end = _tmp6_ + _tmp7_; -#line 1997 "ui.c" +#line 2093 "ui.c" } -#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp9_ = start; -#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" if (_tmp9_ >= ((glong) 0)) { -#line 2003 "ui.c" +#line 2099 "ui.c" glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp10_ = start; -#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp11_ = string_length; -#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp8_ = _tmp10_ <= _tmp11_; -#line 2012 "ui.c" +#line 2108 "ui.c" } else { -#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp8_ = FALSE; -#line 2016 "ui.c" +#line 2112 "ui.c" } -#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp8_, NULL); -#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp13_ = end; -#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" if (_tmp13_ >= ((glong) 0)) { -#line 2024 "ui.c" +#line 2120 "ui.c" glong _tmp14_ = 0L; glong _tmp15_ = 0L; -#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp14_ = end; -#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ <= _tmp15_; -#line 2033 "ui.c" +#line 2129 "ui.c" } else { -#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp12_ = FALSE; -#line 2037 "ui.c" +#line 2133 "ui.c" } -#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_, NULL); -#line 1240 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1240 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp16_ = start; -#line 1240 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1240 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp17_ = end; -#line 1240 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1240 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1241 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp18_ = start; -#line 1241 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp19_ = end; -#line 1241 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp20_ = start; -#line 1241 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1241 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" result = _tmp21_; -#line 1241 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" return result; -#line 2059 "ui.c" +#line 2155 "ui.c" } @@ -2096,7 +2192,7 @@ static void __lambda5_ (Block1Data* _data1_) { i = _tmp2_; #line 571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp3_) { -#line 2100 "ui.c" +#line 2196 "ui.c" GtkListStore* _tmp4_ = NULL; GtkTreeIter _tmp5_ = {0}; #line 572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -2105,7 +2201,7 @@ static void __lambda5_ (Block1Data* _data1_) { _tmp5_ = i; #line 572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_tree_model_get ((GtkTreeModel*) _tmp4_, &_tmp5_, 1, &extension, -1, -1); -#line 2109 "ui.c" +#line 2205 "ui.c" } #line 574 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp6_ = self->priv->save_dialog; @@ -2129,7 +2225,7 @@ static void __lambda5_ (Block1Data* _data1_) { _tmp12_ = extension_index; #line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp12_ >= 0) { -#line 2133 "ui.c" +#line 2229 "ui.c" const gchar* _tmp13_ = NULL; gint _tmp14_ = 0; gchar* _tmp15_ = NULL; @@ -2143,7 +2239,7 @@ static void __lambda5_ (Block1Data* _data1_) { _g_free0 (filename); #line 580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" filename = _tmp15_; -#line 2147 "ui.c" +#line 2243 "ui.c" } #line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp16_ = filename; @@ -2167,14 +2263,14 @@ static void __lambda5_ (Block1Data* _data1_) { _g_free0 (path); #line 567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _g_free0 (extension); -#line 2171 "ui.c" +#line 2267 "ui.c" } static void ___lambda5__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { #line 567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" __lambda5_ (self); -#line 2178 "ui.c" +#line 2274 "ui.c" } @@ -2287,18 +2383,18 @@ static gchar* user_interface_choose_file_location (UserInterface* self) { if (_tmp3_ == NULL) { #line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp2_ = TRUE; -#line 2291 "ui.c" +#line 2387 "ui.c" } else { const gchar* _tmp4_ = NULL; #line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp4_ = directory; #line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp2_ = g_strcmp0 (_tmp4_, "") == 0; -#line 2298 "ui.c" +#line 2394 "ui.c" } #line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp2_) { -#line 2302 "ui.c" +#line 2398 "ui.c" const gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; #line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -2309,7 +2405,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) { _g_free0 (directory); #line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" directory = _tmp6_; -#line 2313 "ui.c" +#line 2409 "ui.c" } #line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp7_ = _ ("Save As..."); @@ -2535,7 +2631,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) { _tmp71_ = response; #line 589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp71_ == ((gint) GTK_RESPONSE_ACCEPT)) { -#line 2539 "ui.c" +#line 2635 "ui.c" gchar* extension = NULL; gchar* _tmp72_ = NULL; GtkTreeIter i = {0}; @@ -2568,7 +2664,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) { i = _tmp74_; #line 593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp75_) { -#line 2572 "ui.c" +#line 2668 "ui.c" GtkListStore* _tmp76_ = NULL; GtkTreeIter _tmp77_ = {0}; #line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -2577,7 +2673,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) { _tmp77_ = i; #line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_tree_model_get ((GtkTreeModel*) _tmp76_, &_tmp77_, 1, &extension, -1, -1); -#line 2581 "ui.c" +#line 2677 "ui.c" } #line 596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp78_ = self->priv->save_dialog; @@ -2601,7 +2697,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) { _tmp84_ = extension_index; #line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp84_ < 0) { -#line 2605 "ui.c" +#line 2701 "ui.c" const gchar* _tmp85_ = NULL; const gchar* _tmp86_ = NULL; gchar* _tmp87_ = NULL; @@ -2615,7 +2711,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) { _g_free0 (path); #line 601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" path = _tmp87_; -#line 2619 "ui.c" +#line 2715 "ui.c" } #line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp88_ = path; @@ -2637,7 +2733,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) { _g_free0 (path); #line 589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _g_free0 (extension); -#line 2641 "ui.c" +#line 2737 "ui.c" } #line 606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp92_ = self->priv->settings; @@ -2677,7 +2773,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) { _data1_ = NULL; #line 611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 2681 "ui.c" +#line 2777 "ui.c" } @@ -2708,21 +2804,21 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc _tmp1_ = self->priv->book_uri; #line 617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp1_ != NULL) { -#line 2712 "ui.c" +#line 2808 "ui.c" gboolean _tmp2_ = FALSE; #line 617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp2_ = force_choose_location; #line 617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp0_ = !_tmp2_; -#line 2718 "ui.c" +#line 2814 "ui.c" } else { #line 617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp0_ = FALSE; -#line 2722 "ui.c" +#line 2818 "ui.c" } #line 617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp0_) { -#line 2726 "ui.c" +#line 2822 "ui.c" const gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; #line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -2733,7 +2829,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc _g_free0 (uri); #line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" uri = _tmp4_; -#line 2737 "ui.c" +#line 2833 "ui.c" } else { gchar* _tmp5_ = NULL; #line 620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -2742,7 +2838,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc _g_free0 (uri); #line 620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" uri = _tmp5_; -#line 2746 "ui.c" +#line 2842 "ui.c" } #line 621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp6_ = uri; @@ -2754,7 +2850,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc _g_free0 (uri); #line 622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 2758 "ui.c" +#line 2854 "ui.c" } #line 624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp7_ = uri; @@ -2769,7 +2865,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc #line 628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp10_ = uri; #line 628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - _tmp11_ = g_utf8_strdown (_tmp10_, (gssize) (-1)); + _tmp11_ = g_utf8_strdown (_tmp10_, (gssize) -1); #line 628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" uri_lower = _tmp11_; #line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -2782,7 +2878,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc _tmp14_ = g_str_has_suffix (_tmp13_, ".pdf"); #line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp14_) { -#line 2786 "ui.c" +#line 2882 "ui.c" gchar* _tmp15_ = NULL; #line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp15_ = g_strdup ("pdf"); @@ -2790,7 +2886,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc _g_free0 (format); #line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" format = _tmp15_; -#line 2794 "ui.c" +#line 2890 "ui.c" } else { const gchar* _tmp16_ = NULL; gboolean _tmp17_ = FALSE; @@ -2800,7 +2896,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc _tmp17_ = g_str_has_suffix (_tmp16_, ".ps"); #line 632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp17_) { -#line 2804 "ui.c" +#line 2900 "ui.c" gchar* _tmp18_ = NULL; #line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp18_ = g_strdup ("ps"); @@ -2808,7 +2904,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc _g_free0 (format); #line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" format = _tmp18_; -#line 2812 "ui.c" +#line 2908 "ui.c" } else { const gchar* _tmp19_ = NULL; gboolean _tmp20_ = FALSE; @@ -2818,7 +2914,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc _tmp20_ = g_str_has_suffix (_tmp19_, ".png"); #line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp20_) { -#line 2822 "ui.c" +#line 2918 "ui.c" gchar* _tmp21_ = NULL; #line 635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp21_ = g_strdup ("png"); @@ -2826,7 +2922,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc _g_free0 (format); #line 635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" format = _tmp21_; -#line 2830 "ui.c" +#line 2926 "ui.c" } else { gboolean _tmp22_ = FALSE; const gchar* _tmp23_ = NULL; @@ -2839,7 +2935,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc if (_tmp24_) { #line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp22_ = TRUE; -#line 2843 "ui.c" +#line 2939 "ui.c" } else { const gchar* _tmp25_ = NULL; gboolean _tmp26_ = FALSE; @@ -2849,11 +2945,11 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc _tmp26_ = g_str_has_suffix (_tmp25_, ".tiff"); #line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp22_ = _tmp26_; -#line 2853 "ui.c" +#line 2949 "ui.c" } #line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp22_) { -#line 2857 "ui.c" +#line 2953 "ui.c" gchar* _tmp27_ = NULL; #line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp27_ = g_strdup ("tiff"); @@ -2861,14 +2957,14 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc _g_free0 (format); #line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" format = _tmp27_; -#line 2865 "ui.c" +#line 2961 "ui.c" } } } } #line 639 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_show_progress_dialog (self); -#line 2872 "ui.c" +#line 2968 "ui.c" { Book* _tmp28_ = NULL; const gchar* _tmp29_ = NULL; @@ -2889,7 +2985,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc book_save (_tmp28_, _tmp29_, _tmp31_, _tmp32_, &_inner_error_); #line 642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2893 "ui.c" +#line 2989 "ui.c" goto __catch17_g_error; } } @@ -2936,7 +3032,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc _g_free0 (uri); #line 652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 2940 "ui.c" +#line 3036 "ui.c" } __finally17: #line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -2955,7 +3051,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc g_clear_error (&_inner_error_); #line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return FALSE; -#line 2959 "ui.c" +#line 3055 "ui.c" } #line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp38_ = uri; @@ -2981,7 +3077,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc _g_free0 (uri); #line 657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 2985 "ui.c" +#line 3081 "ui.c" } @@ -3024,7 +3120,7 @@ static gboolean user_interface_prompt_to_save (UserInterface* self, const gchar* result = TRUE; #line 663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 3028 "ui.c" +#line 3124 "ui.c" } #line 665 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp3_ = title; @@ -3074,7 +3170,7 @@ static gboolean user_interface_prompt_to_save (UserInterface* self, const gchar* switch (_tmp16_) { #line 680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" case GTK_RESPONSE_YES: -#line 3078 "ui.c" +#line 3174 "ui.c" { gboolean _tmp17_ = FALSE; #line 683 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -3087,7 +3183,7 @@ static gboolean user_interface_prompt_to_save (UserInterface* self, const gchar* _g_object_unref0 (dialog); #line 684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 3091 "ui.c" +#line 3187 "ui.c" } else { #line 686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" result = FALSE; @@ -3095,12 +3191,12 @@ static gboolean user_interface_prompt_to_save (UserInterface* self, const gchar* _g_object_unref0 (dialog); #line 686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 3099 "ui.c" +#line 3195 "ui.c" } } #line 680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" case GTK_RESPONSE_NO: -#line 3104 "ui.c" +#line 3200 "ui.c" { #line 688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" result = TRUE; @@ -3108,7 +3204,7 @@ static gboolean user_interface_prompt_to_save (UserInterface* self, const gchar* _g_object_unref0 (dialog); #line 688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 3112 "ui.c" +#line 3208 "ui.c" } default: { @@ -3118,12 +3214,12 @@ static gboolean user_interface_prompt_to_save (UserInterface* self, const gchar* _g_object_unref0 (dialog); #line 690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 3122 "ui.c" +#line 3218 "ui.c" } } #line 660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _g_object_unref0 (dialog); -#line 3127 "ui.c" +#line 3223 "ui.c" } @@ -3156,7 +3252,7 @@ static void user_interface_clear_document (UserInterface* self) { _tmp3_ = self->priv->copy_to_clipboard_menuitem; #line 701 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_widget_set_sensitive ((GtkWidget*) _tmp3_, FALSE); -#line 3160 "ui.c" +#line 3256 "ui.c" } @@ -3178,7 +3274,7 @@ static void user_interface_new_document (UserInterface* self) { if (!_tmp2_) { #line 710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return; -#line 3182 "ui.c" +#line 3278 "ui.c" } #line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp3_ = user_interface_get_scanning (self); @@ -3188,11 +3284,11 @@ static void user_interface_new_document (UserInterface* self) { if (_tmp4_) { #line 713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_signal_emit_by_name (self, "stop-scan"); -#line 3192 "ui.c" +#line 3288 "ui.c" } #line 714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_clear_document (self); -#line 3196 "ui.c" +#line 3292 "ui.c" } @@ -3203,14 +3299,14 @@ static void user_interface_new_button_clicked_cb (UserInterface* self, GtkWidget g_return_if_fail (widget != NULL); #line 720 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_new_document (self); -#line 3207 "ui.c" +#line 3303 "ui.c" } static void _user_interface_new_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_new_button_clicked_cb ((UserInterface*) self, _sender); -#line 3214 "ui.c" +#line 3310 "ui.c" } @@ -3219,7 +3315,7 @@ void user_interface_new_document_activate_cb (UserInterface* self) { g_return_if_fail (self != NULL); #line 725 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_new_document (self); -#line 3223 "ui.c" +#line 3319 "ui.c" } @@ -3244,7 +3340,7 @@ static void user_interface_set_document_hint (UserInterface* self, const gchar* _tmp2_ = document_hint; #line 732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (g_strcmp0 (_tmp2_, "text") == 0) { -#line 3248 "ui.c" +#line 3344 "ui.c" GtkRadioMenuItem* _tmp3_ = NULL; GtkRadioMenuItem* _tmp4_ = NULL; GtkRadioMenuItem* _tmp5_ = NULL; @@ -3260,14 +3356,14 @@ static void user_interface_set_document_hint (UserInterface* self, const gchar* _tmp5_ = self->priv->text_menuitem; #line 736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp5_, TRUE); -#line 3264 "ui.c" +#line 3360 "ui.c" } else { const gchar* _tmp6_ = NULL; #line 738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp6_ = document_hint; #line 738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (g_strcmp0 (_tmp6_, "photo") == 0) { -#line 3271 "ui.c" +#line 3367 "ui.c" GtkRadioMenuItem* _tmp7_ = NULL; GtkRadioMenuItem* _tmp8_ = NULL; GtkRadioMenuItem* _tmp9_ = NULL; @@ -3283,14 +3379,14 @@ static void user_interface_set_document_hint (UserInterface* self, const gchar* _tmp9_ = self->priv->photo_menuitem; #line 742 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp9_, TRUE); -#line 3287 "ui.c" +#line 3383 "ui.c" } } #line 745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp10_ = save; #line 745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp10_) { -#line 3294 "ui.c" +#line 3390 "ui.c" GSettings* _tmp11_ = NULL; const gchar* _tmp12_ = NULL; #line 746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -3299,7 +3395,7 @@ static void user_interface_set_document_hint (UserInterface* self, const gchar* _tmp12_ = document_hint; #line 746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_settings_set_string (_tmp11_, "document-type", _tmp12_); -#line 3303 "ui.c" +#line 3399 "ui.c" } } @@ -3322,7 +3418,7 @@ static void user_interface_text_menuitem_toggled_cb (UserInterface* self, GtkChe if (_tmp2_) { #line 753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_set_document_hint (self, "text", TRUE); -#line 3326 "ui.c" +#line 3422 "ui.c" } } @@ -3330,7 +3426,7 @@ static void user_interface_text_menuitem_toggled_cb (UserInterface* self, GtkChe static void _user_interface_text_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) { #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_text_menuitem_toggled_cb ((UserInterface*) self, _sender); -#line 3334 "ui.c" +#line 3430 "ui.c" } @@ -3352,7 +3448,7 @@ static void user_interface_photo_menuitem_toggled_cb (UserInterface* self, GtkCh if (_tmp2_) { #line 760 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_set_document_hint (self, "photo", TRUE); -#line 3356 "ui.c" +#line 3452 "ui.c" } } @@ -3360,7 +3456,7 @@ static void user_interface_photo_menuitem_toggled_cb (UserInterface* self, GtkCh static void _user_interface_photo_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) { #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_photo_menuitem_toggled_cb ((UserInterface*) self, _sender); -#line 3364 "ui.c" +#line 3460 "ui.c" } @@ -3379,14 +3475,14 @@ static void user_interface_set_page_side (UserInterface* self, ScanType page_sid iter = _tmp1_; #line 767 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp2_) { -#line 3383 "ui.c" +#line 3479 "ui.c" { gboolean _tmp3_ = FALSE; #line 769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp3_ = TRUE; #line 769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" while (TRUE) { -#line 3390 "ui.c" +#line 3486 "ui.c" gint s = 0; GtkListStore* _tmp6_ = NULL; GtkTreeIter _tmp7_ = {0}; @@ -3394,7 +3490,7 @@ static void user_interface_set_page_side (UserInterface* self, ScanType page_sid ScanType _tmp9_ = 0; #line 769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (!_tmp3_) { -#line 3398 "ui.c" +#line 3494 "ui.c" GtkListStore* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; #line 778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -3405,7 +3501,7 @@ static void user_interface_set_page_side (UserInterface* self, ScanType page_sid if (!_tmp5_) { #line 778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 3409 "ui.c" +#line 3505 "ui.c" } } #line 769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -3422,7 +3518,7 @@ static void user_interface_set_page_side (UserInterface* self, ScanType page_sid _tmp9_ = page_side; #line 773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp8_ == ((gint) _tmp9_)) { -#line 3426 "ui.c" +#line 3522 "ui.c" GtkComboBox* _tmp10_ = NULL; GtkTreeIter _tmp11_ = {0}; #line 775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -3433,7 +3529,7 @@ static void user_interface_set_page_side (UserInterface* self, ScanType page_sid gtk_combo_box_set_active_iter (_tmp10_, &_tmp11_); #line 776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return; -#line 3437 "ui.c" +#line 3533 "ui.c" } } } @@ -3448,7 +3544,7 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint gboolean _tmp18_ = FALSE; #line 782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_return_if_fail (self != NULL); -#line 3452 "ui.c" +#line 3548 "ui.c" { GtkListStore* _tmp0_ = NULL; GtkTreeIter _tmp1_ = {0}; @@ -3466,7 +3562,7 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint _tmp3_ = TRUE; #line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" while (TRUE) { -#line 3470 "ui.c" +#line 3566 "ui.c" gboolean _tmp6_ = FALSE; gint w = 0; gint h = 0; @@ -3477,7 +3573,7 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint gint _tmp11_ = 0; #line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (!_tmp3_) { -#line 3481 "ui.c" +#line 3577 "ui.c" GtkListStore* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; #line 789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -3486,7 +3582,7 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint _tmp5_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp4_, &iter); #line 789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" have_iter = _tmp5_; -#line 3490 "ui.c" +#line 3586 "ui.c" } #line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp3_ = FALSE; @@ -3496,7 +3592,7 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint if (!_tmp6_) { #line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 3500 "ui.c" +#line 3596 "ui.c" } #line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp7_ = self->priv->paper_size_model; @@ -3510,7 +3606,7 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint _tmp11_ = width; #line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp10_ == _tmp11_) { -#line 3514 "ui.c" +#line 3610 "ui.c" gint _tmp12_ = 0; gint _tmp13_ = 0; #line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -3519,17 +3615,17 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint _tmp13_ = height; #line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp9_ = _tmp12_ == _tmp13_; -#line 3523 "ui.c" +#line 3619 "ui.c" } else { #line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp9_ = FALSE; -#line 3527 "ui.c" +#line 3623 "ui.c" } #line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp9_) { #line 794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 3533 "ui.c" +#line 3629 "ui.c" } } } @@ -3537,7 +3633,7 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint _tmp14_ = have_iter; #line 797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (!_tmp14_) { -#line 3541 "ui.c" +#line 3637 "ui.c" GtkListStore* _tmp15_ = NULL; GtkTreeIter _tmp16_ = {0}; gboolean _tmp17_ = FALSE; @@ -3549,13 +3645,13 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint iter = _tmp16_; #line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" have_iter = _tmp17_; -#line 3553 "ui.c" +#line 3649 "ui.c" } #line 799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp18_ = have_iter; #line 799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp18_) { -#line 3559 "ui.c" +#line 3655 "ui.c" GtkComboBox* _tmp19_ = NULL; GtkTreeIter _tmp20_ = {0}; #line 800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -3564,7 +3660,7 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint _tmp20_ = iter; #line 800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_combo_box_set_active_iter (_tmp19_, &_tmp20_); -#line 3568 "ui.c" +#line 3664 "ui.c" } } @@ -3588,7 +3684,7 @@ static gint user_interface_get_text_dpi (UserInterface* self) { iter = _tmp1_; #line 808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp2_) { -#line 3592 "ui.c" +#line 3688 "ui.c" GtkListStore* _tmp3_ = NULL; GtkTreeIter _tmp4_ = {0}; #line 809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -3597,13 +3693,13 @@ static gint user_interface_get_text_dpi (UserInterface* self) { _tmp4_ = iter; #line 809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &dpi, -1, -1); -#line 3601 "ui.c" +#line 3697 "ui.c" } #line 811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" result = dpi; #line 811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 3607 "ui.c" +#line 3703 "ui.c" } @@ -3626,7 +3722,7 @@ static gint user_interface_get_photo_dpi (UserInterface* self) { iter = _tmp1_; #line 819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp2_) { -#line 3630 "ui.c" +#line 3726 "ui.c" GtkListStore* _tmp3_ = NULL; GtkTreeIter _tmp4_ = {0}; #line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -3635,13 +3731,13 @@ static gint user_interface_get_photo_dpi (UserInterface* self) { _tmp4_ = iter; #line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &dpi, -1, -1); -#line 3639 "ui.c" +#line 3735 "ui.c" } #line 822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" result = dpi; #line 822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 3645 "ui.c" +#line 3741 "ui.c" } @@ -3665,7 +3761,7 @@ static ScanType user_interface_get_page_side (UserInterface* self) { iter = _tmp1_; #line 830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp2_) { -#line 3669 "ui.c" +#line 3765 "ui.c" GtkListStore* _tmp3_ = NULL; GtkTreeIter _tmp4_ = {0}; #line 831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -3674,7 +3770,7 @@ static ScanType user_interface_get_page_side (UserInterface* self) { _tmp4_ = iter; #line 831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &page_side, -1, -1); -#line 3678 "ui.c" +#line 3774 "ui.c" } #line 833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp5_ = page_side; @@ -3682,7 +3778,7 @@ static ScanType user_interface_get_page_side (UserInterface* self) { result = (ScanType) _tmp5_; #line 833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 3686 "ui.c" +#line 3782 "ui.c" } @@ -3711,7 +3807,7 @@ static gboolean user_interface_get_paper_size (UserInterface* self, gint* width, iter = _tmp2_; #line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp3_) { -#line 3715 "ui.c" +#line 3811 "ui.c" GtkListStore* _tmp4_ = NULL; GtkTreeIter _tmp5_ = {0}; #line 843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -3726,17 +3822,17 @@ static gboolean user_interface_get_paper_size (UserInterface* self, gint* width, if (width) { #line 844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" *width = _vala_width; -#line 3730 "ui.c" +#line 3826 "ui.c" } #line 844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (height) { #line 844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" *height = _vala_height; -#line 3736 "ui.c" +#line 3832 "ui.c" } #line 844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 3740 "ui.c" +#line 3836 "ui.c" } #line 847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" result = FALSE; @@ -3744,17 +3840,17 @@ static gboolean user_interface_get_paper_size (UserInterface* self, gint* width, if (width) { #line 847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" *width = _vala_width; -#line 3748 "ui.c" +#line 3844 "ui.c" } #line 847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (height) { #line 847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" *height = _vala_height; -#line 3754 "ui.c" +#line 3850 "ui.c" } #line 847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 3758 "ui.c" +#line 3854 "ui.c" } @@ -3783,7 +3879,7 @@ static ScanOptions* user_interface_make_scan_options (UserInterface* self) { _tmp1_ = self->priv->document_hint; #line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (g_strcmp0 (_tmp1_, "text") == 0) { -#line 3787 "ui.c" +#line 3883 "ui.c" ScanOptions* _tmp2_ = NULL; ScanOptions* _tmp3_ = NULL; gint _tmp4_ = 0; @@ -3802,7 +3898,7 @@ static ScanOptions* user_interface_make_scan_options (UserInterface* self) { _tmp5_ = options; #line 857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp5_->depth = 2; -#line 3806 "ui.c" +#line 3902 "ui.c" } else { ScanOptions* _tmp6_ = NULL; ScanOptions* _tmp7_ = NULL; @@ -3822,7 +3918,7 @@ static ScanOptions* user_interface_make_scan_options (UserInterface* self) { _tmp9_ = options; #line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp9_->depth = 8; -#line 3826 "ui.c" +#line 3922 "ui.c" } #line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp10_ = options; @@ -3854,7 +3950,7 @@ static ScanOptions* user_interface_make_scan_options (UserInterface* self) { result = options; #line 869 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 3858 "ui.c" +#line 3954 "ui.c" } @@ -3886,14 +3982,14 @@ static void user_interface_scan_button_clicked_cb (UserInterface* self, GtkWidge _g_free0 (_tmp3_); #line 873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _scan_options_unref0 (options); -#line 3890 "ui.c" +#line 3986 "ui.c" } static void _user_interface_scan_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_scan_button_clicked_cb ((UserInterface*) self, _sender); -#line 3897 "ui.c" +#line 3993 "ui.c" } @@ -3904,14 +4000,14 @@ static void user_interface_stop_scan_button_clicked_cb (UserInterface* self, Gtk g_return_if_fail (widget != NULL); #line 883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_signal_emit_by_name (self, "stop-scan"); -#line 3908 "ui.c" +#line 4004 "ui.c" } static void _user_interface_stop_scan_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_stop_scan_button_clicked_cb ((UserInterface*) self, _sender); -#line 3915 "ui.c" +#line 4011 "ui.c" } @@ -3930,7 +4026,7 @@ static void user_interface_continuous_scan_button_clicked_cb (UserInterface* sel if (_tmp1_) { #line 890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_signal_emit_by_name (self, "stop-scan"); -#line 3934 "ui.c" +#line 4030 "ui.c" } else { ScanOptions* options = NULL; ScanOptions* _tmp2_ = NULL; @@ -3964,7 +4060,7 @@ static void user_interface_continuous_scan_button_clicked_cb (UserInterface* sel _g_free0 (_tmp7_); #line 889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _scan_options_unref0 (options); -#line 3968 "ui.c" +#line 4064 "ui.c" } } @@ -3972,7 +4068,7 @@ static void user_interface_continuous_scan_button_clicked_cb (UserInterface* sel static void _user_interface_continuous_scan_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_continuous_scan_button_clicked_cb ((UserInterface*) self, _sender); -#line 3976 "ui.c" +#line 4072 "ui.c" } @@ -3986,14 +4082,14 @@ static void user_interface_preferences_button_clicked_cb (UserInterface* self, G _tmp0_ = self->priv->preferences_dialog; #line 902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_window_present ((GtkWindow*) _tmp0_); -#line 3990 "ui.c" +#line 4086 "ui.c" } static void _user_interface_preferences_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_preferences_button_clicked_cb ((UserInterface*) self, _sender); -#line 3997 "ui.c" +#line 4093 "ui.c" } @@ -4005,7 +4101,7 @@ void user_interface_preferences_activate_cb (UserInterface* self) { _tmp0_ = self->priv->preferences_dialog; #line 907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_window_present ((GtkWindow*) _tmp0_); -#line 4009 "ui.c" +#line 4105 "ui.c" } @@ -4021,7 +4117,7 @@ static gboolean user_interface_preferences_dialog_delete_event_cb (UserInterface result = TRUE; #line 913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 4025 "ui.c" +#line 4121 "ui.c" } @@ -4030,7 +4126,7 @@ static gboolean _user_interface_preferences_dialog_delete_event_cb_gtk_widget_de result = user_interface_preferences_dialog_delete_event_cb ((UserInterface*) self, _sender, event); #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 4034 "ui.c" +#line 4130 "ui.c" } @@ -4044,21 +4140,21 @@ static void user_interface_preferences_dialog_response_cb (UserInterface* self, _tmp0_ = self->priv->preferences_dialog; #line 919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_widget_set_visible ((GtkWidget*) _tmp0_, FALSE); -#line 4048 "ui.c" +#line 4144 "ui.c" } static void _user_interface_preferences_dialog_response_cb_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) { #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_preferences_dialog_response_cb ((UserInterface*) self, _sender, response_id); -#line 4055 "ui.c" +#line 4151 "ui.c" } static gpointer _page_ref0 (gpointer self) { #line 924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return self ? page_ref (self) : NULL; -#line 4062 "ui.c" +#line 4158 "ui.c" } @@ -4085,7 +4181,7 @@ static void user_interface_update_page_menu (UserInterface* self) { _tmp4_ = page; #line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp4_ == NULL) { -#line 4089 "ui.c" +#line 4185 "ui.c" GtkMenuItem* _tmp5_ = NULL; GtkMenuItem* _tmp6_ = NULL; #line 927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -4096,7 +4192,7 @@ static void user_interface_update_page_menu (UserInterface* self) { _tmp6_ = self->priv->page_move_right_menuitem; #line 928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_widget_set_sensitive ((GtkWidget*) _tmp6_, FALSE); -#line 4100 "ui.c" +#line 4196 "ui.c" } else { guint index = 0U; Book* _tmp7_ = NULL; @@ -4135,11 +4231,11 @@ static void user_interface_update_page_menu (UserInterface* self) { _tmp16_ = _tmp15_; #line 934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_widget_set_sensitive ((GtkWidget*) _tmp12_, _tmp13_ < (_tmp16_ - 1)); -#line 4139 "ui.c" +#line 4235 "ui.c" } #line 922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _page_unref0 (page); -#line 4143 "ui.c" +#line 4239 "ui.c" } @@ -4170,7 +4266,7 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view if (_tmp0_ == NULL) { #line 941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return; -#line 4174 "ui.c" +#line 4270 "ui.c" } #line 943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" self->priv->updating_page_menu = TRUE; @@ -4190,7 +4286,7 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view _tmp5_ = _tmp4_; #line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp5_) { -#line 4194 "ui.c" +#line 4290 "ui.c" gchar* crop_name = NULL; Page* _tmp6_ = NULL; const gchar* _tmp7_ = NULL; @@ -4211,13 +4307,13 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view _tmp10_ = crop_name; #line 951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp10_ != NULL) { -#line 4215 "ui.c" +#line 4311 "ui.c" const gchar* _tmp11_ = NULL; #line 953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp11_ = crop_name; #line 953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (g_strcmp0 (_tmp11_, "A4") == 0) { -#line 4221 "ui.c" +#line 4317 "ui.c" GtkRadioMenuItem* _tmp12_ = NULL; GtkRadioMenuItem* _tmp13_ = NULL; #line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -4228,14 +4324,14 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view _g_object_unref0 (menuitem); #line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" menuitem = _tmp13_; -#line 4232 "ui.c" +#line 4328 "ui.c" } else { const gchar* _tmp14_ = NULL; #line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp14_ = crop_name; #line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (g_strcmp0 (_tmp14_, "A5") == 0) { -#line 4239 "ui.c" +#line 4335 "ui.c" GtkRadioMenuItem* _tmp15_ = NULL; GtkRadioMenuItem* _tmp16_ = NULL; #line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -4246,14 +4342,14 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view _g_object_unref0 (menuitem); #line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" menuitem = _tmp16_; -#line 4250 "ui.c" +#line 4346 "ui.c" } else { const gchar* _tmp17_ = NULL; #line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp17_ = crop_name; #line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (g_strcmp0 (_tmp17_, "A6") == 0) { -#line 4257 "ui.c" +#line 4353 "ui.c" GtkRadioMenuItem* _tmp18_ = NULL; GtkRadioMenuItem* _tmp19_ = NULL; #line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -4264,14 +4360,14 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view _g_object_unref0 (menuitem); #line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" menuitem = _tmp19_; -#line 4268 "ui.c" +#line 4364 "ui.c" } else { const gchar* _tmp20_ = NULL; #line 959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp20_ = crop_name; #line 959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (g_strcmp0 (_tmp20_, "letter") == 0) { -#line 4275 "ui.c" +#line 4371 "ui.c" GtkRadioMenuItem* _tmp21_ = NULL; GtkRadioMenuItem* _tmp22_ = NULL; #line 960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -4282,14 +4378,14 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view _g_object_unref0 (menuitem); #line 960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" menuitem = _tmp22_; -#line 4286 "ui.c" +#line 4382 "ui.c" } else { const gchar* _tmp23_ = NULL; #line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp23_ = crop_name; #line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (g_strcmp0 (_tmp23_, "legal") == 0) { -#line 4293 "ui.c" +#line 4389 "ui.c" GtkRadioMenuItem* _tmp24_ = NULL; GtkRadioMenuItem* _tmp25_ = NULL; #line 962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -4300,14 +4396,14 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view _g_object_unref0 (menuitem); #line 962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" menuitem = _tmp25_; -#line 4304 "ui.c" +#line 4400 "ui.c" } else { const gchar* _tmp26_ = NULL; #line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp26_ = crop_name; #line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (g_strcmp0 (_tmp26_, "4x6") == 0) { -#line 4311 "ui.c" +#line 4407 "ui.c" GtkRadioMenuItem* _tmp27_ = NULL; GtkRadioMenuItem* _tmp28_ = NULL; #line 964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -4318,7 +4414,7 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view _g_object_unref0 (menuitem); #line 964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" menuitem = _tmp28_; -#line 4322 "ui.c" +#line 4418 "ui.c" } } } @@ -4336,11 +4432,11 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view _g_object_unref0 (menuitem); #line 967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" menuitem = _tmp30_; -#line 4340 "ui.c" +#line 4436 "ui.c" } #line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _g_free0 (crop_name); -#line 4344 "ui.c" +#line 4440 "ui.c" } #line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp31_ = menuitem; @@ -4370,7 +4466,7 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view self->priv->updating_page_menu = FALSE; #line 938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _g_object_unref0 (menuitem); -#line 4374 "ui.c" +#line 4470 "ui.c" } @@ -4400,7 +4496,7 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa _g_free0 (path); #line 981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return; -#line 4404 "ui.c" +#line 4500 "ui.c" } #line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp2_ = path; @@ -4408,7 +4504,7 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa _tmp3_ = g_file_new_for_path (_tmp2_); #line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" file = _tmp3_; -#line 4412 "ui.c" +#line 4508 "ui.c" { Page* _tmp4_ = NULL; gint _tmp5_ = 0; @@ -4426,7 +4522,7 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa page_save (_tmp4_, "tiff", _tmp6_, _tmp7_, &_inner_error_); #line 986 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4430 "ui.c" +#line 4526 "ui.c" goto __catch18_g_error; } } @@ -4457,7 +4553,7 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa _g_free0 (path); #line 993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return; -#line 4461 "ui.c" +#line 4557 "ui.c" } __finally18: #line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -4472,7 +4568,7 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa g_clear_error (&_inner_error_); #line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return; -#line 4476 "ui.c" +#line 4572 "ui.c" } { GdkScreen* _tmp11_ = NULL; @@ -4499,7 +4595,7 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa _g_free0 (_tmp15_); #line 998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4503 "ui.c" +#line 4599 "ui.c" goto __catch19_g_error; } } @@ -4524,7 +4620,7 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa user_interface_show_error_dialog (self, _tmp17_, _tmp19_); #line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _g_error_free0 (e); -#line 4528 "ui.c" +#line 4624 "ui.c" } __finally19: #line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -4539,13 +4635,13 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa g_clear_error (&_inner_error_); #line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return; -#line 4543 "ui.c" +#line 4639 "ui.c" } #line 977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _g_object_unref0 (file); #line 977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _g_free0 (path); -#line 4549 "ui.c" +#line 4645 "ui.c" } @@ -4562,7 +4658,7 @@ static void user_interface_show_page_menu_cb (UserInterface* self, BookView* vie _tmp1_ = gtk_get_current_event_time (); #line 1010 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_menu_popup (_tmp0_, NULL, NULL, NULL, NULL, (guint) 3, _tmp1_); -#line 4566 "ui.c" +#line 4662 "ui.c" } @@ -4584,7 +4680,7 @@ static void user_interface_rotate_left_button_clicked_cb (UserInterface* self, G if (_tmp0_) { #line 1017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return; -#line 4588 "ui.c" +#line 4684 "ui.c" } #line 1018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp1_ = self->priv->book_view; @@ -4600,24 +4696,24 @@ static void user_interface_rotate_left_button_clicked_cb (UserInterface* self, G _tmp5_ = page; #line 1019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp5_ != NULL) { -#line 4604 "ui.c" +#line 4700 "ui.c" Page* _tmp6_ = NULL; #line 1020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp6_ = page; #line 1020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" page_rotate_left (_tmp6_); -#line 4610 "ui.c" +#line 4706 "ui.c" } #line 1014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _page_unref0 (page); -#line 4614 "ui.c" +#line 4710 "ui.c" } static void _user_interface_rotate_left_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_rotate_left_button_clicked_cb ((UserInterface*) self, _sender); -#line 4621 "ui.c" +#line 4717 "ui.c" } @@ -4639,7 +4735,7 @@ static void user_interface_rotate_right_button_clicked_cb (UserInterface* self, if (_tmp0_) { #line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return; -#line 4643 "ui.c" +#line 4739 "ui.c" } #line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp1_ = self->priv->book_view; @@ -4655,24 +4751,24 @@ static void user_interface_rotate_right_button_clicked_cb (UserInterface* self, _tmp5_ = page; #line 1029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp5_ != NULL) { -#line 4659 "ui.c" +#line 4755 "ui.c" Page* _tmp6_ = NULL; #line 1030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp6_ = page; #line 1030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" page_rotate_right (_tmp6_); -#line 4665 "ui.c" +#line 4761 "ui.c" } #line 1024 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _page_unref0 (page); -#line 4669 "ui.c" +#line 4765 "ui.c" } static void _user_interface_rotate_right_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_rotate_right_button_clicked_cb ((UserInterface*) self, _sender); -#line 4676 "ui.c" +#line 4772 "ui.c" } @@ -4701,7 +4797,7 @@ static void user_interface_set_crop (UserInterface* self, const gchar* crop_name if (_tmp2_) { #line 1038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return; -#line 4705 "ui.c" +#line 4801 "ui.c" } #line 1040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp3_ = self->priv->book_view; @@ -4723,26 +4819,26 @@ static void user_interface_set_crop (UserInterface* self, const gchar* crop_name _page_unref0 (page); #line 1044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return; -#line 4727 "ui.c" +#line 4823 "ui.c" } #line 1047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp8_ = crop_name; #line 1047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp8_ == NULL) { -#line 4733 "ui.c" +#line 4829 "ui.c" Page* _tmp9_ = NULL; #line 1048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp9_ = page; #line 1048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" page_set_no_crop (_tmp9_); -#line 4739 "ui.c" +#line 4835 "ui.c" } else { const gchar* _tmp10_ = NULL; #line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp10_ = crop_name; #line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (g_strcmp0 (_tmp10_, "custom") == 0) { -#line 4746 "ui.c" +#line 4842 "ui.c" gint width = 0; Page* _tmp11_ = NULL; gint _tmp12_ = 0; @@ -4807,7 +4903,7 @@ static void user_interface_set_crop (UserInterface* self, const gchar* crop_name _tmp26_ = crop_height; #line 1056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" page_move_crop (_tmp22_, (_tmp23_ - _tmp24_) / 2, (_tmp25_ - _tmp26_) / 2); -#line 4811 "ui.c" +#line 4907 "ui.c" } else { Page* _tmp27_ = NULL; const gchar* _tmp28_ = NULL; @@ -4817,12 +4913,12 @@ static void user_interface_set_crop (UserInterface* self, const gchar* crop_name _tmp28_ = crop_name; #line 1059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" page_set_named_crop (_tmp27_, _tmp28_); -#line 4821 "ui.c" +#line 4917 "ui.c" } } #line 1033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _page_unref0 (page); -#line 4826 "ui.c" +#line 4922 "ui.c" } @@ -4844,7 +4940,7 @@ static void user_interface_no_crop_menuitem_toggled_cb (UserInterface* self, Gtk if (_tmp2_) { #line 1066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_set_crop (self, NULL); -#line 4848 "ui.c" +#line 4944 "ui.c" } } @@ -4852,7 +4948,7 @@ static void user_interface_no_crop_menuitem_toggled_cb (UserInterface* self, Gtk static void _user_interface_no_crop_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) { #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_no_crop_menuitem_toggled_cb ((UserInterface*) self, _sender); -#line 4856 "ui.c" +#line 4952 "ui.c" } @@ -4874,7 +4970,7 @@ static void user_interface_custom_crop_menuitem_toggled_cb (UserInterface* self, if (_tmp2_) { #line 1073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_set_crop (self, "custom"); -#line 4878 "ui.c" +#line 4974 "ui.c" } } @@ -4882,7 +4978,7 @@ static void user_interface_custom_crop_menuitem_toggled_cb (UserInterface* self, static void _user_interface_custom_crop_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) { #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_custom_crop_menuitem_toggled_cb ((UserInterface*) self, _sender); -#line 4886 "ui.c" +#line 4982 "ui.c" } @@ -4901,7 +4997,7 @@ static void user_interface_crop_button_toggled_cb (UserInterface* self, GtkToggl if (_tmp0_) { #line 1080 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return; -#line 4905 "ui.c" +#line 5001 "ui.c" } #line 1082 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp1_ = widget; @@ -4911,20 +5007,20 @@ static void user_interface_crop_button_toggled_cb (UserInterface* self, GtkToggl _tmp3_ = _tmp2_; #line 1082 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp3_) { -#line 4915 "ui.c" +#line 5011 "ui.c" GtkRadioMenuItem* _tmp4_ = NULL; #line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp4_ = self->priv->custom_crop_menuitem; #line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp4_, TRUE); -#line 4921 "ui.c" +#line 5017 "ui.c" } else { GtkRadioMenuItem* _tmp5_ = NULL; #line 1085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp5_ = self->priv->no_crop_menuitem; #line 1085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp5_, TRUE); -#line 4928 "ui.c" +#line 5024 "ui.c" } } @@ -4932,7 +5028,7 @@ static void user_interface_crop_button_toggled_cb (UserInterface* self, GtkToggl static void _user_interface_crop_button_toggled_cb_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) { #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_crop_button_toggled_cb ((UserInterface*) self, _sender); -#line 4936 "ui.c" +#line 5032 "ui.c" } @@ -4951,7 +5047,7 @@ static void user_interface_crop_toolbutton_toggled_cb (UserInterface* self, GtkT if (_tmp0_) { #line 1092 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return; -#line 4955 "ui.c" +#line 5051 "ui.c" } #line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp1_ = widget; @@ -4961,20 +5057,20 @@ static void user_interface_crop_toolbutton_toggled_cb (UserInterface* self, GtkT _tmp3_ = _tmp2_; #line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp3_) { -#line 4965 "ui.c" +#line 5061 "ui.c" GtkRadioMenuItem* _tmp4_ = NULL; #line 1095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp4_ = self->priv->custom_crop_menuitem; #line 1095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp4_, TRUE); -#line 4971 "ui.c" +#line 5067 "ui.c" } else { GtkRadioMenuItem* _tmp5_ = NULL; #line 1097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp5_ = self->priv->no_crop_menuitem; #line 1097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp5_, TRUE); -#line 4978 "ui.c" +#line 5074 "ui.c" } } @@ -4982,7 +5078,7 @@ static void user_interface_crop_toolbutton_toggled_cb (UserInterface* self, GtkT static void _user_interface_crop_toolbutton_toggled_cb_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) { #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_crop_toolbutton_toggled_cb ((UserInterface*) self, _sender); -#line 4986 "ui.c" +#line 5082 "ui.c" } @@ -5004,7 +5100,7 @@ static void user_interface_four_by_six_menuitem_toggled_cb (UserInterface* self, if (_tmp2_) { #line 1104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_set_crop (self, "4x6"); -#line 5008 "ui.c" +#line 5104 "ui.c" } } @@ -5012,7 +5108,7 @@ static void user_interface_four_by_six_menuitem_toggled_cb (UserInterface* self, static void _user_interface_four_by_six_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) { #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_four_by_six_menuitem_toggled_cb ((UserInterface*) self, _sender); -#line 5016 "ui.c" +#line 5112 "ui.c" } @@ -5034,7 +5130,7 @@ static void user_interface_legal_menuitem_toggled_cb (UserInterface* self, GtkCh if (_tmp2_) { #line 1111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_set_crop (self, "legal"); -#line 5038 "ui.c" +#line 5134 "ui.c" } } @@ -5042,7 +5138,7 @@ static void user_interface_legal_menuitem_toggled_cb (UserInterface* self, GtkCh static void _user_interface_legal_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) { #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_legal_menuitem_toggled_cb ((UserInterface*) self, _sender); -#line 5046 "ui.c" +#line 5142 "ui.c" } @@ -5064,7 +5160,7 @@ static void user_interface_letter_menuitem_toggled_cb (UserInterface* self, GtkC if (_tmp2_) { #line 1118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_set_crop (self, "letter"); -#line 5068 "ui.c" +#line 5164 "ui.c" } } @@ -5072,7 +5168,7 @@ static void user_interface_letter_menuitem_toggled_cb (UserInterface* self, GtkC static void _user_interface_letter_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) { #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_letter_menuitem_toggled_cb ((UserInterface*) self, _sender); -#line 5076 "ui.c" +#line 5172 "ui.c" } @@ -5094,7 +5190,7 @@ static void user_interface_a6_menuitem_toggled_cb (UserInterface* self, GtkCheck if (_tmp2_) { #line 1125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_set_crop (self, "A6"); -#line 5098 "ui.c" +#line 5194 "ui.c" } } @@ -5102,7 +5198,7 @@ static void user_interface_a6_menuitem_toggled_cb (UserInterface* self, GtkCheck static void _user_interface_a6_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) { #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_a6_menuitem_toggled_cb ((UserInterface*) self, _sender); -#line 5106 "ui.c" +#line 5202 "ui.c" } @@ -5124,7 +5220,7 @@ static void user_interface_a5_menuitem_toggled_cb (UserInterface* self, GtkCheck if (_tmp2_) { #line 1132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_set_crop (self, "A5"); -#line 5128 "ui.c" +#line 5224 "ui.c" } } @@ -5132,7 +5228,7 @@ static void user_interface_a5_menuitem_toggled_cb (UserInterface* self, GtkCheck static void _user_interface_a5_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) { #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_a5_menuitem_toggled_cb ((UserInterface*) self, _sender); -#line 5136 "ui.c" +#line 5232 "ui.c" } @@ -5154,7 +5250,7 @@ static void user_interface_a4_menuitem_toggled_cb (UserInterface* self, GtkCheck if (_tmp2_) { #line 1139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_set_crop (self, "A4"); -#line 5158 "ui.c" +#line 5254 "ui.c" } } @@ -5162,7 +5258,7 @@ static void user_interface_a4_menuitem_toggled_cb (UserInterface* self, GtkCheck static void _user_interface_a4_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) { #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_a4_menuitem_toggled_cb ((UserInterface*) self, _sender); -#line 5166 "ui.c" +#line 5262 "ui.c" } @@ -5196,7 +5292,7 @@ static void user_interface_crop_rotate_menuitem_activate_cb (UserInterface* self _page_unref0 (page); #line 1147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return; -#line 5200 "ui.c" +#line 5296 "ui.c" } #line 1148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp5_ = page; @@ -5204,14 +5300,14 @@ static void user_interface_crop_rotate_menuitem_activate_cb (UserInterface* self page_rotate_crop (_tmp5_); #line 1143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _page_unref0 (page); -#line 5208 "ui.c" +#line 5304 "ui.c" } static void _user_interface_crop_rotate_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_crop_rotate_menuitem_activate_cb ((UserInterface*) self, _sender); -#line 5215 "ui.c" +#line 5311 "ui.c" } @@ -5252,7 +5348,7 @@ static void user_interface_page_move_left_menuitem_activate_cb (UserInterface* s _tmp7_ = index; #line 1156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp7_ > ((guint) 0)) { -#line 5256 "ui.c" +#line 5352 "ui.c" Book* _tmp8_ = NULL; Page* _tmp9_ = NULL; guint _tmp10_ = 0U; @@ -5264,18 +5360,18 @@ static void user_interface_page_move_left_menuitem_activate_cb (UserInterface* s _tmp10_ = index; #line 1157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" book_move_page (_tmp8_, _tmp9_, _tmp10_ - 1); -#line 5268 "ui.c" +#line 5364 "ui.c" } #line 1152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _page_unref0 (page); -#line 5272 "ui.c" +#line 5368 "ui.c" } static void _user_interface_page_move_left_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_page_move_left_menuitem_activate_cb ((UserInterface*) self, _sender); -#line 5279 "ui.c" +#line 5375 "ui.c" } @@ -5325,7 +5421,7 @@ static void user_interface_page_move_right_menuitem_activate_cb (UserInterface* _tmp10_ = _tmp9_; #line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp7_ < (_tmp10_ - 1)) { -#line 5329 "ui.c" +#line 5425 "ui.c" Book* _tmp11_ = NULL; Page* _tmp12_ = NULL; Book* _tmp13_ = NULL; @@ -5343,18 +5439,18 @@ static void user_interface_page_move_right_menuitem_activate_cb (UserInterface* _tmp15_ = book_get_page_index (_tmp13_, _tmp14_); #line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" book_move_page (_tmp11_, _tmp12_, _tmp15_ + 1); -#line 5347 "ui.c" +#line 5443 "ui.c" } #line 1161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _page_unref0 (page); -#line 5351 "ui.c" +#line 5447 "ui.c" } static void _user_interface_page_move_right_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_page_move_right_menuitem_activate_cb ((UserInterface*) self, _sender); -#line 5358 "ui.c" +#line 5454 "ui.c" } @@ -5383,14 +5479,14 @@ static void user_interface_page_delete_menuitem_activate_cb (UserInterface* self _tmp5_ = _tmp4_; #line 1172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" book_delete_page (_tmp2_, _tmp5_); -#line 5387 "ui.c" +#line 5483 "ui.c" } static void _user_interface_page_delete_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_page_delete_menuitem_activate_cb ((UserInterface*) self, _sender); -#line 5394 "ui.c" +#line 5490 "ui.c" } @@ -5399,7 +5495,7 @@ static Block2Data* block2_data_ref (Block2Data* _data2_) { g_atomic_int_inc (&_data2_->_ref_count_); #line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return _data2_; -#line 5403 "ui.c" +#line 5499 "ui.c" } @@ -5408,7 +5504,7 @@ static void block2_data_unref (void * _userdata_) { _data2_ = (Block2Data*) _userdata_; #line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) { -#line 5412 "ui.c" +#line 5508 "ui.c" UserInterface* self; #line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" self = _data2_->self; @@ -5418,7 +5514,7 @@ static void block2_data_unref (void * _userdata_) { _g_object_unref0 (self); #line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_slice_free (Block2Data, _data2_); -#line 5422 "ui.c" +#line 5518 "ui.c" } } @@ -5439,7 +5535,7 @@ static gboolean __lambda6_ (Block2Data* _data2_, GdkEventKey* e) { _tmp2_ = _tmp1_->state; #line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp2_ == 0) { -#line 5443 "ui.c" +#line 5539 "ui.c" GdkEventKey* _tmp3_ = NULL; guint _tmp4_ = 0U; #line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -5448,11 +5544,11 @@ static gboolean __lambda6_ (Block2Data* _data2_, GdkEventKey* e) { _tmp4_ = _tmp3_->keyval; #line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp0_ = _tmp4_ == ((guint) GDK_KEY_Escape); -#line 5452 "ui.c" +#line 5548 "ui.c" } else { #line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp0_ = FALSE; -#line 5456 "ui.c" +#line 5552 "ui.c" } #line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp0_) { @@ -5462,13 +5558,13 @@ static gboolean __lambda6_ (Block2Data* _data2_, GdkEventKey* e) { result = TRUE; #line 1189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 5466 "ui.c" +#line 5562 "ui.c" } #line 1192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" result = FALSE; #line 1192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 5472 "ui.c" +#line 5568 "ui.c" } @@ -5477,7 +5573,7 @@ static gboolean ___lambda6__gtk_widget_key_press_event (GtkWidget* _sender, GdkE result = __lambda6_ (self, event); #line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 5481 "ui.c" +#line 5577 "ui.c" } @@ -5492,14 +5588,14 @@ static void __lambda7_ (Block2Data* _data2_) { book_combine_sides (_tmp0_); #line 1209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_widget_destroy ((GtkWidget*) _data2_->dialog); -#line 5496 "ui.c" +#line 5592 "ui.c" } static void ___lambda7__gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 1206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" __lambda7_ (self); -#line 5503 "ui.c" +#line 5599 "ui.c" } @@ -5514,14 +5610,14 @@ static void __lambda8_ (Block2Data* _data2_) { book_combine_sides_reverse (_tmp0_); #line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_widget_destroy ((GtkWidget*) _data2_->dialog); -#line 5518 "ui.c" +#line 5614 "ui.c" } static void ___lambda8__gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 1216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" __lambda8_ (self); -#line 5525 "ui.c" +#line 5621 "ui.c" } @@ -5536,14 +5632,14 @@ static void __lambda9_ (Block2Data* _data2_) { book_reverse (_tmp0_); #line 1229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_widget_destroy ((GtkWidget*) _data2_->dialog); -#line 5540 "ui.c" +#line 5636 "ui.c" } static void ___lambda9__gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 1226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" __lambda9_ (self); -#line 5547 "ui.c" +#line 5643 "ui.c" } @@ -5553,14 +5649,14 @@ static void __lambda10_ (Block2Data* _data2_) { self = _data2_->self; #line 1238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_widget_destroy ((GtkWidget*) _data2_->dialog); -#line 5557 "ui.c" +#line 5653 "ui.c" } static void ___lambda10__gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 1236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" __lambda10_ (self); -#line 5564 "ui.c" +#line 5660 "ui.c" } @@ -5727,7 +5823,7 @@ static void user_interface_reorder_document (UserInterface* self) { block2_data_unref (_data2_); #line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _data2_ = NULL; -#line 5731 "ui.c" +#line 5827 "ui.c" } @@ -5736,7 +5832,7 @@ void user_interface_reorder_document_activate_cb (UserInterface* self) { g_return_if_fail (self != NULL); #line 1248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_reorder_document (self); -#line 5740 "ui.c" +#line 5836 "ui.c" } @@ -5747,14 +5843,14 @@ static void user_interface_reorder_menuitem_activate_cb (UserInterface* self, Gt g_return_if_fail (widget != NULL); #line 1254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_reorder_document (self); -#line 5751 "ui.c" +#line 5847 "ui.c" } static void _user_interface_reorder_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_reorder_menuitem_activate_cb ((UserInterface*) self, _sender); -#line 5758 "ui.c" +#line 5854 "ui.c" } @@ -5824,7 +5920,7 @@ static GtkButton* user_interface_make_reorder_button (UserInterface* self, const _g_object_unref0 (vbox); #line 1273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 5828 "ui.c" +#line 5924 "ui.c" } @@ -5832,17 +5928,17 @@ static gchar string_get (const gchar* self, glong index) { gchar result = '\0'; glong _tmp0_ = 0L; gchar _tmp1_ = '\0'; -#line 996 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 996 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, '\0'); -#line 997 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 997 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp0_ = index; -#line 997 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 997 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" _tmp1_ = ((gchar*) self)[_tmp0_]; -#line 997 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 997 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" result = _tmp1_; -#line 997 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" +#line 997 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" return result; -#line 5846 "ui.c" +#line 5942 "ui.c" } @@ -5868,19 +5964,19 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar gtk_widget_set_visible ((GtkWidget*) _tmp1_, TRUE); #line 1281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" page_box = NULL; -#line 5872 "ui.c" +#line 5968 "ui.c" { gint i = 0; #line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" i = 0; -#line 5877 "ui.c" +#line 5973 "ui.c" { gboolean _tmp2_ = FALSE; #line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp2_ = TRUE; #line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" while (TRUE) { -#line 5884 "ui.c" +#line 5980 "ui.c" const gchar* _tmp4_ = NULL; gint _tmp5_ = 0; gchar _tmp6_ = '\0'; @@ -5922,13 +6018,13 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar PageIcon* _tmp51_ = NULL; #line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (!_tmp2_) { -#line 5926 "ui.c" +#line 6022 "ui.c" gint _tmp3_ = 0; #line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp3_ = i; #line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" i = _tmp3_ + 1; -#line 5932 "ui.c" +#line 6028 "ui.c" } #line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp2_ = FALSE; @@ -5942,7 +6038,7 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar if (!(_tmp6_ != '\0')) { #line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 5946 "ui.c" +#line 6042 "ui.c" } #line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp7_ = items; @@ -5952,7 +6048,7 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar _tmp9_ = string_get (_tmp7_, (glong) _tmp8_); #line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp9_ == '-') { -#line 5956 "ui.c" +#line 6052 "ui.c" GtkArrow* a = NULL; GtkArrow* _tmp10_ = NULL; GtkArrow* _tmp11_ = NULL; @@ -5982,7 +6078,7 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar _g_object_unref0 (a); #line 1290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" continue; -#line 5986 "ui.c" +#line 6082 "ui.c" } #line 1294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp14_ = items; @@ -6006,13 +6102,13 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar if (_tmp20_ == '\0') { #line 1297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 6010 "ui.c" +#line 6106 "ui.c" } #line 1299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp21_ = page_box; #line 1299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp21_ == NULL) { -#line 6016 "ui.c" +#line 6112 "ui.c" GtkBox* _tmp22_ = NULL; GtkBox* _tmp23_ = NULL; GtkBox* _tmp24_ = NULL; @@ -6035,7 +6131,7 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar _tmp25_ = page_box; #line 1303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_box_pack_start (_tmp24_, (GtkWidget*) _tmp25_, FALSE, FALSE, (guint) 0); -#line 6039 "ui.c" +#line 6135 "ui.c" } #line 1307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" r = 1.0; @@ -6049,7 +6145,7 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar switch (_tmp26_) { #line 1310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" case 'F': -#line 6053 "ui.c" +#line 6149 "ui.c" { #line 1314 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" r = 0x75 / 255.0; @@ -6059,11 +6155,11 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar b = 0x7B / 255.0; #line 1317 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 6063 "ui.c" +#line 6159 "ui.c" } #line 1310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" case 'B': -#line 6067 "ui.c" +#line 6163 "ui.c" { #line 1320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" r = 0xF5 / 255.0; @@ -6073,11 +6169,11 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar b = 0.0; #line 1323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 6077 "ui.c" +#line 6173 "ui.c" } #line 1310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" case 'C': -#line 6081 "ui.c" +#line 6177 "ui.c" { gdouble p = 0.0; const gchar* _tmp27_ = NULL; @@ -6108,12 +6204,12 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar b = (gdouble) 0; #line 1330 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 6112 "ui.c" +#line 6208 "ui.c" } default: #line 1310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 6117 "ui.c" +#line 6213 "ui.c" } #line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp33_ = r; @@ -6171,7 +6267,7 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar gtk_box_pack_start (_tmp50_, (GtkWidget*) _tmp51_, FALSE, FALSE, (guint) 0); #line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _g_object_unref0 (icon); -#line 6175 "ui.c" +#line 6271 "ui.c" } } } @@ -6181,7 +6277,7 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar _g_object_unref0 (page_box); #line 1343 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 6185 "ui.c" +#line 6281 "ui.c" } @@ -6192,14 +6288,14 @@ static void user_interface_save_file_button_clicked_cb (UserInterface* self, Gtk g_return_if_fail (widget != NULL); #line 1349 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_save_document (self, FALSE); -#line 6196 "ui.c" +#line 6292 "ui.c" } static void _user_interface_save_file_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_save_file_button_clicked_cb ((UserInterface*) self, _sender); -#line 6203 "ui.c" +#line 6299 "ui.c" } @@ -6208,7 +6304,7 @@ void user_interface_save_document_activate_cb (UserInterface* self) { g_return_if_fail (self != NULL); #line 1354 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_save_document (self, FALSE); -#line 6212 "ui.c" +#line 6308 "ui.c" } @@ -6237,24 +6333,24 @@ static void user_interface_copy_to_clipboard_button_clicked_cb (UserInterface* s _tmp4_ = page; #line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp4_ != NULL) { -#line 6241 "ui.c" +#line 6337 "ui.c" Page* _tmp5_ = NULL; #line 1362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp5_ = page; #line 1362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" page_copy_to_clipboard (_tmp5_, (GtkWindow*) self); -#line 6247 "ui.c" +#line 6343 "ui.c" } #line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _page_unref0 (page); -#line 6251 "ui.c" +#line 6347 "ui.c" } static void _user_interface_copy_to_clipboard_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_copy_to_clipboard_button_clicked_cb ((UserInterface*) self, _sender); -#line 6258 "ui.c" +#line 6354 "ui.c" } @@ -6265,14 +6361,14 @@ static void user_interface_save_as_file_button_clicked_cb (UserInterface* self, g_return_if_fail (widget != NULL); #line 1368 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_save_document (self, TRUE); -#line 6269 "ui.c" +#line 6365 "ui.c" } static void _user_interface_save_as_file_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_save_as_file_button_clicked_cb ((UserInterface*) self, _sender); -#line 6276 "ui.c" +#line 6372 "ui.c" } @@ -6281,14 +6377,14 @@ void user_interface_save_as_document_activate_cb (UserInterface* self) { g_return_if_fail (self != NULL); #line 1373 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_save_document (self, TRUE); -#line 6285 "ui.c" +#line 6381 "ui.c" } static gpointer _cairo_reference0 (gpointer self) { #line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return self ? cairo_reference (self) : NULL; -#line 6292 "ui.c" +#line 6388 "ui.c" } @@ -6362,7 +6458,7 @@ static void user_interface_draw_page (UserInterface* self, GtkPrintOperation* op if (_tmp7_ > _tmp9_) { #line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" is_landscape = TRUE; -#line 6366 "ui.c" +#line 6462 "ui.c" } #line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp10_ = page; @@ -6374,7 +6470,7 @@ static void user_interface_draw_page (UserInterface* self, GtkPrintOperation* op _tmp13_ = is_landscape; #line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp12_ != _tmp13_) { -#line 6378 "ui.c" +#line 6474 "ui.c" cairo_t* _tmp14_ = NULL; GtkPrintContext* _tmp15_ = NULL; gdouble _tmp16_ = 0.0; @@ -6391,7 +6487,7 @@ static void user_interface_draw_page (UserInterface* self, GtkPrintOperation* op _tmp17_ = context; #line 1390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" cairo_rotate (_tmp17_, G_PI_2); -#line 6395 "ui.c" +#line 6491 "ui.c" } #line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp18_ = context; @@ -6437,7 +6533,7 @@ static void user_interface_draw_page (UserInterface* self, GtkPrintOperation* op _page_unref0 (page); #line 1376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _cairo_destroy0 (context); -#line 6441 "ui.c" +#line 6537 "ui.c" } @@ -6457,14 +6553,14 @@ static void user_interface_email_button_clicked_cb (UserInterface* self, GtkWidg _tmp2_ = _tmp1_; #line 1404 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_signal_emit_by_name (self, "email", _tmp0_, _tmp2_); -#line 6461 "ui.c" +#line 6557 "ui.c" } static void _user_interface_email_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_email_button_clicked_cb ((UserInterface*) self, _sender); -#line 6468 "ui.c" +#line 6564 "ui.c" } @@ -6482,14 +6578,14 @@ void user_interface_email_document_activate_cb (UserInterface* self) { _tmp2_ = _tmp1_; #line 1409 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_signal_emit_by_name (self, "email", _tmp0_, _tmp2_); -#line 6486 "ui.c" +#line 6582 "ui.c" } static void _user_interface_draw_page_gtk_print_operation_draw_page (GtkPrintOperation* _sender, GtkPrintContext* context, gint page_nr, gpointer self) { #line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_draw_page ((UserInterface*) self, _sender, context, page_nr); -#line 6493 "ui.c" +#line 6589 "ui.c" } @@ -6517,13 +6613,13 @@ static void user_interface_print_document (UserInterface* self) { g_object_set (print, "n-pages", (gint) _tmp3_, NULL); #line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_signal_connect_object (print, "draw-page", (GCallback) _user_interface_draw_page_gtk_print_operation_draw_page, self, 0); -#line 6521 "ui.c" +#line 6617 "ui.c" { #line 1420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_print_operation_run (print, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, (GtkWindow*) self, &_inner_error_); #line 1420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6527 "ui.c" +#line 6623 "ui.c" goto __catch20_g_error; } } @@ -6545,7 +6641,7 @@ static void user_interface_print_document (UserInterface* self) { g_warning ("ui.vala:1424: Error printing: %s", _tmp5_); #line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _g_error_free0 (e); -#line 6549 "ui.c" +#line 6645 "ui.c" } __finally20: #line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -6558,7 +6654,7 @@ static void user_interface_print_document (UserInterface* self) { g_clear_error (&_inner_error_); #line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return; -#line 6562 "ui.c" +#line 6658 "ui.c" } #line 1427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_signal_parse_name ("draw-page", gtk_print_operation_get_type (), &_tmp6_, NULL, FALSE); @@ -6566,7 +6662,7 @@ static void user_interface_print_document (UserInterface* self) { g_signal_handlers_disconnect_matched (print, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _user_interface_draw_page_gtk_print_operation_draw_page, self); #line 1412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _g_object_unref0 (print); -#line 6570 "ui.c" +#line 6666 "ui.c" } @@ -6577,14 +6673,14 @@ static void user_interface_print_button_clicked_cb (UserInterface* self, GtkWidg g_return_if_fail (widget != NULL); #line 1433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_print_document (self); -#line 6581 "ui.c" +#line 6677 "ui.c" } static void _user_interface_print_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_print_button_clicked_cb ((UserInterface*) self, _sender); -#line 6588 "ui.c" +#line 6684 "ui.c" } @@ -6593,7 +6689,7 @@ void user_interface_print_document_activate_cb (UserInterface* self) { g_return_if_fail (self != NULL); #line 1438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_print_document (self); -#line 6597 "ui.c" +#line 6693 "ui.c" } @@ -6601,7 +6697,7 @@ static void user_interface_launch_help (UserInterface* self) { GError * _inner_error_ = NULL; #line 1441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_return_if_fail (self != NULL); -#line 6605 "ui.c" +#line 6701 "ui.c" { GdkScreen* _tmp0_ = NULL; GdkScreen* _tmp1_ = NULL; @@ -6616,7 +6712,7 @@ static void user_interface_launch_help (UserInterface* self) { gtk_show_uri (_tmp1_, "help:simple-scan", _tmp2_, &_inner_error_); #line 1445 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6620 "ui.c" +#line 6716 "ui.c" goto __catch21_g_error; } } @@ -6641,7 +6737,7 @@ static void user_interface_launch_help (UserInterface* self) { user_interface_show_error_dialog (self, _tmp3_, _tmp5_); #line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _g_error_free0 (e); -#line 6645 "ui.c" +#line 6741 "ui.c" } __finally21: #line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -6652,7 +6748,7 @@ static void user_interface_launch_help (UserInterface* self) { g_clear_error (&_inner_error_); #line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return; -#line 6656 "ui.c" +#line 6752 "ui.c" } } @@ -6664,14 +6760,14 @@ static void user_interface_help_contents_menuitem_activate_cb (UserInterface* se g_return_if_fail (widget != NULL); #line 1458 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_launch_help (self); -#line 6668 "ui.c" +#line 6764 "ui.c" } static void _user_interface_help_contents_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_help_contents_menuitem_activate_cb ((UserInterface*) self, _sender); -#line 6675 "ui.c" +#line 6771 "ui.c" } @@ -6680,7 +6776,7 @@ void user_interface_help_contents_activate_cb (UserInterface* self) { g_return_if_fail (self != NULL); #line 1463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_launch_help (self); -#line 6684 "ui.c" +#line 6780 "ui.c" } @@ -6755,7 +6851,7 @@ static void user_interface_show_about (UserInterface* self) { _g_free0 (license); #line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" authors = (_vala_array_free (authors, authors_length1, (GDestroyNotify) g_free), NULL); -#line 6748 "ui.c" +#line 6844 "ui.c" } @@ -6766,14 +6862,14 @@ static void user_interface_about_menuitem_activate_cb (UserInterface* self, GtkW g_return_if_fail (widget != NULL); #line 1497 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_show_about (self); -#line 6759 "ui.c" +#line 6855 "ui.c" } static void _user_interface_about_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_about_menuitem_activate_cb ((UserInterface*) self, _sender); -#line 6766 "ui.c" +#line 6862 "ui.c" } @@ -6782,7 +6878,7 @@ void user_interface_about_activate_cb (UserInterface* self) { g_return_if_fail (self != NULL); #line 1502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_show_about (self); -#line 6775 "ui.c" +#line 6871 "ui.c" } @@ -6807,7 +6903,7 @@ static gboolean user_interface_on_quit (UserInterface* self) { result = FALSE; #line 1511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 6800 "ui.c" +#line 6896 "ui.c" } #line 1513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_widget_destroy ((GtkWidget*) self); @@ -6817,7 +6913,7 @@ static gboolean user_interface_on_quit (UserInterface* self) { if (_tmp3_ != ((guint) 0)) { #line 1516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_save_state (self, TRUE); -#line 6810 "ui.c" +#line 6906 "ui.c" } #line 1518 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp4_ = self->priv->autosave_manager; @@ -6827,7 +6923,7 @@ static gboolean user_interface_on_quit (UserInterface* self) { result = TRUE; #line 1520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 6820 "ui.c" +#line 6916 "ui.c" } @@ -6838,14 +6934,14 @@ static void user_interface_quit_menuitem_activate_cb (UserInterface* self, GtkWi g_return_if_fail (widget != NULL); #line 1526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_on_quit (self); -#line 6831 "ui.c" +#line 6927 "ui.c" } static void _user_interface_quit_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_quit_menuitem_activate_cb ((UserInterface*) self, _sender); -#line 6838 "ui.c" +#line 6934 "ui.c" } @@ -6854,7 +6950,7 @@ void user_interface_quit_activate_cb (UserInterface* self) { g_return_if_fail (self != NULL); #line 1531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_on_quit (self); -#line 6847 "ui.c" +#line 6943 "ui.c" } @@ -6871,7 +6967,7 @@ static gboolean user_interface_simple_scan_window_configure_event_cb (UserInterf _tmp0_ = self->priv->window_is_maximized; #line 1537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (!_tmp0_) { -#line 6864 "ui.c" +#line 6960 "ui.c" GdkEventConfigure* _tmp1_ = NULL; gint _tmp2_ = 0; GdkEventConfigure* _tmp3_ = NULL; @@ -6890,13 +6986,13 @@ static gboolean user_interface_simple_scan_window_configure_event_cb (UserInterf self->priv->window_height = _tmp4_; #line 1541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_save_state (self, FALSE); -#line 6883 "ui.c" +#line 6979 "ui.c" } #line 1544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" result = FALSE; #line 1544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 6889 "ui.c" +#line 6985 "ui.c" } @@ -6905,7 +7001,7 @@ static gboolean _user_interface_simple_scan_window_configure_event_cb_gtk_widget result = user_interface_simple_scan_window_configure_event_cb ((UserInterface*) self, _sender, event); #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 6898 "ui.c" +#line 6994 "ui.c" } @@ -6921,7 +7017,7 @@ static void user_interface_info_bar_response_cb (UserInterface* self, GtkInfoBar switch (_tmp0_) { #line 1549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" case 1: -#line 6914 "ui.c" +#line 7010 "ui.c" { GtkComboBox* _tmp1_ = NULL; GtkDialog* _tmp2_ = NULL; @@ -6935,17 +7031,17 @@ static void user_interface_info_bar_response_cb (UserInterface* self, GtkInfoBar gtk_window_present ((GtkWindow*) _tmp2_); #line 1555 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 6928 "ui.c" +#line 7024 "ui.c" } #line 1549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" case 2: -#line 6932 "ui.c" +#line 7028 "ui.c" { #line 1558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_install_drivers (self); #line 1559 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 6938 "ui.c" +#line 7034 "ui.c" } default: { @@ -6963,423 +7059,235 @@ static void user_interface_info_bar_response_cb (UserInterface* self, GtkInfoBar user_interface_update_info_bar (self); #line 1565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 6956 "ui.c" +#line 7052 "ui.c" } } } -static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) { - gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; - gchar** _tmp3_ = NULL; - gint _tmp3__length1 = 0; -#line 964 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp0_ = separator; -#line 964 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - if (_tmp0_ == NULL) { -#line 965 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - separator = ""; -#line 6975 "ui.c" - } -#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp3_ = str_array; -#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp3__length1 = str_array_length1; -#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - if (_tmp3_ != NULL) { -#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp2_ = TRUE; -#line 6985 "ui.c" - } else { - gchar** _tmp4_ = NULL; - gint _tmp4__length1 = 0; -#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp4_ = str_array; -#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp4__length1 = str_array_length1; -#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp2_ = _tmp4__length1 > 0; -#line 6995 "ui.c" - } -#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - if (_tmp2_) { -#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp1_ = TRUE; -#line 7001 "ui.c" - } else { - gboolean _tmp5_ = FALSE; - gchar** _tmp6_ = NULL; - gint _tmp6__length1 = 0; -#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp6_ = str_array; -#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp6__length1 = str_array_length1; -#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - if (_tmp6__length1 == (-1)) { -#line 7012 "ui.c" - gchar** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - const gchar* _tmp8_ = NULL; -#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp7_ = str_array; -#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp7__length1 = str_array_length1; -#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp8_ = _tmp7_[0]; -#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp5_ = _tmp8_ != NULL; -#line 7024 "ui.c" - } else { -#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp5_ = FALSE; -#line 7028 "ui.c" - } -#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp1_ = _tmp5_; -#line 7032 "ui.c" +static Block3Data* block3_data_ref (Block3Data* _data3_) { +#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + g_atomic_int_inc (&_data3_->_ref_count_); +#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + return _data3_; +#line 7063 "ui.c" +} + + +static void block3_data_unref (void * _userdata_) { + Block3Data* _data3_; + _data3_ = (Block3Data*) _userdata_; +#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) { +#line 7072 "ui.c" + UserInterface* self; +#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + self = _data3_->self; +#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_object_unref0 (_data3_->instructions_label); +#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_object_unref0 (_data3_->status_label); +#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_object_unref0 (_data3_->spinner); +#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_object_unref0 (_data3_->stack); +#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_object_unref0 (self); +#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + g_slice_free (Block3Data, _data3_); +#line 7088 "ui.c" } -#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - if (_tmp1_) { -#line 7036 "ui.c" - gint i = 0; - gsize len = 0UL; - gint _tmp31_ = 0; - gint _tmp33_ = 0; - gint _tmp34_ = 0; - gsize _tmp35_ = 0UL; - const gchar* _tmp36_ = NULL; - gint _tmp37_ = 0; - gint _tmp38_ = 0; - gint _tmp39_ = 0; - const gchar* res = NULL; - gsize _tmp40_ = 0UL; - void* _tmp41_ = NULL; - void* ptr = NULL; - const gchar* _tmp42_ = NULL; - gchar** _tmp43_ = NULL; - gint _tmp43__length1 = 0; - const gchar* _tmp44_ = NULL; - void* _tmp45_ = NULL; - const gchar* _tmp62_ = NULL; -#line 969 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - len = (gsize) 1; -#line 7059 "ui.c" - { - gboolean _tmp9_ = FALSE; -#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - i = 0; -#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp9_ = TRUE; -#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - while (TRUE) { -#line 7068 "ui.c" - gboolean _tmp11_ = FALSE; - gboolean _tmp12_ = FALSE; - gchar** _tmp13_ = NULL; - gint _tmp13__length1 = 0; - gint _tmp21_ = 0; - gchar** _tmp22_ = NULL; - gint _tmp22__length1 = 0; - gint _tmp23_ = 0; - const gchar* _tmp24_ = NULL; - gsize _tmp30_ = 0UL; -#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - if (!_tmp9_) { -#line 7081 "ui.c" - gint _tmp10_ = 0; -#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp10_ = i; -#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - i = _tmp10_ + 1; -#line 7087 "ui.c" - } -#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp9_ = FALSE; -#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp13_ = str_array; -#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp13__length1 = str_array_length1; -#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - if (_tmp13__length1 != (-1)) { -#line 7097 "ui.c" - gint _tmp14_ = 0; - gchar** _tmp15_ = NULL; - gint _tmp15__length1 = 0; -#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp14_ = i; -#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp15_ = str_array; -#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp15__length1 = str_array_length1; -#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp12_ = _tmp14_ < _tmp15__length1; -#line 7109 "ui.c" - } else { -#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp12_ = FALSE; -#line 7113 "ui.c" - } -#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - if (_tmp12_) { -#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp11_ = TRUE; -#line 7119 "ui.c" - } else { - gboolean _tmp16_ = FALSE; - gchar** _tmp17_ = NULL; - gint _tmp17__length1 = 0; -#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp17_ = str_array; -#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp17__length1 = str_array_length1; -#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - if (_tmp17__length1 == (-1)) { -#line 7130 "ui.c" - gchar** _tmp18_ = NULL; - gint _tmp18__length1 = 0; - gint _tmp19_ = 0; - const gchar* _tmp20_ = NULL; -#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp18_ = str_array; -#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp18__length1 = str_array_length1; -#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp19_ = i; -#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp20_ = _tmp18_[_tmp19_]; -#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp16_ = _tmp20_ != NULL; +} + + +static void ___lambda12_ (UserInterface* self) { +} + + +static void ____lambda12__pk_progress_callback (PkProgress* progress, PkProgressType type, gpointer self) { +#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + ___lambda12_ ((UserInterface*) self); +#line 7100 "ui.c" +} + + +static void ___lambda13_ (Block3Data* _data3_, GObject* object, GAsyncResult* _result_) { + UserInterface* self; + GtkLabel* _tmp0_ = NULL; + GtkSpinner* _tmp1_ = NULL; + GtkLabel* _tmp2_ = NULL; + GtkStack* _tmp3_ = NULL; + GtkLabel* _tmp4_ = NULL; + gchar* result_text = NULL; + const gchar* _tmp5_ = NULL; + gchar* _tmp6_ = NULL; + GtkLabel* _tmp23_ = NULL; + const gchar* _tmp24_ = NULL; + GError * _inner_error_ = NULL; +#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + self = _data3_->self; +#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + g_return_if_fail (_result_ != NULL); +#line 1649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp0_ = _data3_->status_label; +#line 1649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + gtk_widget_set_visible ((GtkWidget*) _tmp0_, TRUE); +#line 1650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp1_ = _data3_->spinner; +#line 1650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + g_object_set (_tmp1_, "active", FALSE, NULL); +#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp2_ = _data3_->status_label; +#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + gtk_label_set_text (_tmp2_, "☒"); +#line 1652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp3_ = _data3_->stack; +#line 1652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp4_ = _data3_->status_label; +#line 1652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + gtk_stack_set_visible_child (_tmp3_, (GtkWidget*) _tmp4_); +#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp5_ = _ ("Drivers installed successfully!"); +#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp6_ = g_strdup (_tmp5_); +#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + result_text = _tmp6_; #line 7145 "ui.c" - } else { -#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp16_ = FALSE; -#line 7149 "ui.c" - } -#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp11_ = _tmp16_; -#line 7153 "ui.c" - } -#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - if (!_tmp11_) { -#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - break; -#line 7159 "ui.c" - } -#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp22_ = str_array; -#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp22__length1 = str_array_length1; -#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp23_ = i; -#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp24_ = _tmp22_[_tmp23_]; -#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - if (_tmp24_ != NULL) { -#line 7171 "ui.c" - gchar** _tmp25_ = NULL; - gint _tmp25__length1 = 0; - gint _tmp26_ = 0; - const gchar* _tmp27_ = NULL; - gint _tmp28_ = 0; - gint _tmp29_ = 0; -#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp25_ = str_array; -#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp25__length1 = str_array_length1; -#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp26_ = i; -#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp27_ = _tmp25_[_tmp26_]; -#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp28_ = strlen ((const gchar*) _tmp27_); -#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp29_ = _tmp28_; -#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp21_ = _tmp29_; -#line 7192 "ui.c" - } else { -#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp21_ = 0; -#line 7196 "ui.c" - } -#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp30_ = len; -#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - len = _tmp30_ + _tmp21_; -#line 7202 "ui.c" - } + { + PkResults* results = NULL; + GAsyncResult* _tmp7_ = NULL; + PkResults* _tmp8_ = NULL; + PkError* _tmp9_ = NULL; + PkError* _tmp10_ = NULL; + gboolean _tmp11_ = FALSE; +#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp7_ = _result_; +#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp8_ = user_interface_install_packages_finish (self, _tmp7_, &_inner_error_); +#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + results = _tmp8_; +#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 7161 "ui.c" + goto __catch22_g_error; } -#line 973 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp31_ = i; -#line 973 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - if (_tmp31_ == 0) { +#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp9_ = pk_results_get_error_code (results); +#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp10_ = _tmp9_; +#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp11_ = _tmp10_ == NULL; +#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_object_unref0 (_tmp10_); +#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + if (_tmp11_) { +#line 7174 "ui.c" + GtkLabel* _tmp12_ = NULL; +#line 1659 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp12_ = _data3_->status_label; +#line 1659 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + gtk_label_set_text (_tmp12_, "☑"); +#line 7180 "ui.c" + } else { + PkError* e = NULL; + PkError* _tmp13_ = NULL; + const gchar* _tmp14_ = NULL; + PkError* _tmp15_ = NULL; + PkErrorEnum _tmp16_ = 0; + PkErrorEnum _tmp17_ = 0; + gchar* _tmp18_ = NULL; +#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp13_ = pk_results_get_error_code (results); +#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + e = _tmp13_; +#line 1664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp14_ = _ ("Failed to install drivers (error code %d)."); +#line 1664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp15_ = e; +#line 1664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + g_object_get (_tmp15_, "code", &_tmp16_, NULL); +#line 1664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp17_ = _tmp16_; +#line 1664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp18_ = g_strdup_printf (_tmp14_, _tmp17_); +#line 1664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_free0 (result_text); +#line 1664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + result_text = _tmp18_; +#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_object_unref0 (e); #line 7209 "ui.c" - gchar* _tmp32_ = NULL; -#line 974 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp32_ = g_strdup (""); -#line 974 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - result = _tmp32_; -#line 974 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - return result; -#line 7217 "ui.c" - } -#line 976 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp33_ = i; -#line 976 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - str_array_length1 = _tmp33_; -#line 976 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp34_ = str_array_length1; -#line 977 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp35_ = len; -#line 977 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp36_ = separator; -#line 977 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp37_ = strlen ((const gchar*) _tmp36_); -#line 977 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp38_ = _tmp37_; -#line 977 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp39_ = i; -#line 977 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1)); -#line 979 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp40_ = len; -#line 979 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp41_ = g_malloc (_tmp40_); -#line 979 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - res = _tmp41_; -#line 980 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp42_ = res; -#line 980 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp43_ = str_array; -#line 980 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp43__length1 = str_array_length1; -#line 980 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp44_ = _tmp43_[0]; -#line 980 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); -#line 980 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - ptr = _tmp45_; -#line 7255 "ui.c" - { - gboolean _tmp46_ = FALSE; -#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - i = 1; -#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp46_ = TRUE; -#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - while (TRUE) { -#line 7264 "ui.c" - gint _tmp48_ = 0; - gchar** _tmp49_ = NULL; - gint _tmp49__length1 = 0; - void* _tmp50_ = NULL; - const gchar* _tmp51_ = NULL; - void* _tmp52_ = NULL; - const gchar* _tmp53_ = NULL; - gchar** _tmp54_ = NULL; - gint _tmp54__length1 = 0; - gint _tmp55_ = 0; - const gchar* _tmp56_ = NULL; - void* _tmp60_ = NULL; - void* _tmp61_ = NULL; -#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - if (!_tmp46_) { -#line 7280 "ui.c" - gint _tmp47_ = 0; -#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp47_ = i; -#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - i = _tmp47_ + 1; -#line 7286 "ui.c" - } -#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp46_ = FALSE; -#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp48_ = i; -#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp49_ = str_array; -#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp49__length1 = str_array_length1; -#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - if (!(_tmp48_ < _tmp49__length1)) { -#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - break; -#line 7300 "ui.c" - } -#line 982 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp50_ = ptr; -#line 982 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp51_ = separator; -#line 982 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_); -#line 982 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - ptr = _tmp52_; -#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp54_ = str_array; -#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp54__length1 = str_array_length1; -#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp55_ = i; -#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp56_ = _tmp54_[_tmp55_]; -#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - if (_tmp56_ != NULL) { -#line 7320 "ui.c" - gchar** _tmp57_ = NULL; - gint _tmp57__length1 = 0; - gint _tmp58_ = 0; - const gchar* _tmp59_ = NULL; -#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp57_ = str_array; -#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp57__length1 = str_array_length1; -#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp58_ = i; -#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp59_ = _tmp57_[_tmp58_]; -#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp53_ = (const gchar*) _tmp59_; -#line 7335 "ui.c" - } else { -#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp53_ = ""; -#line 7339 "ui.c" - } -#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp60_ = ptr; -#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); -#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - ptr = _tmp61_; -#line 7347 "ui.c" - } } -#line 986 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp62_ = res; -#line 986 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - res = NULL; -#line 986 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - result = (gchar*) _tmp62_; -#line 986 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - return result; -#line 7358 "ui.c" - } else { - gchar* _tmp63_ = NULL; -#line 988 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - _tmp63_ = g_strdup (""); -#line 988 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - result = _tmp63_; -#line 988 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" - return result; -#line 7367 "ui.c" +#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_object_unref0 (results); +#line 7213 "ui.c" + } + goto __finally22; + __catch22_g_error: + { + GError* e = NULL; + const gchar* _tmp19_ = NULL; + gchar* _tmp20_ = NULL; + GError* _tmp21_ = NULL; + const gchar* _tmp22_ = NULL; +#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + e = _inner_error_; +#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _inner_error_ = NULL; +#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp19_ = _ ("Failed to install drivers."); +#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp20_ = g_strdup (_tmp19_); +#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_free0 (result_text); +#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + result_text = _tmp20_; +#line 1671 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp21_ = e; +#line 1671 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp22_ = _tmp21_->message; +#line 1671 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + g_warning ("ui.vala:1671: Failed to install drivers: %s", _tmp22_); +#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_error_free0 (e); +#line 7243 "ui.c" } + __finally22: +#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_free0 (result_text); +#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); +#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + g_clear_error (&_inner_error_); +#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + return; +#line 7256 "ui.c" + } +#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp23_ = _data3_->instructions_label; +#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp24_ = result_text; +#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + gtk_label_set_text (_tmp23_, _tmp24_); +#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_free0 (result_text); +#line 7266 "ui.c" +} + + +static void ____lambda13__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) { +#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + ___lambda13_ (self, source_object, res); +#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + block3_data_unref (self); +#line 7275 "ui.c" } static void user_interface_install_drivers (UserInterface* self) { + Block3Data* _data3_; gchar* message = NULL; gchar* _tmp0_ = NULL; gchar* instructions = NULL; @@ -7405,7 +7313,7 @@ static void user_interface_install_drivers (UserInterface* self) { static GQuark _tmp5_label5 = 0; #line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" static GQuark _tmp5_label6 = 0; -#line 7398 "ui.c" +#line 7306 "ui.c" GtkDialog* dialog = NULL; const gchar* _tmp23_ = NULL; const gchar* _tmp24_ = NULL; @@ -7428,21 +7336,17 @@ static void user_interface_install_drivers (UserInterface* self) { GtkDialog* _tmp39_ = NULL; GtkBox* _tmp40_ = NULL; GtkBox* _tmp41_ = NULL; - GtkStack* stack = NULL; GtkStack* _tmp42_ = NULL; GtkBox* _tmp43_ = NULL; GtkStack* _tmp44_ = NULL; - GtkSpinner* spinner = NULL; GtkSpinner* _tmp45_ = NULL; GtkSpinner* _tmp46_ = NULL; GtkStack* _tmp47_ = NULL; GtkSpinner* _tmp48_ = NULL; - GtkLabel* status_label = NULL; GtkLabel* _tmp49_ = NULL; GtkLabel* _tmp50_ = NULL; GtkStack* _tmp51_ = NULL; GtkLabel* _tmp52_ = NULL; - GtkLabel* instructions_label = NULL; const gchar* _tmp53_ = NULL; GtkLabel* _tmp54_ = NULL; GtkLabel* _tmp55_ = NULL; @@ -7461,10 +7365,16 @@ static void user_interface_install_drivers (UserInterface* self) { GtkLabel* _tmp68_ = NULL; gchar** _tmp69_ = NULL; gint _tmp69__length1 = 0; - GtkDialog* _tmp77_ = NULL; - GtkDialog* _tmp78_ = NULL; + GtkDialog* _tmp75_ = NULL; + GtkDialog* _tmp76_ = NULL; #line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_return_if_fail (self != NULL); +#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data3_ = g_slice_new0 (Block3Data); +#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data3_->_ref_count_ = 1; +#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data3_->self = g_object_ref (self); #line 1571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp0_ = g_strdup (""); #line 1571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -7491,7 +7401,7 @@ static void user_interface_install_drivers (UserInterface* self) { if ((((_tmp6_ == ((0 != _tmp5_label0) ? _tmp5_label0 : (_tmp5_label0 = g_quark_from_static_string ("brscan")))) || (_tmp6_ == ((0 != _tmp5_label1) ? _tmp5_label1 : (_tmp5_label1 = g_quark_from_static_string ("brscan2"))))) || (_tmp6_ == ((0 != _tmp5_label2) ? _tmp5_label2 : (_tmp5_label2 = g_quark_from_static_string ("brscan3"))))) || (_tmp6_ == ((0 != _tmp5_label3) ? _tmp5_label3 : (_tmp5_label3 = g_quark_from_static_string ("brscan4"))))) { #line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" switch (0) { -#line 7484 "ui.c" +#line 7394 "ui.c" default: { const gchar* _tmp7_ = NULL; @@ -7517,13 +7427,13 @@ static void user_interface_install_drivers (UserInterface* self) { instructions = _tmp10_; #line 1583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 7509 "ui.c" +#line 7419 "ui.c" } } } else if (_tmp6_ == ((0 != _tmp5_label4) ? _tmp5_label4 : (_tmp5_label4 = g_quark_from_static_string ("samsung")))) { #line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" switch (0) { -#line 7515 "ui.c" +#line 7425 "ui.c" default: { const gchar* _tmp11_ = NULL; @@ -7549,13 +7459,13 @@ static void user_interface_install_drivers (UserInterface* self) { instructions = _tmp14_; #line 1589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 7540 "ui.c" +#line 7450 "ui.c" } } } else if (_tmp6_ == ((0 != _tmp5_label5) ? _tmp5_label5 : (_tmp5_label5 = g_quark_from_static_string ("hpaio")))) { #line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" switch (0) { -#line 7546 "ui.c" +#line 7456 "ui.c" default: { const gchar* _tmp15_ = NULL; @@ -7586,13 +7496,13 @@ static void user_interface_install_drivers (UserInterface* self) { _packages_to_install_size_ = packages_to_install_length1; #line 1594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 7577 "ui.c" +#line 7487 "ui.c" } } } else if (_tmp6_ == ((0 != _tmp5_label6) ? _tmp5_label6 : (_tmp5_label6 = g_quark_from_static_string ("epkowa")))) { #line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" switch (0) { -#line 7583 "ui.c" +#line 7493 "ui.c" default: { const gchar* _tmp19_ = NULL; @@ -7618,7 +7528,7 @@ static void user_interface_install_drivers (UserInterface* self) { instructions = _tmp22_; #line 1600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 7608 "ui.c" +#line 7518 "ui.c" } } } @@ -7691,11 +7601,11 @@ static void user_interface_install_drivers (UserInterface* self) { #line 1616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_object_ref_sink (_tmp42_); #line 1616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - stack = _tmp42_; + _data3_->stack = _tmp42_; #line 1617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp43_ = instructions_box; #line 1617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - _tmp44_ = stack; + _tmp44_ = _data3_->stack; #line 1617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_box_pack_start (_tmp43_, (GtkWidget*) _tmp44_, FALSE, FALSE, (guint) 0); #line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -7703,15 +7613,15 @@ static void user_interface_install_drivers (UserInterface* self) { #line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_object_ref_sink (_tmp45_); #line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - spinner = _tmp45_; + _data3_->spinner = _tmp45_; #line 1620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - _tmp46_ = spinner; + _tmp46_ = _data3_->spinner; #line 1620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_widget_set_visible ((GtkWidget*) _tmp46_, TRUE); #line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - _tmp47_ = stack; + _tmp47_ = _data3_->stack; #line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - _tmp48_ = spinner; + _tmp48_ = _data3_->spinner; #line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_container_add ((GtkContainer*) _tmp47_, (GtkWidget*) _tmp48_); #line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -7719,15 +7629,15 @@ static void user_interface_install_drivers (UserInterface* self) { #line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_object_ref_sink (_tmp49_); #line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - status_label = _tmp49_; + _data3_->status_label = _tmp49_; #line 1624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - _tmp50_ = status_label; + _tmp50_ = _data3_->status_label; #line 1624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_widget_set_visible ((GtkWidget*) _tmp50_, TRUE); #line 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - _tmp51_ = stack; + _tmp51_ = _data3_->stack; #line 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - _tmp52_ = status_label; + _tmp52_ = _data3_->status_label; #line 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_container_add ((GtkContainer*) _tmp51_, (GtkWidget*) _tmp52_); #line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -7737,23 +7647,23 @@ static void user_interface_install_drivers (UserInterface* self) { #line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_object_ref_sink (_tmp54_); #line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - instructions_label = _tmp54_; + _data3_->instructions_label = _tmp54_; #line 1628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - _tmp55_ = instructions_label; + _tmp55_ = _data3_->instructions_label; #line 1628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_widget_set_visible ((GtkWidget*) _tmp55_, TRUE); #line 1629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - _tmp56_ = instructions_label; + _tmp56_ = _data3_->instructions_label; #line 1629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_label_set_xalign (_tmp56_, 0.f); #line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - _tmp57_ = instructions_label; + _tmp57_ = _data3_->instructions_label; #line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_label_set_use_markup (_tmp57_, TRUE); #line 1631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp58_ = instructions_box; #line 1631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - _tmp59_ = instructions_label; + _tmp59_ = _data3_->instructions_label; #line 1631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_box_pack_start (_tmp58_, (GtkWidget*) _tmp59_, FALSE, FALSE, (guint) 0); #line 1633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -7794,55 +7704,43 @@ static void user_interface_install_drivers (UserInterface* self) { _tmp69__length1 = packages_to_install_length1; #line 1640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp69__length1 > 0) { -#line 7784 "ui.c" - GtkLabel* _tmp70_ = NULL; - const gchar* _tmp71_ = NULL; - gchar** _tmp72_ = NULL; - gint _tmp72__length1 = 0; - gchar* _tmp73_ = NULL; - gchar* _tmp74_ = NULL; - gchar* _tmp75_ = NULL; - gchar* _tmp76_ = NULL; -#line 1676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - _tmp70_ = instructions_label; -#line 1676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - _tmp71_ = _ ("You need to install the %s package(s)."); -#line 1676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - _tmp72_ = packages_to_install; -#line 1676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - _tmp72__length1 = packages_to_install_length1; -#line 1676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - _tmp73_ = _vala_g_strjoinv (", ", _tmp72_, _tmp72__length1); -#line 1676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - _tmp74_ = _tmp73_; -#line 1676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - _tmp75_ = g_strdup_printf (_tmp71_, _tmp74_); -#line 1676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - _tmp76_ = _tmp75_; -#line 1676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - gtk_label_set_text (_tmp70_, _tmp76_); -#line 1676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - _g_free0 (_tmp76_); -#line 1676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - _g_free0 (_tmp74_); -#line 7815 "ui.c" +#line 7694 "ui.c" + GtkStack* _tmp70_ = NULL; + GtkSpinner* _tmp71_ = NULL; + GtkLabel* _tmp72_ = NULL; + const gchar* _tmp73_ = NULL; + gchar** _tmp74_ = NULL; + gint _tmp74__length1 = 0; +#line 1643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp70_ = _data3_->stack; +#line 1643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + gtk_widget_set_visible ((GtkWidget*) _tmp70_, TRUE); +#line 1644 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp71_ = _data3_->spinner; +#line 1644 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + g_object_set (_tmp71_, "active", TRUE, NULL); +#line 1645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp72_ = _data3_->instructions_label; +#line 1645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp73_ = _ ("Installing drivers..."); +#line 1645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + gtk_label_set_text (_tmp72_, _tmp73_); +#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp74_ = packages_to_install; +#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp74__length1 = packages_to_install_length1; +#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + user_interface_install_packages (self, _tmp74_, _tmp74__length1, ____lambda12__pk_progress_callback, self, ____lambda13__gasync_ready_callback, block3_data_ref (_data3_)); +#line 7721 "ui.c" } #line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - _tmp77_ = dialog; + _tmp75_ = dialog; #line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - gtk_dialog_run (_tmp77_); + gtk_dialog_run (_tmp75_); #line 1682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - _tmp78_ = dialog; + _tmp76_ = dialog; #line 1682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - gtk_widget_destroy ((GtkWidget*) _tmp78_); -#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - _g_object_unref0 (instructions_label); -#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - _g_object_unref0 (status_label); -#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - _g_object_unref0 (spinner); -#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - _g_object_unref0 (stack); + gtk_widget_destroy ((GtkWidget*) _tmp76_); #line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _g_object_unref0 (instructions_box); #line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -7855,7 +7753,564 @@ static void user_interface_install_drivers (UserInterface* self) { _g_free0 (instructions); #line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _g_free0 (message); -#line 7845 "ui.c" +#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + block3_data_unref (_data3_); +#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data3_ = NULL; +#line 7747 "ui.c" +} + + +static void user_interface_install_packages_data_free (gpointer _data) { + UserInterfaceInstallPackagesData* _data_; + _data_ = _data; +#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_object_unref0 (_data_->result); +#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_object_unref0 (_data_->self); +#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + g_slice_free (UserInterfaceInstallPackagesData, _data_); +#line 7760 "ui.c" +} + + +static void user_interface_install_packages (UserInterface* self, gchar** packages, int packages_length1, PkProgressCallback progress_callback, void* progress_callback_target, GAsyncReadyCallback _callback_, gpointer _user_data_) { + UserInterfaceInstallPackagesData* _data_; + UserInterface* _tmp0_ = NULL; + gchar** _tmp1_ = NULL; + gint _tmp1__length1 = 0; + PkProgressCallback _tmp2_ = NULL; + void* _tmp2__target = NULL; +#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_ = g_slice_new0 (UserInterfaceInstallPackagesData); +#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, user_interface_install_packages); +#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, user_interface_install_packages_data_free); +#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp0_ = _g_object_ref0 (self); +#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->self = _tmp0_; +#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp1_ = packages; +#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp1__length1 = packages_length1; +#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->packages = _tmp1_; +#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->packages_length1 = _tmp1__length1; +#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp2_ = progress_callback; +#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _tmp2__target = progress_callback_target; +#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->progress_callback = _tmp2_; +#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->progress_callback_target = _tmp2__target; +#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + user_interface_install_packages_co (_data_); +#line 7799 "ui.c" +} + + +static PkResults* user_interface_install_packages_finish (UserInterface* self, GAsyncResult* _res_, GError** error) { + PkResults* result; + UserInterfaceInstallPackagesData* _data_; +#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { +#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + return NULL; +#line 7810 "ui.c" + } +#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); +#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + result = _data_->result; +#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->result = NULL; +#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + return result; +#line 7820 "ui.c" +} + + +static void user_interface_install_packages_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) { + UserInterfaceInstallPackagesData* _data_; +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_ = _user_data_; +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_source_object_ = source_object; +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_res_ = _res_; +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + user_interface_install_packages_co (_data_); +#line 7834 "ui.c" +} + + +static gint g_ptr_array_get_length (GPtrArray* self) { + gint result; + guint _tmp0_ = 0U; +#line 4442 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" + g_return_val_if_fail (self != NULL, 0); +#line 4442 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" + _tmp0_ = self->len; +#line 4442 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" + result = (gint) _tmp0_; +#line 4442 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" + return result; +#line 7849 "ui.c" +} + + +static void g_ptr_array_set_length (GPtrArray* self, gint value) { + gint _tmp0_ = 0; +#line 4443 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" + g_return_if_fail (self != NULL); +#line 4443 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" + _tmp0_ = value; +#line 4443 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" + g_ptr_array_set_size (self, _tmp0_); +#line 7861 "ui.c" +} + + +static gboolean user_interface_install_packages_co (UserInterfaceInstallPackagesData* _data_) { +#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + switch (_data_->_state_) { +#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + case 0: +#line 7870 "ui.c" + goto _state_0; +#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + case 1: +#line 7874 "ui.c" + goto _state_1; +#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + case 2: +#line 7878 "ui.c" + goto _state_2; + default: +#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + g_assert_not_reached (); +#line 7883 "ui.c" + } + _state_0: +#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp0_ = NULL; +#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp0_ = pk_task_new (); +#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->task = _data_->_tmp0_; +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp2_ = NULL; +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp2_ = _data_->task; +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp3_ = NULL; +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp3__length1 = 0; +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp3_ = _data_->packages; +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp3__length1 = _data_->packages_length1; +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp4_ = NULL; +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp4__target = NULL; +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp4_ = _data_->progress_callback; +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp4__target = _data_->progress_callback_target; +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_state_ = 1; +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + pk_task_resolve_async (_data_->_tmp2_, (PkBitfield) PK_FILTER_ENUM_NOT_INSTALLED, _data_->_tmp3_, NULL, _data_->_tmp4_, _data_->_tmp4__target, user_interface_install_packages_ready, _data_); +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + return FALSE; +#line 7918 "ui.c" + _state_1: +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp5_ = NULL; +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp5_ = pk_task_generic_finish (_data_->_tmp2_, _data_->_res_, &_data_->_inner_error_); +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp1_ = _data_->_tmp5_; +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + g_error_free (_data_->_inner_error_); +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_object_unref0 (_data_->results); +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_object_unref0 (_data_->task); +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + if (_data_->_state_ == 0) { +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + g_simple_async_result_complete_in_idle (_data_->_async_result); +#line 7940 "ui.c" + } else { +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + g_simple_async_result_complete (_data_->_async_result); +#line 7944 "ui.c" + } +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + g_object_unref (_data_->_async_result); +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + return FALSE; +#line 7950 "ui.c" + } +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp6_ = NULL; +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp6_ = _data_->_tmp1_; +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp1_ = NULL; +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_object_unref0 (_data_->results); +#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->results = _data_->_tmp6_; +#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp8_ = NULL; +#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp8_ = _data_->results; +#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + if (_data_->_tmp8_ == NULL) { +#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp7_ = TRUE; +#line 7970 "ui.c" + } else { +#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp9_ = NULL; +#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp9_ = _data_->results; +#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp10_ = NULL; +#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp10_ = pk_results_get_error_code (_data_->_tmp9_); +#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp11_ = NULL; +#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp11_ = _data_->_tmp10_; +#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp7_ = _data_->_tmp11_ != NULL; +#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_object_unref0 (_data_->_tmp11_); +#line 7988 "ui.c" + } +#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + if (_data_->_tmp7_) { +#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->result = _data_->results; +#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_object_unref0 (_data_->_tmp1_); +#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_object_unref0 (_data_->task); +#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + if (_data_->_state_ == 0) { +#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + g_simple_async_result_complete_in_idle (_data_->_async_result); +#line 8002 "ui.c" + } else { +#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + g_simple_async_result_complete (_data_->_async_result); +#line 8006 "ui.c" + } +#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + g_object_unref (_data_->_async_result); +#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + return FALSE; +#line 8012 "ui.c" + } +#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp12_ = NULL; +#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp12_ = _data_->results; +#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp13_ = NULL; +#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp13_ = pk_results_get_package_array (_data_->_tmp12_); +#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->package_array = _data_->_tmp13_; +#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp14_ = NULL; +#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp14_ = _data_->package_array; +#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp15_ = 0; +#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp15_ = g_ptr_array_get_length (_data_->_tmp14_); +#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp16_ = 0; +#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp16_ = _data_->_tmp15_; +#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp17_ = NULL; +#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp17_ = g_new0 (gchar*, (_data_->_tmp16_ + 1) + 1); +#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->package_ids_length1 = 0; +#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_package_ids_size_ = 0; +#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->package_ids = _data_->_tmp17_; +#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->package_ids_length1 = _data_->_tmp16_ + 1; +#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_package_ids_size_ = _data_->package_ids_length1; +#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp18_ = NULL; +#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp18__length1 = 0; +#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp18_ = _data_->package_ids; +#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp18__length1 = _data_->package_ids_length1; +#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp19_ = NULL; +#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp19_ = _data_->package_array; +#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp20_ = 0; +#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp20_ = g_ptr_array_get_length (_data_->_tmp19_); +#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp21_ = 0; +#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp21_ = _data_->_tmp20_; +#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_free0 (_data_->_tmp18_[_data_->_tmp21_]); +#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp18_[_data_->_tmp21_] = NULL; +#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp22_ = NULL; +#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp22_ = _data_->_tmp18_[_data_->_tmp21_]; +#line 8078 "ui.c" + { +#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->i = 0; +#line 8082 "ui.c" + { +#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp23_ = TRUE; +#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + while (TRUE) { +#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + if (!_data_->_tmp23_) { +#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp24_ = 0; +#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp24_ = _data_->i; +#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->i = _data_->_tmp24_ + 1; +#line 8096 "ui.c" + } +#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp23_ = FALSE; +#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp25_ = 0; +#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp25_ = _data_->i; +#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp26_ = NULL; +#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp26_ = _data_->package_array; +#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp27_ = 0; +#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp27_ = g_ptr_array_get_length (_data_->_tmp26_); +#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp28_ = 0; +#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp28_ = _data_->_tmp27_; +#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + if (!(_data_->_tmp25_ < _data_->_tmp28_)) { +#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + break; +#line 8120 "ui.c" + } +#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp29_ = NULL; +#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp29__length1 = 0; +#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp29_ = _data_->package_ids; +#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp29__length1 = _data_->package_ids_length1; +#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp30_ = 0; +#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp30_ = _data_->i; +#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp31_ = NULL; +#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp31_ = _data_->package_array; +#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp32_ = NULL; +#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp32__length1 = 0; +#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp32_ = _data_->_tmp31_->pdata; +#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp32__length1 = (gint) _data_->_tmp31_->len; +#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp33_ = 0; +#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp33_ = _data_->i; +#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp34_ = NULL; +#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp34_ = _data_->_tmp32_[_data_->_tmp33_]; +#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp35_ = NULL; +#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp35_ = pk_package_get_id (_data_->_tmp34_); +#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp36_ = NULL; +#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp36_ = g_strdup (_data_->_tmp35_); +#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_free0 (_data_->_tmp29_[_data_->_tmp30_]); +#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp29_[_data_->_tmp30_] = _data_->_tmp36_; +#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp37_ = NULL; +#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp37_ = _data_->_tmp29_[_data_->_tmp30_]; +#line 8170 "ui.c" + } + } + } +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp39_ = NULL; +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp39_ = _data_->task; +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp40_ = NULL; +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp40__length1 = 0; +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp40_ = _data_->package_ids; +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp40__length1 = _data_->package_ids_length1; +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp41_ = NULL; +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp41__target = NULL; +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp41_ = _data_->progress_callback; +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp41__target = _data_->progress_callback_target; +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_state_ = 2; +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + pk_task_install_packages_async (_data_->_tmp39_, _data_->_tmp40_, NULL, _data_->_tmp41_, _data_->_tmp41__target, user_interface_install_packages_ready, _data_); +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + return FALSE; +#line 8200 "ui.c" + _state_2: +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp42_ = NULL; +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp42_ = pk_task_generic_finish (_data_->_tmp39_, _data_->_res_, &_data_->_inner_error_); +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp38_ = _data_->_tmp42_; +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + g_error_free (_data_->_inner_error_); +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->package_ids = (_vala_array_free (_data_->package_ids, _data_->package_ids_length1, (GDestroyNotify) g_free), NULL); +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_ptr_array_unref0 (_data_->package_array); +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_object_unref0 (_data_->_tmp1_); +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_object_unref0 (_data_->results); +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_object_unref0 (_data_->task); +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + if (_data_->_state_ == 0) { +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + g_simple_async_result_complete_in_idle (_data_->_async_result); +#line 8228 "ui.c" + } else { +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + g_simple_async_result_complete (_data_->_async_result); +#line 8232 "ui.c" + } +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + g_object_unref (_data_->_async_result); +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + return FALSE; +#line 8238 "ui.c" + } +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp43_ = NULL; +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp43_ = _data_->_tmp38_; +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->_tmp38_ = NULL; +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->result = _data_->_tmp43_; +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_object_unref0 (_data_->_tmp38_); +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->package_ids = (_vala_array_free (_data_->package_ids, _data_->package_ids_length1, (GDestroyNotify) g_free), NULL); +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_ptr_array_unref0 (_data_->package_array); +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_object_unref0 (_data_->_tmp1_); +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_object_unref0 (_data_->results); +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_object_unref0 (_data_->task); +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + if (_data_->_state_ == 0) { +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + g_simple_async_result_complete_in_idle (_data_->_async_result); +#line 8264 "ui.c" + } else { +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + g_simple_async_result_complete (_data_->_async_result); +#line 8268 "ui.c" + } +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + g_object_unref (_data_->_async_result); +#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + return FALSE; +#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_object_unref0 (_data_->_tmp38_); +#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _data_->package_ids = (_vala_array_free (_data_->package_ids, _data_->package_ids_length1, (GDestroyNotify) g_free), NULL); +#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_ptr_array_unref0 (_data_->package_array); +#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_object_unref0 (_data_->_tmp1_); +#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_object_unref0 (_data_->results); +#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + _g_object_unref0 (_data_->task); +#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + if (_data_->_state_ == 0) { +#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + g_simple_async_result_complete_in_idle (_data_->_async_result); +#line 8290 "ui.c" + } else { +#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + g_simple_async_result_complete (_data_->_async_result); +#line 8294 "ui.c" + } +#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + g_object_unref (_data_->_async_result); +#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" + return FALSE; +#line 8300 "ui.c" } @@ -7875,7 +8330,7 @@ static gboolean user_interface_simple_scan_window_window_state_event_cb (UserInt _tmp1_ = _tmp0_->changed_mask; #line 1707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if ((_tmp1_ & GDK_WINDOW_STATE_MAXIMIZED) != 0) { -#line 7865 "ui.c" +#line 8320 "ui.c" GdkEventWindowState* _tmp2_ = NULL; GdkWindowState _tmp3_ = 0; #line 1709 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -7886,13 +8341,13 @@ static gboolean user_interface_simple_scan_window_window_state_event_cb (UserInt self->priv->window_is_maximized = (_tmp3_ & GDK_WINDOW_STATE_MAXIMIZED) != 0; #line 1710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_save_state (self, FALSE); -#line 7876 "ui.c" +#line 8331 "ui.c" } #line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" result = FALSE; #line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 7882 "ui.c" +#line 8337 "ui.c" } @@ -7901,7 +8356,7 @@ static gboolean _user_interface_simple_scan_window_window_state_event_cb_gtk_wid result = user_interface_simple_scan_window_window_state_event_cb ((UserInterface*) self, _sender, event); #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 7891 "ui.c" +#line 8346 "ui.c" } @@ -7920,7 +8375,7 @@ static gboolean user_interface_window_delete_event_cb (UserInterface* self, GtkW result = !_tmp0_; #line 1718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 7910 "ui.c" +#line 8365 "ui.c" } @@ -7929,7 +8384,7 @@ static gboolean _user_interface_window_delete_event_cb_gtk_widget_delete_event ( result = user_interface_window_delete_event_cb ((UserInterface*) self, _sender, event); #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 7919 "ui.c" +#line 8374 "ui.c" } @@ -7973,7 +8428,7 @@ static void user_interface_page_size_changed_cb (UserInterface* self, Page* page self->priv->default_page_dpi = _tmp8_; #line 1726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_save_state (self, FALSE); -#line 7963 "ui.c" +#line 8418 "ui.c" } @@ -7995,21 +8450,21 @@ static void user_interface_page_scan_direction_changed_cb (UserInterface* self, self->priv->default_page_scan_direction = _tmp2_; #line 1732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_save_state (self, FALSE); -#line 7985 "ui.c" +#line 8440 "ui.c" } static void _user_interface_page_size_changed_cb_page_size_changed (Page* _sender, gpointer self) { #line 1739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_page_size_changed_cb ((UserInterface*) self, _sender); -#line 7992 "ui.c" +#line 8447 "ui.c" } static void _user_interface_page_scan_direction_changed_cb_page_scan_direction_changed (Page* _sender, gpointer self) { #line 1740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_page_scan_direction_changed_cb ((UserInterface*) self, _sender); -#line 7999 "ui.c" +#line 8454 "ui.c" } @@ -8048,7 +8503,7 @@ static void user_interface_page_added_cb (UserInterface* self, Book* book, Page* g_signal_connect_object (_tmp5_, "scan-direction-changed", (GCallback) _user_interface_page_scan_direction_changed_cb_page_scan_direction_changed, self, 0); #line 1742 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_update_page_menu (self); -#line 8038 "ui.c" +#line 8493 "ui.c" } @@ -8059,7 +8514,7 @@ static void user_interface_reordered_cb (UserInterface* self, Book* book) { g_return_if_fail (book != NULL); #line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_update_page_menu (self); -#line 8049 "ui.c" +#line 8504 "ui.c" } @@ -8099,11 +8554,11 @@ static void user_interface_page_removed_cb (UserInterface* self, Book* book, Pag if (_tmp6_ == ((guint) 0)) { #line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_add_default_page (self); -#line 8089 "ui.c" +#line 8544 "ui.c" } #line 1759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_update_page_menu (self); -#line 8093 "ui.c" +#line 8548 "ui.c" } @@ -8181,7 +8636,7 @@ static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* comb _tmp10_ = scan_resolutions; #line 1770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp10__length1 = scan_resolutions_length1; -#line 8171 "ui.c" +#line 8626 "ui.c" { gint* dpi_collection = NULL; gint dpi_collection_length1 = 0; @@ -8193,11 +8648,11 @@ static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* comb dpi_collection_length1 = _tmp10__length1; #line 1770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" for (dpi_it = 0; dpi_it < _tmp10__length1; dpi_it = dpi_it + 1) { -#line 8183 "ui.c" +#line 8638 "ui.c" gint dpi = 0; #line 1770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" dpi = dpi_collection[dpi_it]; -#line 8187 "ui.c" +#line 8642 "ui.c" { gchar* label = NULL; gint _tmp11_ = 0; @@ -8217,7 +8672,7 @@ static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* comb _tmp12_ = default_dpi; #line 1773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp11_ == _tmp12_) { -#line 8207 "ui.c" +#line 8662 "ui.c" const gchar* _tmp13_ = NULL; gint _tmp14_ = 0; gchar* _tmp15_ = NULL; @@ -8231,14 +8686,14 @@ static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* comb _g_free0 (label); #line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" label = _tmp15_; -#line 8221 "ui.c" +#line 8676 "ui.c" } else { gint _tmp16_ = 0; #line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp16_ = dpi; #line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp16_ == 75) { -#line 8228 "ui.c" +#line 8683 "ui.c" const gchar* _tmp17_ = NULL; gint _tmp18_ = 0; gchar* _tmp19_ = NULL; @@ -8252,14 +8707,14 @@ static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* comb _g_free0 (label); #line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" label = _tmp19_; -#line 8242 "ui.c" +#line 8697 "ui.c" } else { gint _tmp20_ = 0; #line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp20_ = dpi; #line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp20_ == 1200) { -#line 8249 "ui.c" +#line 8704 "ui.c" const gchar* _tmp21_ = NULL; gint _tmp22_ = 0; gchar* _tmp23_ = NULL; @@ -8273,7 +8728,7 @@ static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* comb _g_free0 (label); #line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" label = _tmp23_; -#line 8263 "ui.c" +#line 8718 "ui.c" } else { const gchar* _tmp24_ = NULL; gint _tmp25_ = 0; @@ -8288,7 +8743,7 @@ static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* comb _g_free0 (label); #line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" label = _tmp26_; -#line 8278 "ui.c" +#line 8733 "ui.c" } } } @@ -8314,7 +8769,7 @@ static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* comb _tmp34_ = current_dpi; #line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp33_ == _tmp34_) { -#line 8304 "ui.c" +#line 8759 "ui.c" GtkComboBox* _tmp35_ = NULL; GtkTreeIter _tmp36_ = {0}; #line 1791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -8323,11 +8778,11 @@ static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* comb _tmp36_ = iter; #line 1791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_combo_box_set_active_iter (_tmp35_, &_tmp36_); -#line 8313 "ui.c" +#line 8768 "ui.c" } #line 1770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _g_free0 (label); -#line 8317 "ui.c" +#line 8772 "ui.c" } } } @@ -8337,7 +8792,7 @@ static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* comb _g_object_unref0 (model); #line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _g_object_unref0 (renderer); -#line 8327 "ui.c" +#line 8782 "ui.c" } @@ -8400,30 +8855,30 @@ static void user_interface_needs_saving_cb (UserInterface* self, Book* book) { _tmp14_ = _tmp13_; #line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp14_) { -#line 8390 "ui.c" +#line 8845 "ui.c" GtkMenuItem* _tmp15_ = NULL; #line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp15_ = self->priv->save_as_menuitem; #line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_widget_set_sensitive ((GtkWidget*) _tmp15_, TRUE); -#line 8396 "ui.c" +#line 8851 "ui.c" } #line 1802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp16_ = self->priv->copy_to_clipboard_menuitem; #line 1802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_widget_set_sensitive ((GtkWidget*) _tmp16_, TRUE); -#line 8402 "ui.c" +#line 8857 "ui.c" } static void _user_interface_info_bar_response_cb_gtk_info_bar_response (GtkInfoBar* _sender, gint response_id, gpointer self) { #line 1862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_info_bar_response_cb ((UserInterface*) self, _sender, response_id); -#line 8409 "ui.c" +#line 8864 "ui.c" } -static void __lambda12_ (UserInterface* self) { +static void __lambda14_ (UserInterface* self) { GSettings* _tmp0_ = NULL; gint _tmp1_ = 0; #line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -8432,18 +8887,18 @@ static void __lambda12_ (UserInterface* self) { _tmp1_ = user_interface_get_text_dpi (self); #line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_settings_set_int (_tmp0_, "text-dpi", _tmp1_); -#line 8422 "ui.c" +#line 8877 "ui.c" } -static void ___lambda12__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { +static void ___lambda14__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { #line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - __lambda12_ ((UserInterface*) self); -#line 8429 "ui.c" + __lambda14_ ((UserInterface*) self); +#line 8884 "ui.c" } -static void __lambda13_ (UserInterface* self) { +static void __lambda15_ (UserInterface* self) { GSettings* _tmp0_ = NULL; gint _tmp1_ = 0; #line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -8452,18 +8907,18 @@ static void __lambda13_ (UserInterface* self) { _tmp1_ = user_interface_get_photo_dpi (self); #line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_settings_set_int (_tmp0_, "photo-dpi", _tmp1_); -#line 8442 "ui.c" +#line 8897 "ui.c" } -static void ___lambda13__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { +static void ___lambda15__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { #line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - __lambda13_ ((UserInterface*) self); -#line 8449 "ui.c" + __lambda15_ ((UserInterface*) self); +#line 8904 "ui.c" } -static void __lambda14_ (UserInterface* self) { +static void __lambda16_ (UserInterface* self) { GSettings* _tmp0_ = NULL; ScanType _tmp1_ = 0; #line 1921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -8472,18 +8927,18 @@ static void __lambda14_ (UserInterface* self) { _tmp1_ = user_interface_get_page_side (self); #line 1921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_settings_set_enum (_tmp0_, "page-side", (gint) _tmp1_); -#line 8462 "ui.c" +#line 8917 "ui.c" } -static void ___lambda14__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { +static void ___lambda16__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { #line 1921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - __lambda14_ ((UserInterface*) self); -#line 8469 "ui.c" + __lambda16_ ((UserInterface*) self); +#line 8924 "ui.c" } -static void __lambda15_ (UserInterface* self) { +static void __lambda17_ (UserInterface* self) { gint w = 0; gint h = 0; gint _tmp0_ = 0; @@ -8504,18 +8959,18 @@ static void __lambda15_ (UserInterface* self) { _tmp3_ = self->priv->settings; #line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_settings_set_int (_tmp3_, "paper-height", h); -#line 8494 "ui.c" +#line 8949 "ui.c" } -static void ___lambda15__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { +static void ___lambda17__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { #line 1929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - __lambda15_ ((UserInterface*) self); -#line 8501 "ui.c" + __lambda17_ ((UserInterface*) self); +#line 8956 "ui.c" } -static void __lambda16_ (UserInterface* self) { +static void __lambda18_ (UserInterface* self) { GSettings* _tmp0_ = NULL; gint _tmp1_ = 0; gint _tmp2_ = 0; @@ -8527,18 +8982,18 @@ static void __lambda16_ (UserInterface* self) { _tmp2_ = _tmp1_; #line 1945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_settings_set_int (_tmp0_, "brightness", _tmp2_); -#line 8517 "ui.c" +#line 8972 "ui.c" } -static void ___lambda16__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) { +static void ___lambda18__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) { #line 1945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - __lambda16_ ((UserInterface*) self); -#line 8524 "ui.c" + __lambda18_ ((UserInterface*) self); +#line 8979 "ui.c" } -static void __lambda17_ (UserInterface* self) { +static void __lambda19_ (UserInterface* self) { GSettings* _tmp0_ = NULL; gint _tmp1_ = 0; gint _tmp2_ = 0; @@ -8550,18 +9005,18 @@ static void __lambda17_ (UserInterface* self) { _tmp2_ = _tmp1_; #line 1955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_settings_set_int (_tmp0_, "contrast", _tmp2_); -#line 8540 "ui.c" +#line 8995 "ui.c" } -static void ___lambda17__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) { +static void ___lambda19__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) { #line 1955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - __lambda17_ ((UserInterface*) self); -#line 8547 "ui.c" + __lambda19_ ((UserInterface*) self); +#line 9002 "ui.c" } -static void __lambda18_ (UserInterface* self) { +static void __lambda20_ (UserInterface* self) { GSettings* _tmp0_ = NULL; gint _tmp1_ = 0; gint _tmp2_ = 0; @@ -8573,42 +9028,42 @@ static void __lambda18_ (UserInterface* self) { _tmp2_ = _tmp1_; #line 1965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_settings_set_int (_tmp0_, "jpeg-quality", _tmp2_); -#line 8563 "ui.c" +#line 9018 "ui.c" } -static void ___lambda18__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) { +static void ___lambda20__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) { #line 1965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - __lambda18_ ((UserInterface*) self); -#line 8570 "ui.c" + __lambda20_ ((UserInterface*) self); +#line 9025 "ui.c" } static void _user_interface_page_selected_cb_book_view_page_selected (BookView* _sender, Page* page, gpointer self) { #line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_page_selected_cb ((UserInterface*) self, _sender, page); -#line 8577 "ui.c" +#line 9032 "ui.c" } static void _user_interface_show_page_cb_book_view_show_page (BookView* _sender, Page* page, gpointer self) { #line 1975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_show_page_cb ((UserInterface*) self, _sender, page); -#line 8584 "ui.c" +#line 9039 "ui.c" } static void _user_interface_show_page_menu_cb_book_view_show_menu (BookView* _sender, gpointer self) { #line 1976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_show_page_menu_cb ((UserInterface*) self, _sender); -#line 8591 "ui.c" +#line 9046 "ui.c" } static void _user_interface_book_saving_cb_book_saving (Book* _sender, gint i, gpointer self) { #line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_book_saving_cb ((UserInterface*) self, i); -#line 8598 "ui.c" +#line 9053 "ui.c" } @@ -8838,44 +9293,44 @@ static void user_interface_load (UserInterface* self) { if (_tmp6_) { #line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp5_ = TRUE; -#line 8828 "ui.c" +#line 9283 "ui.c" } else { gboolean _tmp7_ = FALSE; #line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp7_ = user_interface_is_desktop (self, "XFCE"); #line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp5_ = _tmp7_; -#line 8835 "ui.c" +#line 9290 "ui.c" } #line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp5_) { #line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp4_ = TRUE; -#line 8841 "ui.c" +#line 9296 "ui.c" } else { gboolean _tmp8_ = FALSE; #line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp8_ = user_interface_is_desktop (self, "MATE"); #line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp4_ = _tmp8_; -#line 8848 "ui.c" +#line 9303 "ui.c" } #line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp4_) { #line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp3_ = TRUE; -#line 8854 "ui.c" +#line 9309 "ui.c" } else { gboolean _tmp9_ = FALSE; #line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp9_ = user_interface_is_desktop (self, "LXDE"); #line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp3_ = _tmp9_; -#line 8861 "ui.c" +#line 9316 "ui.c" } #line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp3_) { -#line 8865 "ui.c" +#line 9320 "ui.c" GtkMenuBar* _tmp10_ = NULL; GtkToolbar* _tmp11_ = NULL; #line 1815 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -8888,7 +9343,7 @@ static void user_interface_load (UserInterface* self) { _tmp11_ = self->priv->toolbar; #line 1817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_widget_set_visible ((GtkWidget*) _tmp11_, TRUE); -#line 8878 "ui.c" +#line 9333 "ui.c" } else { GtkApplication* _tmp12_ = NULL; GMenu* appmenu = NULL; @@ -9106,7 +9561,7 @@ static void user_interface_load (UserInterface* self) { _g_object_unref0 (section); #line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _g_object_unref0 (appmenu); -#line 9096 "ui.c" +#line 9551 "ui.c" } #line 1858 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp59_ = app; @@ -9328,7 +9783,7 @@ static void user_interface_load (UserInterface* self) { if (_tmp123_ <= 0) { #line 1904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" dpi = USER_INTERFACE_DEFAULT_TEXT_DPI; -#line 9318 "ui.c" +#line 9773 "ui.c" } #line 1905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp124_ = self->priv->text_dpi_combo; @@ -9339,7 +9794,7 @@ static void user_interface_load (UserInterface* self) { #line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp126_ = self->priv->text_dpi_combo; #line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - g_signal_connect_object (_tmp126_, "changed", (GCallback) ___lambda12__gtk_combo_box_changed, self, 0); + g_signal_connect_object (_tmp126_, "changed", (GCallback) ___lambda14__gtk_combo_box_changed, self, 0); #line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp127_ = self->priv->settings; #line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -9352,7 +9807,7 @@ static void user_interface_load (UserInterface* self) { if (_tmp129_ <= 0) { #line 1909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" dpi = USER_INTERFACE_DEFAULT_PHOTO_DPI; -#line 9342 "ui.c" +#line 9797 "ui.c" } #line 1910 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp130_ = self->priv->photo_dpi_combo; @@ -9363,7 +9818,7 @@ static void user_interface_load (UserInterface* self) { #line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp132_ = self->priv->photo_dpi_combo; #line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - g_signal_connect_object (_tmp132_, "changed", (GCallback) ___lambda13__gtk_combo_box_changed, self, 0); + g_signal_connect_object (_tmp132_, "changed", (GCallback) ___lambda15__gtk_combo_box_changed, self, 0); #line 1913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp133_ = (GtkCellRendererText*) gtk_cell_renderer_text_new (); #line 1913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -9411,7 +9866,7 @@ static void user_interface_load (UserInterface* self) { #line 1921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp145_ = self->priv->page_side_combo; #line 1921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - g_signal_connect_object (_tmp145_, "changed", (GCallback) ___lambda14__gtk_combo_box_changed, self, 0); + g_signal_connect_object (_tmp145_, "changed", (GCallback) ___lambda16__gtk_combo_box_changed, self, 0); #line 1923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp146_ = (GtkCellRendererText*) gtk_cell_renderer_text_new (); #line 1923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -9453,7 +9908,7 @@ static void user_interface_load (UserInterface* self) { #line 1929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp157_ = self->priv->paper_size_combo; #line 1929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - g_signal_connect_object (_tmp157_, "changed", (GCallback) ___lambda15__gtk_combo_box_changed, self, 0); + g_signal_connect_object (_tmp157_, "changed", (GCallback) ___lambda17__gtk_combo_box_changed, self, 0); #line 1937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp158_ = self->priv->brightness_adjustment; #line 1937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -9511,7 +9966,7 @@ static void user_interface_load (UserInterface* self) { #line 1945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp177_ = self->priv->brightness_adjustment; #line 1945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - g_signal_connect_object (_tmp177_, "value-changed", (GCallback) ___lambda16__gtk_adjustment_value_changed, self, 0); + g_signal_connect_object (_tmp177_, "value-changed", (GCallback) ___lambda18__gtk_adjustment_value_changed, self, 0); #line 1947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp178_ = self->priv->contrast_adjustment; #line 1947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -9569,7 +10024,7 @@ static void user_interface_load (UserInterface* self) { #line 1955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp197_ = self->priv->contrast_adjustment; #line 1955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - g_signal_connect_object (_tmp197_, "value-changed", (GCallback) ___lambda17__gtk_adjustment_value_changed, self, 0); + g_signal_connect_object (_tmp197_, "value-changed", (GCallback) ___lambda19__gtk_adjustment_value_changed, self, 0); #line 1957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp198_ = self->priv->quality_adjustment; #line 1957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -9627,7 +10082,7 @@ static void user_interface_load (UserInterface* self) { #line 1965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp217_ = self->priv->quality_adjustment; #line 1965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - g_signal_connect_object (_tmp217_, "value-changed", (GCallback) ___lambda18__gtk_adjustment_value_changed, self, 0); + g_signal_connect_object (_tmp217_, "value-changed", (GCallback) ___lambda20__gtk_adjustment_value_changed, self, 0); #line 1967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp218_ = self->priv->settings; #line 1967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -9638,13 +10093,13 @@ static void user_interface_load (UserInterface* self) { _tmp220_ = document_type; #line 1968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp220_ != NULL) { -#line 9628 "ui.c" +#line 10083 "ui.c" const gchar* _tmp221_ = NULL; #line 1969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp221_ = document_type; #line 1969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_set_document_hint (self, _tmp221_, FALSE); -#line 9634 "ui.c" +#line 10089 "ui.c" } #line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp222_ = self->priv->_book; @@ -9712,7 +10167,7 @@ static void user_interface_load (UserInterface* self) { g_debug ("ui.vala:1990: Restoring window to maximized"); #line 1991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_window_maximize ((GtkWindow*) self); -#line 9702 "ui.c" +#line 10157 "ui.c" } #line 1994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp238_ = _ ("Saving document..."); @@ -9750,7 +10205,7 @@ static void user_interface_load (UserInterface* self) { _g_object_unref0 (hbox); #line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _g_object_unref0 (app); -#line 9740 "ui.c" +#line 10195 "ui.c" } @@ -9783,13 +10238,13 @@ static gboolean user_interface_is_desktop (UserInterface* self, const gchar* nam _g_free0 (desktop_name_list); #line 2002 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 9773 "ui.c" +#line 10228 "ui.c" } #line 2004 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp3_ = desktop_name_list; #line 2004 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp5_ = _tmp4_ = g_strsplit (_tmp3_, ":", 0); -#line 9779 "ui.c" +#line 10234 "ui.c" { gchar** n_collection = NULL; gint n_collection_length1 = 0; @@ -9801,14 +10256,14 @@ static gboolean user_interface_is_desktop (UserInterface* self, const gchar* nam n_collection_length1 = _vala_array_length (_tmp4_); #line 2004 "/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 9791 "ui.c" +#line 10246 "ui.c" gchar* _tmp6_ = NULL; gchar* n = NULL; #line 2004 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp6_ = g_strdup (n_collection[n_it]); #line 2004 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" n = _tmp6_; -#line 9798 "ui.c" +#line 10253 "ui.c" { const gchar* _tmp7_ = NULL; const gchar* _tmp8_ = NULL; @@ -9828,16 +10283,16 @@ static gboolean user_interface_is_desktop (UserInterface* self, const gchar* nam _g_free0 (desktop_name_list); #line 2006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 9818 "ui.c" +#line 10273 "ui.c" } #line 2004 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _g_free0 (n); -#line 9822 "ui.c" +#line 10277 "ui.c" } } #line 2004 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" n_collection = (_vala_array_free (n_collection, n_collection_length1, (GDestroyNotify) g_free), NULL); -#line 9827 "ui.c" +#line 10282 "ui.c" } #line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" result = FALSE; @@ -9845,7 +10300,7 @@ static gboolean user_interface_is_desktop (UserInterface* self, const gchar* nam _g_free0 (desktop_name_list); #line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 9835 "ui.c" +#line 10290 "ui.c" } @@ -9879,7 +10334,7 @@ static void user_interface_load_state (UserInterface* self) { static GQuark _tmp28_label1 = 0; #line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" static GQuark _tmp28_label2 = 0; -#line 9869 "ui.c" +#line 10324 "ui.c" GError * _inner_error_ = NULL; #line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_return_if_fail (self != NULL); @@ -9897,7 +10352,7 @@ static void user_interface_load_state (UserInterface* self) { _tmp3_ = g_key_file_new (); #line 2020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" f = _tmp3_; -#line 9887 "ui.c" +#line 10342 "ui.c" { GKeyFile* _tmp4_ = NULL; gchar* _tmp5_ = NULL; @@ -9917,12 +10372,12 @@ static void user_interface_load_state (UserInterface* self) { _g_free0 (_tmp7_); #line 2023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9907 "ui.c" - goto __catch22_g_error; +#line 10362 "ui.c" + goto __catch23_g_error; } } - goto __finally22; - __catch22_g_error: + goto __finally23; + __catch23_g_error: { GError* e = NULL; GError* _tmp8_ = NULL; @@ -9934,7 +10389,7 @@ static void user_interface_load_state (UserInterface* self) { _tmp8_ = e; #line 2027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (!g_error_matches (_tmp8_, G_FILE_ERROR, G_FILE_ERROR_NOENT)) { -#line 9924 "ui.c" +#line 10379 "ui.c" GError* _tmp9_ = NULL; const gchar* _tmp10_ = NULL; #line 2028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -9943,13 +10398,13 @@ static void user_interface_load_state (UserInterface* self) { _tmp10_ = _tmp9_->message; #line 2028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_warning ("ui.vala:2028: Failed to load state: %s", _tmp10_); -#line 9933 "ui.c" +#line 10388 "ui.c" } #line 2021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _g_error_free0 (e); -#line 9937 "ui.c" +#line 10392 "ui.c" } - __finally22: + __finally23: #line 2021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -9960,7 +10415,7 @@ static void user_interface_load_state (UserInterface* self) { g_clear_error (&_inner_error_); #line 2021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return; -#line 9950 "ui.c" +#line 10405 "ui.c" } #line 2030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp11_ = f; @@ -9974,7 +10429,7 @@ static void user_interface_load_state (UserInterface* self) { if (_tmp13_ <= 0) { #line 2032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" self->priv->window_width = 600; -#line 9964 "ui.c" +#line 10419 "ui.c" } #line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp14_ = f; @@ -9988,7 +10443,7 @@ static void user_interface_load_state (UserInterface* self) { if (_tmp16_ <= 0) { #line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" self->priv->window_height = 400; -#line 9978 "ui.c" +#line 10433 "ui.c" } #line 2036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp17_ = f; @@ -10028,59 +10483,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 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" switch (0) { -#line 10018 "ui.c" +#line 10473 "ui.c" default: { #line 2047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" self->priv->default_page_scan_direction = SCAN_DIRECTION_BOTTOM_TO_TOP; #line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 10025 "ui.c" +#line 10480 "ui.c" } } } else if (_tmp29_ == ((0 != _tmp28_label1) ? _tmp28_label1 : (_tmp28_label1 = g_quark_from_static_string ("left-to-right")))) { #line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" switch (0) { -#line 10031 "ui.c" +#line 10486 "ui.c" default: { #line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" self->priv->default_page_scan_direction = SCAN_DIRECTION_LEFT_TO_RIGHT; #line 2051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 10038 "ui.c" +#line 10493 "ui.c" } } } else if (_tmp29_ == ((0 != _tmp28_label2) ? _tmp28_label2 : (_tmp28_label2 = g_quark_from_static_string ("right-to-left")))) { #line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" switch (0) { -#line 10044 "ui.c" +#line 10499 "ui.c" default: { #line 2053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" self->priv->default_page_scan_direction = SCAN_DIRECTION_RIGHT_TO_LEFT; #line 2054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 10051 "ui.c" +#line 10506 "ui.c" } } } else { #line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" switch (0) { -#line 10057 "ui.c" +#line 10512 "ui.c" default: { #line 2044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" self->priv->default_page_scan_direction = SCAN_DIRECTION_TOP_TO_BOTTOM; #line 2045 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 10064 "ui.c" +#line 10519 "ui.c" } } } #line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _g_key_file_unref0 (f); -#line 10070 "ui.c" +#line 10525 "ui.c" } @@ -10095,7 +10550,7 @@ static gint user_interface_state_get_integer (UserInterface* self, GKeyFile* f, g_return_val_if_fail (group_name != NULL, 0); #line 2058 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_return_val_if_fail (key != NULL, 0); -#line 10085 "ui.c" +#line 10540 "ui.c" { gint _tmp0_ = 0; GKeyFile* _tmp1_ = NULL; @@ -10114,17 +10569,17 @@ static gint user_interface_state_get_integer (UserInterface* self, GKeyFile* f, _tmp0_ = _tmp4_; #line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10104 "ui.c" - goto __catch23_g_error; +#line 10559 "ui.c" + goto __catch24_g_error; } #line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" result = _tmp0_; #line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 10111 "ui.c" +#line 10566 "ui.c" } - goto __finally23; - __catch23_g_error: + goto __finally24; + __catch24_g_error: { gint _tmp5_ = 0; #line 2060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -10137,16 +10592,16 @@ static gint user_interface_state_get_integer (UserInterface* self, GKeyFile* f, result = _tmp5_; #line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 10127 "ui.c" +#line 10582 "ui.c" } - __finally23: + __finally24: #line 2060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 2060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_clear_error (&_inner_error_); #line 2060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return 0; -#line 10136 "ui.c" +#line 10591 "ui.c" } @@ -10161,7 +10616,7 @@ static gboolean user_interface_state_get_boolean (UserInterface* self, GKeyFile* g_return_val_if_fail (group_name != NULL, FALSE); #line 2070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_return_val_if_fail (key != NULL, FALSE); -#line 10151 "ui.c" +#line 10606 "ui.c" { gboolean _tmp0_ = FALSE; GKeyFile* _tmp1_ = NULL; @@ -10180,17 +10635,17 @@ static gboolean user_interface_state_get_boolean (UserInterface* self, GKeyFile* _tmp0_ = _tmp4_; #line 2074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10170 "ui.c" - goto __catch24_g_error; +#line 10625 "ui.c" + goto __catch25_g_error; } #line 2074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" result = _tmp0_; #line 2074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 10177 "ui.c" +#line 10632 "ui.c" } - goto __finally24; - __catch24_g_error: + goto __finally25; + __catch25_g_error: { gboolean _tmp5_ = FALSE; #line 2072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -10203,16 +10658,16 @@ static gboolean user_interface_state_get_boolean (UserInterface* self, GKeyFile* result = _tmp5_; #line 2078 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 10193 "ui.c" +#line 10648 "ui.c" } - __finally24: + __finally25: #line 2072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 2072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_clear_error (&_inner_error_); #line 2072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return FALSE; -#line 10202 "ui.c" +#line 10657 "ui.c" } @@ -10229,7 +10684,7 @@ static gchar* user_interface_state_get_string (UserInterface* self, GKeyFile* f, g_return_val_if_fail (key != NULL, NULL); #line 2082 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_return_val_if_fail (_default_ != NULL, NULL); -#line 10219 "ui.c" +#line 10674 "ui.c" { gchar* _tmp0_ = NULL; GKeyFile* _tmp1_ = NULL; @@ -10249,8 +10704,8 @@ static gchar* user_interface_state_get_string (UserInterface* self, GKeyFile* f, _tmp0_ = _tmp4_; #line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10239 "ui.c" - goto __catch25_g_error; +#line 10694 "ui.c" + goto __catch26_g_error; } #line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp5_ = _tmp0_; @@ -10262,10 +10717,10 @@ static gchar* user_interface_state_get_string (UserInterface* self, GKeyFile* f, _g_free0 (_tmp0_); #line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 10252 "ui.c" +#line 10707 "ui.c" } - goto __finally25; - __catch25_g_error: + goto __finally26; + __catch26_g_error: { const gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; @@ -10281,16 +10736,16 @@ static gchar* user_interface_state_get_string (UserInterface* self, GKeyFile* f, result = _tmp7_; #line 2090 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 10271 "ui.c" +#line 10726 "ui.c" } - __finally25: + __finally26: #line 2084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 2084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_clear_error (&_inner_error_); #line 2084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return NULL; -#line 10280 "ui.c" +#line 10735 "ui.c" } @@ -10304,7 +10759,7 @@ static gboolean ___lambda11_ (UserInterface* self) { result = FALSE; #line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 10294 "ui.c" +#line 10749 "ui.c" } @@ -10313,7 +10768,7 @@ static gboolean ____lambda11__gsource_func (gpointer self) { result = ___lambda11_ ((UserInterface*) self); #line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 10303 "ui.c" +#line 10758 "ui.c" } @@ -10344,20 +10799,20 @@ static void user_interface_save_state (UserInterface* self, gboolean force) { _tmp0_ = force; #line 2096 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (!_tmp0_) { -#line 10334 "ui.c" +#line 10789 "ui.c" guint _tmp1_ = 0U; guint _tmp3_ = 0U; #line 2098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp1_ = self->priv->save_state_timeout; #line 2098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp1_ != ((guint) 0)) { -#line 10341 "ui.c" +#line 10796 "ui.c" guint _tmp2_ = 0U; #line 2099 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp2_ = self->priv->save_state_timeout; #line 2099 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_source_remove (_tmp2_); -#line 10347 "ui.c" +#line 10802 "ui.c" } #line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp3_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, ____lambda11__gsource_func, g_object_ref (self), g_object_unref); @@ -10365,7 +10820,7 @@ static void user_interface_save_state (UserInterface* self, gboolean force) { self->priv->save_state_timeout = _tmp3_; #line 2106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return; -#line 10355 "ui.c" +#line 10810 "ui.c" } #line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp4_ = user_interface_get_state_filename (self); @@ -10423,7 +10878,7 @@ static void user_interface_save_state (UserInterface* self, gboolean force) { switch (_tmp20_) { #line 2118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" case SCAN_DIRECTION_TOP_TO_BOTTOM: -#line 10413 "ui.c" +#line 10868 "ui.c" { GKeyFile* _tmp21_ = NULL; #line 2121 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -10432,11 +10887,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 2122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 10422 "ui.c" +#line 10877 "ui.c" } #line 2118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" case SCAN_DIRECTION_BOTTOM_TO_TOP: -#line 10426 "ui.c" +#line 10881 "ui.c" { GKeyFile* _tmp22_ = NULL; #line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -10445,11 +10900,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 2125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 10435 "ui.c" +#line 10890 "ui.c" } #line 2118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" case SCAN_DIRECTION_LEFT_TO_RIGHT: -#line 10439 "ui.c" +#line 10894 "ui.c" { GKeyFile* _tmp23_ = NULL; #line 2127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -10458,11 +10913,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 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 10448 "ui.c" +#line 10903 "ui.c" } #line 2118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" case SCAN_DIRECTION_RIGHT_TO_LEFT: -#line 10452 "ui.c" +#line 10907 "ui.c" { GKeyFile* _tmp24_ = NULL; #line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -10471,12 +10926,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 2131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 10461 "ui.c" +#line 10916 "ui.c" } default: #line 2118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 10466 "ui.c" +#line 10921 "ui.c" } { gchar* _tmp25_ = NULL; @@ -10498,19 +10953,19 @@ static void user_interface_save_state (UserInterface* self, gboolean force) { #line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp30_ = _tmp29_; #line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - g_file_set_contents (_tmp27_, _tmp30_, (gssize) (-1), &_inner_error_); + g_file_set_contents (_tmp27_, _tmp30_, (gssize) -1, &_inner_error_); #line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _g_free0 (_tmp30_); #line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _g_free0 (_tmp27_); #line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10495 "ui.c" - goto __catch26_g_error; +#line 10950 "ui.c" + goto __catch27_g_error; } } - goto __finally26; - __catch26_g_error: + goto __finally27; + __catch27_g_error: { GError* e = NULL; GError* _tmp31_ = NULL; @@ -10527,9 +10982,9 @@ static void user_interface_save_state (UserInterface* self, gboolean force) { g_warning ("ui.vala:2139: Failed to write state: %s", _tmp32_); #line 2133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _g_error_free0 (e); -#line 10517 "ui.c" +#line 10972 "ui.c" } - __finally26: + __finally27: #line 2133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -10540,15 +10995,15 @@ static void user_interface_save_state (UserInterface* self, gboolean force) { g_clear_error (&_inner_error_); #line 2133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return; -#line 10530 "ui.c" +#line 10985 "ui.c" } #line 2094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _g_key_file_unref0 (f); -#line 10534 "ui.c" +#line 10989 "ui.c" } -static gboolean ___lambda19_ (UserInterface* self) { +static gboolean ___lambda21_ (UserInterface* self) { gboolean result = FALSE; ProgressBarDialog* _tmp0_ = NULL; #line 2154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -10559,16 +11014,16 @@ static gboolean ___lambda19_ (UserInterface* self) { result = FALSE; #line 2155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 10549 "ui.c" +#line 11004 "ui.c" } -static gboolean ____lambda19__gsource_func (gpointer self) { +static gboolean ____lambda21__gsource_func (gpointer self) { gboolean result; - result = ___lambda19_ ((UserInterface*) self); + result = ___lambda21_ ((UserInterface*) self); #line 2153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 10558 "ui.c" +#line 11013 "ui.c" } @@ -10595,7 +11050,7 @@ static void user_interface_book_saving_cb (UserInterface* self, gint page_number g_return_if_fail (self != NULL); #line 2146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" while (TRUE) { -#line 10585 "ui.c" +#line 11040 "ui.c" gboolean _tmp0_ = FALSE; #line 2146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp0_ = gtk_events_pending (); @@ -10603,11 +11058,11 @@ static void user_interface_book_saving_cb (UserInterface* self, gint page_number if (!_tmp0_) { #line 2146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 10593 "ui.c" +#line 11048 "ui.c" } #line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_main_iteration (); -#line 10597 "ui.c" +#line 11052 "ui.c" } #line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp1_ = self->priv->_book; @@ -10632,8 +11087,8 @@ static void user_interface_book_saving_cb (UserInterface* self, gint page_number #line 2152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp7_) { #line 2153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" - g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 500, ____lambda19__gsource_func, g_object_ref (self), g_object_unref); -#line 10623 "ui.c" + g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 500, ____lambda21__gsource_func, g_object_ref (self), g_object_unref); +#line 11078 "ui.c" } #line 2157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp8_ = _ ("Saving page %d out of %d"); @@ -10657,7 +11112,7 @@ static void user_interface_book_saving_cb (UserInterface* self, gint page_number progress_bar_dialog_set_message (_tmp14_, message); #line 2143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _g_free0 (message); -#line 10647 "ui.c" +#line 11102 "ui.c" } @@ -10669,7 +11124,7 @@ void user_interface_show_progress_dialog (UserInterface* self) { _tmp0_ = self->priv->progress_dialog; #line 2165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_widget_set_visible ((GtkWidget*) _tmp0_, TRUE); -#line 10659 "ui.c" +#line 11114 "ui.c" } @@ -10681,7 +11136,7 @@ void user_interface_hide_progress_dialog (UserInterface* self) { _tmp0_ = self->priv->progress_dialog; #line 2170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_widget_set_visible ((GtkWidget*) _tmp0_, FALSE); -#line 10671 "ui.c" +#line 11126 "ui.c" } @@ -10721,7 +11176,7 @@ void user_interface_show_error (UserInterface* self, const gchar* error_title, c self->priv->error_change_scanner_hint = _tmp4_; #line 2179 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" user_interface_update_info_bar (self); -#line 10711 "ui.c" +#line 11166 "ui.c" } @@ -10730,7 +11185,7 @@ void user_interface_start (UserInterface* self) { g_return_if_fail (self != NULL); #line 2184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" gtk_widget_set_visible ((GtkWidget*) self, TRUE); -#line 10720 "ui.c" +#line 11175 "ui.c" } @@ -10745,14 +11200,14 @@ Book* user_interface_get_book (UserInterface* self) { result = _tmp0_; #line 164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 10735 "ui.c" +#line 11190 "ui.c" } static gpointer _book_ref0 (gpointer self) { #line 164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return self ? book_ref (self) : NULL; -#line 10742 "ui.c" +#line 11197 "ui.c" } @@ -10771,7 +11226,7 @@ static void user_interface_set_book (UserInterface* self, Book* value) { self->priv->_book = _tmp1_; #line 164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_object_notify ((GObject *) self, "book"); -#line 10761 "ui.c" +#line 11216 "ui.c" } @@ -10792,7 +11247,7 @@ Page* user_interface_get_selected_page (UserInterface* self) { result = _tmp2_; #line 171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 10782 "ui.c" +#line 11237 "ui.c" } @@ -10809,7 +11264,7 @@ void user_interface_set_selected_page (UserInterface* self, Page* value) { book_view_set_selected_page (_tmp0_, _tmp1_); #line 173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_object_notify ((GObject *) self, "selected-page"); -#line 10799 "ui.c" +#line 11254 "ui.c" } @@ -10824,7 +11279,7 @@ gboolean user_interface_get_scanning (UserInterface* self) { result = _tmp0_; #line 193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 10814 "ui.c" +#line 11269 "ui.c" } @@ -10878,7 +11333,7 @@ void user_interface_set_scanning (UserInterface* self, gboolean value) { gtk_widget_set_visible ((GtkWidget*) _tmp9_, _tmp10_); #line 194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_object_notify ((GObject *) self, "scanning"); -#line 10868 "ui.c" +#line 11323 "ui.c" } @@ -10899,7 +11354,7 @@ gint user_interface_get_brightness (UserInterface* self) { result = (gint) _tmp2_; #line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 10889 "ui.c" +#line 11344 "ui.c" } @@ -10916,7 +11371,7 @@ void user_interface_set_brightness (UserInterface* self, gint value) { gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_); #line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_object_notify ((GObject *) self, "brightness"); -#line 10906 "ui.c" +#line 11361 "ui.c" } @@ -10937,7 +11392,7 @@ gint user_interface_get_contrast (UserInterface* self) { result = (gint) _tmp2_; #line 219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 10927 "ui.c" +#line 11382 "ui.c" } @@ -10954,7 +11409,7 @@ void user_interface_set_contrast (UserInterface* self, gint value) { gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_); #line 220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_object_notify ((GObject *) self, "contrast"); -#line 10944 "ui.c" +#line 11399 "ui.c" } @@ -10975,7 +11430,7 @@ gint user_interface_get_quality (UserInterface* self) { result = (gint) _tmp2_; #line 225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 10965 "ui.c" +#line 11420 "ui.c" } @@ -10992,7 +11447,7 @@ void user_interface_set_quality (UserInterface* self, gint value) { gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_); #line 226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_object_notify ((GObject *) self, "quality"); -#line 10982 "ui.c" +#line 11437 "ui.c" } @@ -11012,7 +11467,7 @@ gchar* user_interface_get_selected_device (UserInterface* self) { iter = _tmp1_; #line 235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (_tmp2_) { -#line 11002 "ui.c" +#line 11457 "ui.c" gchar* device = NULL; GtkListStore* _tmp3_ = NULL; GtkTreeIter _tmp4_ = {0}; @@ -11026,13 +11481,13 @@ gchar* user_interface_get_selected_device (UserInterface* self) { result = device; #line 239 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 11016 "ui.c" +#line 11471 "ui.c" } #line 242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" result = NULL; #line 242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 11022 "ui.c" +#line 11477 "ui.c" } @@ -11055,7 +11510,7 @@ void user_interface_set_selected_device (UserInterface* self, const gchar* value if (!_tmp2_) { #line 249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return; -#line 11045 "ui.c" +#line 11500 "ui.c" } #line 251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp3_ = self->priv->device_combo; @@ -11067,7 +11522,7 @@ void user_interface_set_selected_device (UserInterface* self, const gchar* value self->priv->user_selected_device = TRUE; #line 245 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_object_notify ((GObject *) self, "selected-device"); -#line 11057 "ui.c" +#line 11512 "ui.c" } @@ -11085,7 +11540,7 @@ static gchar* user_interface_get_state_filename (UserInterface* self) { result = _tmp1_; #line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 11075 "ui.c" +#line 11530 "ui.c" } @@ -11104,19 +11559,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 11094 "ui.c" +#line 11549 "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 11100 "ui.c" +#line 11555 "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 11106 "ui.c" +#line 11561 "ui.c" } @@ -11135,19 +11590,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 11125 "ui.c" +#line 11580 "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 11131 "ui.c" +#line 11586 "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 11137 "ui.c" +#line 11592 "ui.c" } @@ -11371,7 +11826,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 11361 "ui.c" +#line 11816 "ui.c" } @@ -11391,7 +11846,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 11381 "ui.c" +#line 11836 "ui.c" } @@ -11567,7 +12022,7 @@ static void user_interface_finalize (GObject* obj) { _g_free0 (self->priv->document_hint); #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" G_OBJECT_CLASS (user_interface_parent_class)->finalize (obj); -#line 11557 "ui.c" +#line 12012 "ui.c" } @@ -11630,13 +12085,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 11620 "ui.c" +#line 12075 "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 11626 "ui.c" +#line 12081 "ui.c" } } @@ -11688,13 +12143,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 11678 "ui.c" +#line 12133 "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 11684 "ui.c" +#line 12139 "ui.c" } } @@ -11791,14 +12246,14 @@ ProgressBarDialog* progress_bar_dialog_construct (GType object_type, GtkApplicat _g_object_unref0 (hbox); #line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return self; -#line 11781 "ui.c" +#line 12236 "ui.c" } ProgressBarDialog* progress_bar_dialog_new (GtkApplicationWindow* parent, const gchar* title) { #line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return progress_bar_dialog_construct (TYPE_PROGRESS_BAR_DIALOG, parent, title); -#line 11788 "ui.c" +#line 12243 "ui.c" } @@ -11819,7 +12274,7 @@ gdouble progress_bar_dialog_get_fraction (ProgressBarDialog* self) { result = _tmp2_; #line 2194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 11809 "ui.c" +#line 12264 "ui.c" } @@ -11836,7 +12291,7 @@ void progress_bar_dialog_set_fraction (ProgressBarDialog* self, gdouble value) { gtk_progress_bar_set_fraction (_tmp0_, _tmp1_); #line 2195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_object_notify ((GObject *) self, "fraction"); -#line 11826 "ui.c" +#line 12281 "ui.c" } @@ -11857,7 +12312,7 @@ const gchar* progress_bar_dialog_get_message (ProgressBarDialog* self) { result = _tmp2_; #line 2200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 11847 "ui.c" +#line 12302 "ui.c" } @@ -11874,7 +12329,7 @@ void progress_bar_dialog_set_message (ProgressBarDialog* self, const gchar* valu gtk_progress_bar_set_text (_tmp0_, _tmp1_); #line 2201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" g_object_notify ((GObject *) self, "message"); -#line 11864 "ui.c" +#line 12319 "ui.c" } @@ -11893,14 +12348,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 2188 "/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 11883 "ui.c" +#line 12338 "ui.c" } static void progress_bar_dialog_instance_init (ProgressBarDialog * self) { #line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" self->priv = PROGRESS_BAR_DIALOG_GET_PRIVATE (self); -#line 11890 "ui.c" +#line 12345 "ui.c" } @@ -11912,7 +12367,7 @@ static void progress_bar_dialog_finalize (GObject* obj) { _g_object_unref0 (self->priv->bar); #line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" G_OBJECT_CLASS (progress_bar_dialog_parent_class)->finalize (obj); -#line 11902 "ui.c" +#line 12357 "ui.c" } @@ -11945,13 +12400,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 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 11935 "ui.c" +#line 12390 "ui.c" default: #line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 11941 "ui.c" +#line 12396 "ui.c" } } @@ -11973,13 +12428,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 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 11963 "ui.c" +#line 12418 "ui.c" default: #line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" break; -#line 11969 "ui.c" +#line 12424 "ui.c" } } @@ -12004,7 +12459,7 @@ gchar* get_temporary_filename (const gchar* prefix, const gchar* extension) { _tmp2_ = g_strdup_printf ("%sXXXXXX.%s", _tmp0_, _tmp1_); #line 2238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" filename = _tmp2_; -#line 11994 "ui.c" +#line 12449 "ui.c" { gint fd = 0; const gchar* _tmp3_ = NULL; @@ -12023,17 +12478,17 @@ gchar* get_temporary_filename (const gchar* prefix, const gchar* extension) { fd = _tmp5_; #line 2242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12013 "ui.c" - goto __catch27_g_error; +#line 12468 "ui.c" + goto __catch28_g_error; } #line 2243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp6_ = fd; #line 2243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" close (_tmp6_); -#line 12020 "ui.c" +#line 12475 "ui.c" } - goto __finally27; - __catch27_g_error: + goto __finally28; + __catch28_g_error: { GError* e = NULL; GError* _tmp7_ = NULL; @@ -12058,9 +12513,9 @@ gchar* get_temporary_filename (const gchar* prefix, const gchar* extension) { _g_free0 (filename); #line 2248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 12048 "ui.c" +#line 12503 "ui.c" } - __finally27: + __finally28: #line 2240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -12073,7 +12528,7 @@ gchar* get_temporary_filename (const gchar* prefix, const gchar* extension) { g_clear_error (&_inner_error_); #line 2240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return NULL; -#line 12063 "ui.c" +#line 12518 "ui.c" } #line 2251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" result = path; @@ -12081,7 +12536,7 @@ gchar* get_temporary_filename (const gchar* prefix, const gchar* extension) { _g_free0 (filename); #line 2251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 12071 "ui.c" +#line 12526 "ui.c" } @@ -12118,14 +12573,14 @@ PageIcon* page_icon_construct (GType object_type, const gchar* text, gdouble r, self->priv->b = _tmp4_; #line 2262 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return self; -#line 12108 "ui.c" +#line 12563 "ui.c" } PageIcon* page_icon_new (const gchar* text, gdouble r, gdouble g, gdouble b) { #line 2262 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return page_icon_construct (TYPE_PAGE_ICON, text, r, g, b); -#line 12115 "ui.c" +#line 12570 "ui.c" } @@ -12143,13 +12598,13 @@ static void page_icon_real_get_preferred_width (GtkWidget* base, gint* minimum_w if (minimum_width) { #line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" *minimum_width = _vala_minimum_width; -#line 12133 "ui.c" +#line 12588 "ui.c" } #line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (natural_width) { #line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" *natural_width = _vala_natural_width; -#line 12139 "ui.c" +#line 12594 "ui.c" } } @@ -12171,13 +12626,13 @@ static void page_icon_real_get_preferred_height (GtkWidget* base, gint* minimum_ if (minimum_height) { #line 2275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" *minimum_height = _vala_minimum_height; -#line 12161 "ui.c" +#line 12616 "ui.c" } #line 2275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (natural_height) { #line 2275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" *natural_height = _vala_natural_height; -#line 12167 "ui.c" +#line 12622 "ui.c" } } @@ -12199,13 +12654,13 @@ static void page_icon_real_get_preferred_height_for_width (GtkWidget* base, gint if (minimum_height) { #line 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" *minimum_height = _vala_minimum_height; -#line 12189 "ui.c" +#line 12644 "ui.c" } #line 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (natural_height) { #line 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" *natural_height = _vala_natural_height; -#line 12195 "ui.c" +#line 12650 "ui.c" } } @@ -12227,13 +12682,13 @@ static void page_icon_real_get_preferred_width_for_height (GtkWidget* base, gint if (minimum_width) { #line 2285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" *minimum_width = _vala_minimum_width; -#line 12217 "ui.c" +#line 12672 "ui.c" } #line 2285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if (natural_width) { #line 2285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" *natural_width = _vala_natural_width; -#line 12223 "ui.c" +#line 12678 "ui.c" } } @@ -12294,7 +12749,7 @@ static gboolean page_icon_real_draw (GtkWidget* base, cairo_t* c) { _tmp3_ = h; #line 2294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" if ((_tmp2_ * G_SQRT2) > ((gdouble) _tmp3_)) { -#line 12284 "ui.c" +#line 12739 "ui.c" gint _tmp4_ = 0; gdouble _tmp5_ = 0.0; #line 2295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" @@ -12303,7 +12758,7 @@ static gboolean page_icon_real_draw (GtkWidget* base, cairo_t* c) { _tmp5_ = round (_tmp4_ / G_SQRT2); #line 2295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" w = (gint) _tmp5_; -#line 12293 "ui.c" +#line 12748 "ui.c" } else { gint _tmp6_ = 0; gdouble _tmp7_ = 0.0; @@ -12313,7 +12768,7 @@ static gboolean page_icon_real_draw (GtkWidget* base, cairo_t* c) { _tmp7_ = round (_tmp6_ * G_SQRT2); #line 2297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" h = (gint) _tmp7_; -#line 12303 "ui.c" +#line 12758 "ui.c" } #line 2299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" _tmp8_ = c; @@ -12395,7 +12850,7 @@ static gboolean page_icon_real_draw (GtkWidget* base, cairo_t* c) { result = TRUE; #line 2315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" return result; -#line 12385 "ui.c" +#line 12840 "ui.c" } @@ -12416,14 +12871,14 @@ static void page_icon_class_init (PageIconClass * klass) { ((GtkWidgetClass *) klass)->draw = page_icon_real_draw; #line 2254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" G_OBJECT_CLASS (klass)->finalize = page_icon_finalize; -#line 12406 "ui.c" +#line 12861 "ui.c" } static void page_icon_instance_init (PageIcon * self) { #line 2254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" self->priv = PAGE_ICON_GET_PRIVATE (self); -#line 12413 "ui.c" +#line 12868 "ui.c" } @@ -12435,7 +12890,7 @@ static void page_icon_finalize (GObject* obj) { _g_free0 (self->priv->text); #line 2254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala" G_OBJECT_CLASS (page_icon_parent_class)->finalize (obj); -#line 12425 "ui.c" +#line 12880 "ui.c" } |