Hello community,
here is the log from the commit of package simple-scan for openSUSE:Factory
checked in at 2016-02-23 16:52:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/simple-scan (Old)
and /work/SRC/openSUSE:Factory/.simple-scan.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "simple-scan"
Changes:
--------
--- /work/SRC/openSUSE:Factory/simple-scan/simple-scan.changes 2015-11-22
10:58:02.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.simple-scan.new/simple-scan.changes
2016-02-23 16:52:22.000000000 +0100
@@ -1,0 +2,7 @@
+Wed Feb 17 10:42:45 UTC 2016 - eshmar...@suse.com
+
+- Update to version 3.18.2:
+ + Fix Wrong Epson URL.
+ + Fix an issue with choosing of optional dependencies.
+
+-------------------------------------------------------------------
Old:
----
simple-scan-3.18.1.tar.xz
New:
----
simple-scan-3.18.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ simple-scan.spec ++++++
--- /var/tmp/diff_new_pack.2Mb0Kv/_old 2016-02-23 16:52:23.000000000 +0100
+++ /var/tmp/diff_new_pack.2Mb0Kv/_new 2016-02-23 16:52:23.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package simple-scan
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,7 @@
%endif
Name: simple-scan
-Version: 3.18.1
+Version: 3.18.2
Release: 0
Summary: Simple Scanning Utility
License: GPL-3.0+
++++++ simple-scan-3.18.1.tar.xz -> simple-scan-3.18.2.tar.xz ++++++
++++ 1666 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/simple-scan-3.18.1/NEWS new/simple-scan-3.18.2/NEWS
--- old/simple-scan-3.18.1/NEWS 2015-10-10 23:16:45.000000000 +0200
+++ new/simple-scan-3.18.2/NEWS 2015-11-26 21:20:01.000000000 +0100
@@ -1,3 +1,8 @@
+Overview of changes in simple-scan 3.18.2
+
+ * Fix URL for Epson website
+ * Make colord/packagekit support able to be explicitly disabled
+
Overview of changes in simple-scan 3.18.1
* Make PackageKit support optional
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/simple-scan-3.18.1/configure.ac new/simple-scan-3.18.2/configure.ac
--- old/simple-scan-3.18.1/configure.ac 2015-10-10 23:16:26.000000000 +0200
+++ new/simple-scan-3.18.2/configure.ac 2015-11-26 21:20:08.000000000 +0100
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(simple-scan, 3.18.1)
+AC_INIT(simple-scan, 3.18.2)
AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
AM_SILENT_RULES([yes])
AM_MAINTAINER_MODE
@@ -31,14 +31,40 @@
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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/simple-scan-3.18.1/src/autosave-manager.c
new/simple-scan-3.18.2/src/autosave-manager.c
--- old/simple-scan-3.18.1/src/autosave-manager.c 2015-10-12
10:09:22.000000000 +0200
+++ new/simple-scan-3.18.2/src/autosave-manager.c 2015-11-26
21:20:28.000000000 +0100
@@ -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 */
/*
@@ -1984,7 +1984,7 @@
#line 335 "/home/bob/bzr/simple-scan/3.18/src/autosave-manager.vala"
_tmp115_ = _tmp114_;
#line 335 "/home/bob/bzr/simple-scan/3.18/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/3.18/src/autosave-manager.vala"
_g_free0 (_tmp115_);
#line 335 "/home/bob/bzr/simple-scan/3.18/src/autosave-manager.vala"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/simple-scan-3.18.1/src/book-view.c new/simple-scan-3.18.2/src/book-view.c
--- old/simple-scan-3.18.1/src/book-view.c 2015-10-12 10:09:22.000000000
+0200
+++ new/simple-scan-3.18.2/src/book-view.c 2015-11-26 21:20:28.000000000
+0100
@@ -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 */
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/simple-scan-3.18.1/src/book.c new/simple-scan-3.18.2/src/book.c
--- old/simple-scan-3.18.1/src/book.c 2015-10-12 10:09:22.000000000 +0200
+++ new/simple-scan-3.18.2/src/book.c 2015-11-26 21:20:28.000000000 +0100
@@ -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 @@
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 @@
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 @@
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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/simple-scan-3.18.1/src/page-view.c new/simple-scan-3.18.2/src/page-view.c
--- old/simple-scan-3.18.1/src/page-view.c 2015-10-12 10:09:22.000000000
+0200
+++ new/simple-scan-3.18.2/src/page-view.c 2015-11-26 21:20:28.000000000
+0100
@@ -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 */
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/simple-scan-3.18.1/src/page.c new/simple-scan-3.18.2/src/page.c
--- old/simple-scan-3.18.1/src/page.c 2015-10-12 10:09:22.000000000 +0200
+++ new/simple-scan-3.18.2/src/page.c 2015-11-26 21:20:28.000000000 +0100
@@ -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 @@
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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/simple-scan-3.18.1/src/scanner.c new/simple-scan-3.18.2/src/scanner.c
--- old/simple-scan-3.18.1/src/scanner.c 2015-10-12 10:09:22.000000000
+0200
+++ new/simple-scan-3.18.2/src/scanner.c 2015-11-26 21:20:28.000000000
+0100
@@ -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 @@
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* 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 @@
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 @@
__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 @@
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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/simple-scan-3.18.1/src/simple-scan.c
new/simple-scan-3.18.2/src/simple-scan.c
--- old/simple-scan-3.18.1/src/simple-scan.c 2015-10-12 10:09:22.000000000
+0200
+++ new/simple-scan-3.18.2/src/simple-scan.c 2015-11-26 21:20:28.000000000
+0100
@@ -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 */
/*
@@ -973,13 +973,13 @@
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 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 @@
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 @@
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 @@
#line 575 "/home/bob/bzr/simple-scan/3.18/src/simple-scan.vala"
_tmp33_ = _tmp32_->str;
#line 575 "/home/bob/bzr/simple-scan/3.18/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/3.18/src/simple-scan.vala"
_tmp35_ = _tmp34_;
#line 575 "/home/bob/bzr/simple-scan/3.18/src/simple-scan.vala"
@@ -3462,7 +3462,7 @@
#line 581 "/home/bob/bzr/simple-scan/3.18/src/simple-scan.vala"
_tmp43_ = _tmp42_->str;
#line 581 "/home/bob/bzr/simple-scan/3.18/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/3.18/src/simple-scan.vala"
_tmp45_ = _tmp44_;
#line 581 "/home/bob/bzr/simple-scan/3.18/src/simple-scan.vala"
@@ -3670,7 +3670,7 @@
#line 599 "/home/bob/bzr/simple-scan/3.18/src/simple-scan.vala"
_tmp89_ =
_tmp88_->str;
#line 599 "/home/bob/bzr/simple-scan/3.18/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/3.18/src/simple-scan.vala"
_tmp91_ =
_tmp90_;
#line 599 "/home/bob/bzr/simple-scan/3.18/src/simple-scan.vala"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/simple-scan-3.18.1/src/ui.c new/simple-scan-3.18.2/src/ui.c
--- old/simple-scan-3.18.1/src/ui.c 2015-10-12 10:09:22.000000000 +0200
+++ new/simple-scan-3.18.2/src/ui.c 2015-11-26 21:20:28.000000000 +0100
@@ -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 */
/*
@@ -2003,33 +2003,33 @@
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 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 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 2035 "ui.c"
}
@@ -2053,103 +2053,103 @@
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 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 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 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 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 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 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 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 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 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 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 2155 "ui.c"
}
@@ -2865,7 +2865,7 @@
#line 628 "/home/bob/bzr/simple-scan/3.18/src/ui.vala"
_tmp10_ = uri;
#line 628 "/home/bob/bzr/simple-scan/3.18/src/ui.vala"
- _tmp11_ = g_utf8_strdown (_tmp10_, (gssize) (-1));
+ _tmp11_ = g_utf8_strdown (_tmp10_, (gssize) -1);
#line 628 "/home/bob/bzr/simple-scan/3.18/src/ui.vala"
uri_lower = _tmp11_;
#line 629 "/home/bob/bzr/simple-scan/3.18/src/ui.vala"
@@ -5928,15 +5928,15 @@
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 5942 "ui.c"
}
@@ -7518,7 +7518,7 @@
#line 1597 "/home/bob/bzr/simple-scan/3.18/src/ui.vala"
message = _tmp20_;
#line 1599 "/home/bob/bzr/simple-scan/3.18/src/ui.vala"
- _tmp21_ = _ ("Drivers for this are available on
the <a href=\"http://support.epsom.c"; \
+ _tmp21_ = _ ("Drivers for this are available on
the <a href=\"http://support.epson.c"; \
"om\">Epson website</a>.");
#line 1599 "/home/bob/bzr/simple-scan/3.18/src/ui.vala"
_tmp22_ = g_strdup (_tmp21_);
@@ -7851,13 +7851,13 @@
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 7849 "ui.c"
}
@@ -7865,11 +7865,11 @@
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 7861 "ui.c"
}
@@ -10953,7 +10953,7 @@
#line 2135 "/home/bob/bzr/simple-scan/3.18/src/ui.vala"
_tmp30_ = _tmp29_;
#line 2135 "/home/bob/bzr/simple-scan/3.18/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/3.18/src/ui.vala"
_g_free0 (_tmp30_);
#line 2135 "/home/bob/bzr/simple-scan/3.18/src/ui.vala"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/simple-scan-3.18.1/src/ui.vala new/simple-scan-3.18.2/src/ui.vala
--- old/simple-scan-3.18.1/src/ui.vala 2015-09-29 00:43:13.000000000 +0200
+++ new/simple-scan-3.18.2/src/ui.vala 2015-11-26 21:13:38.000000000 +0100
@@ -1596,7 +1596,7 @@
/* Message to indicate an Epson scanner has been detected */
message = _("You appear to have an Epson scanner.");
/* Instructions on how to install Epson scanner drivers */
- instructions = _("Drivers for this are available on the <a
href=\"http://support.epsom.com\";>Epson website</a>.");
+ instructions = _("Drivers for this are available on the <a
href=\"http://support.epson.com\";>Epson website</a>.");
break;
}
var dialog = new Gtk.Dialog.with_buttons (/* Title of dialog giving
instructions on how to install drivers */
