2008-04-22 [colin] 3.4.0cvs4

	* src/inc.c
	* src/prefs_common.c
	* src/send_message.c
		Fix bug 1566, 'too short I/O timeout on OpenBSD'
		Set the default timeout to 75 seconds

diff --git a/ChangeLog b/ChangeLog
index 12f3bd37de482e7af3c98323f175d09d26039ace..3699a40bd340b0d79474bc1ba1860db7ef2a4568 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-04-22 [colin]     3.4.0cvs4
+
+       * src/inc.c
+       * src/prefs_common.c
+       * src/send_message.c
+               Fix bug 1566, 'too short I/O timeout on OpenBSD'
+               Set the default timeout to 75 seconds
+
 2008-04-20 [colin]     3.4.0cvs3
 
        * src/pixmaps/tray_newmail.offline.xpm

diff --git a/PATCHSETS b/PATCHSETS
index 967561a523a53990b06833132b8ece850dd94cfb..1c1d6738a7078035af3273fe763e8dcbed573b32 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3299,3 +3299,4 @@
 ( cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/addrduplicates.c;  cvs diff -u -r 1.60.2.114 -r 1.60.2.115 src/addressbook.c;  cvs diff -u -r 1.382.2.442 -r 1.382.2.443 src/compose.c;  cvs diff -u -r 1.23.2.28 -r 1.23.2.29 src/crash.c;  cvs diff -u -r 1.14.2.48 -r 1.14.2.49 src/editaddress.c;  cvs diff -u -r 1.213.2.180 -r 1.213.2.181 src/folder.c;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/image_viewer.c;  cvs diff -u -r 1.179.2.216 -r 1.179.2.217 src/imap.c;  cvs diff -u -r 1.149.2.86 -r 1.149.2.87 src/inc.c;  cvs diff -u -r 1.115.2.193 -r 1.115.2.194 src/main.c;  cvs diff -u -r 1.28.2.42 -r 1.28.2.43 src/mbox.c;  cvs diff -u -r 1.94.2.174 -r 1.94.2.175 src/messageview.c;  cvs diff -u -r 1.79.2.64 -r 1.79.2.65 src/mh.c;  cvs diff -u -r 1.16.2.61 -r 1.16.2.62 src/msgcache.c;  cvs diff -u -r 1.101.2.49 -r 1.101.2.50 src/news.c;  cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/partial_download.c;  cvs diff -u -r 1.56.2.60 -r 1.56.2.61 src/pop.c;  cvs diff -u -r 1.204.2.163 -r 1.204.2.164 src/prefs_common.c;  cvs diff -u -r 1.103.2.105 -r 1.103.2.106 src/prefs_common.h;  cvs diff -u -r 1.1.2.28 -r 1.1.2.29 src/prefs_other.c;  cvs diff -u -r 1.3.2.54 -r 1.3.2.55 src/prefs_themes.c;  cvs diff -u -r 1.47.2.47 -r 1.47.2.48 src/procheader.c;  cvs diff -u -r 1.49.2.108 -r 1.49.2.109 src/procmime.c;  cvs diff -u -r 1.150.2.108 -r 1.150.2.109 src/procmsg.c;  cvs diff -u -r 1.96.2.199 -r 1.96.2.200 src/textview.c;  cvs diff -u -r 1.1.2.68 -r 1.1.2.69 src/wizard.c;  cvs diff -u -r 1.5.2.11 -r 1.5.2.12 src/common/prefs.c;  cvs diff -u -r 1.4.2.25 -r 1.4.2.26 src/common/ssl_certificate.c;  cvs diff -u -r 1.2.4.27 -r 1.2.4.28 src/common/template.c;  cvs diff -u -r 1.36.2.136 -r 1.36.2.137 src/common/utils.c;  cvs diff -u -r 1.20.2.60 -r 1.20.2.61 src/common/utils.h;  cvs diff -u -r 1.1.4.98 -r 1.1.4.99 src/etpan/imap-thread.c;  cvs diff -u -r 1.12.2.25 -r 1.12.2.26 src/plugins/dillo_viewer/dillo_viewer.c;  cvs diff -u -r 1.1.2.48 -r 1.1.2.49 src/plugins/pgpcore/sgpgme.c;  cvs diff -u -r 1.1.2.38 -r 1.1.2.39 src/plugins/pgpinline/pgpinline.c;  ) > 3.4.0cvs1.patchset
 ( cvs diff -u -r 1.6.2.19 -r 1.6.2.20 src/common/log.c;  ) > 3.4.0cvs2.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_newmail.offline.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_newmail.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_newmarkedmail.offline.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_newmarkedmail.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_nomail.offline.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_nomail.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_unreadmail.offline.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_unreadmail.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_unreadmarkedmail.offline.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_unreadmarkedmail.xpm;  ) > 3.4.0cvs3.patchset
+( cvs diff -u -r 1.149.2.87 -r 1.149.2.88 src/inc.c;  cvs diff -u -r 1.204.2.164 -r 1.204.2.165 src/prefs_common.c;  cvs diff -u -r 1.17.2.45 -r 1.17.2.46 src/send_message.c;  ) > 3.4.0cvs4.patchset

diff --git a/configure.ac b/configure.ac
index d9d8c8362bd6b96d926a1df600fe4cf5085fef1f..3066eb88ac1d3d54a903ac4ae72aeed968595a47 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=3
+EXTRA_VERSION=4
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/inc.c b/src/inc.c
index 4f38d9a200d2b8c6b8d5d73f1710805c2d30a6f5..2205c429b70e7227f9940c6b0049ff3cd883984d 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -1212,7 +1212,9 @@ static void inc_put_error(IncState istate, Pop3Session *session)
                        err_msg = g_strdup(log_msg);
                break;
        case INC_TIMEOUT:
-               log_msg = _("Session timed out.");
+               log_msg = _("Session timed out. You may be able to "
+                           "recover by increasing the timeout value in 
+                           "Preferences/Other.");
                if (prefs_common.no_recv_err_panel)
                        break;
                err_msg = g_strdup_printf(_("Connection to %s:%d timed out."), 

diff --git a/src/prefs_common.c b/src/prefs_common.c
index accf92ad7af783412826cf682528de60a04b2d65..47431fa53abedb6745c994280c4a2219a51c6021 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -835,8 +835,13 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
 #endif
 
+#if defined(__OpenBSD__)
+       {"io_timeout_secs", "75", &prefs_common.io_timeout_secs,
+        P_INT, NULL, NULL, NULL},
+#else
        {"io_timeout_secs", "60", &prefs_common.io_timeout_secs,
         P_INT, NULL, NULL, NULL},
+#endif
        {"hide_score", "-9999", &prefs_common.kill_score, P_INT,
         NULL, NULL, NULL},
        {"important_score", "1", &prefs_common.important_score, P_INT,

diff --git a/src/send_message.c b/src/send_message.c
index 72b5b6a7681f23558cc5c48414d60504f9329df6..93f0dc5a9ea92b81a7bbb596be40780cf840b29a 100644 (file)
--- a/src/send_message.c
+++ b/src/send_message.c
@@ -649,7 +649,9 @@ static void send_put_error(Session *session)
                        err_msg = g_strdup(log_msg);
                        break;
                case SESSION_TIMEOUT:
-                       log_msg = _("Session timed out.");
+                       log_msg = _("Session timed out. You may be able to "
+                                   "recover by increasing the timeout value in 
+                                   "Preferences/Other.");
                        err_msg = g_strdup(log_msg);
                        break;
                default: