2007-03-31 [colin] 2.8.1cvs71

	* src/inc.c
		Override offline: "No" answer shouldn't
		re-ask after 3 seconds, but 10 minutes.

diff --git a/ChangeLog b/ChangeLog
index 6369228a681648c7d2038e317dab35c560245f95..d8838910e596991c9db5cb893a02ea10b8a405c8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-31 [colin]     2.8.1cvs71
+
+       * src/inc.c
+               Override offline: "No" answer shouldn't
+               re-ask after 3 seconds, but 10 minutes. 
+
 2007-03-30 [colin]     2.8.1cvs70
 
        * src/common/socket.c

diff --git a/PATCHSETS b/PATCHSETS
index 8bb25c073b31b3fa0150dc9292dd65cbfcec1287..52fde7f11fb5859f84c3418588a4c89d424f5329 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2487,3 +2487,4 @@
 ( cvs diff -u -r 1.274.2.182 -r 1.274.2.183 src/mainwindow.c;  cvs diff -u -r 1.395.2.293 -r 1.395.2.294 src/summaryview.c;  cvs diff -u -r 1.68.2.35 -r 1.68.2.36 src/summaryview.h;  ) > 2.8.1cvs68.patchset
 ( cvs diff -u -r 1.56.2.48 -r 1.56.2.49 src/pop.c;  cvs diff -u -r 1.204.2.127 -r 1.204.2.128 src/prefs_common.c;  ) > 2.8.1cvs69.patchset
 ( 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

diff --git a/configure.ac b/configure.ac
index 8ba295437e36a35a0edac23e431a4b29eae30e5e..f487480e18cf035811f68bab3875cf420ae18653 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=70
+EXTRA_VERSION=71
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/inc.c b/src/inc.c
index c99ab6f296c28dbc6af62b1fc4db2dc81eec9401..02414b1c81710c402536e5acdd6eb54d40565282 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -1456,7 +1456,7 @@ gboolean inc_offline_should_override(const gchar *msg)
                
                if (time(NULL) - overridden_yes < length * 60) /* seconds */
                         return TRUE;
-               else if (time(NULL) - overridden_no < 3) /* seconds */
+               else if (time(NULL) - overridden_no < length * 60) /* seconds */
                         return FALSE;
 
                tmp = g_strdup_printf(