2007-03-31 [colin] 2.8.1cvs73

	* src/inc.c
		If we're currently "overriding for %d minutes",
		don't ask

diff --git a/ChangeLog b/ChangeLog
index 05e92d48f9e98bc62e029ce53a75052d77171dc5..94cdfe4ade27c0ad78b9e4abbbca0027adfe3c80 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-31 [colin]     2.8.1cvs73
+
+       * src/inc.c
+               If we're currently "overriding for %d minutes",
+               don't ask
+
 2007-03-31 [colin]     2.8.1cvs72
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index fcae6116049554fecc55aa33d8589a092f63f9b2..e3a40b25d0fa6c3b3078e7cda3952caaaa5f639c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2489,3 +2489,4 @@
 ( cvs diff -u -r 1.207.2.157 -r 1.207.2.158 src/folderview.c;  cvs diff -u -r 1.115.2.150 -r 1.115.2.151 src/main.c;  cvs diff -u -r 1.13.2.30 -r 1.13.2.31 src/common/socket.c;  cvs diff -u -r 1.5.2.56 -r 1.5.2.57 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.33 -r 1.4.2.34 src/gtk/gtkutils.h;  cvs diff -u -r 1.1.2.43 -r 1.1.2.44 src/plugins/pgpcore/sgpgme.c;  ) > 2.8.1cvs70.patchset
 ( cvs diff -u -r 1.149.2.68 -r 1.149.2.69 src/inc.c;  ) > 2.8.1cvs71.patchset
 ( cvs diff -u -r 1.382.2.368 -r 1.382.2.369 src/compose.c;  cvs diff -u -r 1.179.2.161 -r 1.179.2.162 src/imap.c;  cvs diff -u -r 1.149.2.69 -r 1.149.2.70 src/inc.c;  cvs diff -u -r 1.29.2.11 -r 1.29.2.12 src/inc.h;  cvs diff -u -r 1.94.2.129 -r 1.94.2.130 src/messageview.c;  cvs diff -u -r 1.101.2.37 -r 1.101.2.38 src/news.c;  cvs diff -u -r 1.18.2.49 -r 1.18.2.50 src/plugins/spamassassin/spamassassin.c;  ) > 2.8.1cvs72.patchset
+( cvs diff -u -r 1.149.2.70 -r 1.149.2.71 src/inc.c;  ) > 2.8.1cvs73.patchset

diff --git a/configure.ac b/configure.ac
index 9dd137f7148fa442548ea991ef5bf201858cf375..3252be0b4ff0975c319bba4dea2b29a8103992de 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=72
+EXTRA_VERSION=73
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/inc.c b/src/inc.c
index 3b3ae7bf22647052b6d8bb664bb27f555a9d6bd9..abb043bfa6a2a905fd1bccaa1129935f2c9f4db0 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -1452,7 +1452,6 @@ gboolean inc_offline_should_override(gboolean force_ask, const gchar *msg)
                length = prefs_common.autochk_itv; /* minutes */
 
        if (force_ask) {
-               overridden_yes = (time_t)0;
                overridden_no = (time_t)0;
        }