summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-04-14 06:34:46 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-04-14 06:34:46 +0200
commit55a9aafc03eee2880135c7997673e0277fe20cbb (patch)
tree4a52580b85ccd2cbc053381d9ae90141d8ccbb7c
parent33cadea6a68bb4c725d1dc4e13a99c5e3bd1c866 (diff)
parent2fb926c2bb3fd45a2d1428db6a44ce9da8b9a85d (diff)
Merge tag 'upstream/3.16.1.1'
Upstream version 3.16.1.1
-rw-r--r--NEWS4
-rwxr-xr-xconfigure20
-rw-r--r--configure.ac2
-rw-r--r--src/ui.c2
-rw-r--r--src/ui.vala2
5 files changed, 17 insertions, 13 deletions
diff --git a/NEWS b/NEWS
index 0503232..131cb34 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Overview of changes in simple-scan 3.16.1.1
+
+ * Fix logic for adding blank page on page removal.
+
Overview of changes in simple-scan 3.16.1
* Fix save button being inactive on pages restored after a crash
diff --git a/configure b/configure
index 574dbf9..7d930bf 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for simple-scan 3.16.1.
+# Generated by GNU Autoconf 2.69 for simple-scan 3.16.1.1.
#
#
# 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.16.1'
-PACKAGE_STRING='simple-scan 3.16.1'
+PACKAGE_VERSION='3.16.1.1'
+PACKAGE_STRING='simple-scan 3.16.1.1'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1397,7 +1397,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.16.1 to adapt to many kinds of systems.
+\`configure' configures simple-scan 3.16.1.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1463,7 +1463,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of simple-scan 3.16.1:";;
+ short | recursive ) echo "Configuration of simple-scan 3.16.1.1:";;
esac
cat <<\_ACEOF
@@ -1579,7 +1579,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-simple-scan configure 3.16.1
+simple-scan configure 3.16.1.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1831,7 +1831,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.16.1, which was
+It was created by simple-scan $as_me 3.16.1.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2694,7 +2694,7 @@ fi
# Define the identity of the package.
PACKAGE='simple-scan'
- VERSION='3.16.1'
+ VERSION='3.16.1.1'
cat >>confdefs.h <<_ACEOF
@@ -6370,7 +6370,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.16.1, which was
+This file was extended by simple-scan $as_me 3.16.1.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6427,7 +6427,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.16.1
+simple-scan config.status 3.16.1.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index ebe24ba..e2b273c 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.16.1)
+AC_INIT(simple-scan, 3.16.1.1)
AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
AM_SILENT_RULES([yes])
AM_MAINTAINER_MODE
diff --git a/src/ui.c b/src/ui.c
index 266a2f2..d2a437c 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -7363,7 +7363,7 @@ static void user_interface_page_removed_cb (UserInterface* self, Book* book, Pag
#line 1613 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
_tmp6_ = _tmp5_;
#line 1613 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
- if (_tmp6_ == ((guint) 1)) {
+ if (_tmp6_ == ((guint) 0)) {
#line 1614 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
user_interface_add_default_page (self);
#line 7359 "ui.c"
diff --git a/src/ui.vala b/src/ui.vala
index 0a80789..362c53b 100644
--- a/src/ui.vala
+++ b/src/ui.vala
@@ -1610,7 +1610,7 @@ public class UserInterface : Gtk.ApplicationWindow
page.scan_direction_changed.disconnect (page_scan_direction_changed_cb);
/* If this is the last page add a new blank one */
- if (book.n_pages == 1)
+ if (book.n_pages == 0)
add_default_page ();
update_page_menu ();