From: Paul Mangan Date: Wed, 21 Jan 2009 14:12:37 +0000 (+0000) Subject: 2009-01-21 [paul] 3.7.0cvs39 X-Git-Tag: rel_3_7_1~40 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=4836e200b0cf3d90df288ae76bce0ae38e218183 2009-01-21 [paul] 3.7.0cvs39 * src/inc.c update timeout log msg --- diff --git a/ChangeLog b/ChangeLog index 7fba8d4de..aa548df40 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-01-21 [paul] 3.7.0cvs39 + + * src/inc.c + update timeout log msg + 2009-01-17 [colin] 3.7.0cvs38 * src/main.c diff --git a/PATCHSETS b/PATCHSETS index 5d2dcacbb..29fc606e8 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -3700,3 +3700,4 @@ ( cvs diff -u -r 1.1.2.18 -r 1.1.2.19 manual/faq.xml; ) > 3.7.0cvs36.patchset ( cvs diff -u -r 1.60.2.128 -r 1.60.2.129 src/addressbook.c; cvs diff -u -r 1.382.2.494 -r 1.382.2.495 src/compose.c; cvs diff -u -r 1.26.2.41 -r 1.26.2.42 src/foldersel.c; cvs diff -u -r 1.115.2.218 -r 1.115.2.219 src/main.c; cvs diff -u -r 1.274.2.295 -r 1.274.2.296 src/mainwindow.c; cvs diff -u -r 1.28.2.44 -r 1.28.2.45 src/mbox.c; cvs diff -u -r 1.2.2.6 -r 1.2.2.7 src/common/md5.c; cvs diff -u -r 1.4.2.35 -r 1.4.2.36 src/common/ssl_certificate.c; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/common/tags.c; cvs diff -u -r 1.36.2.163 -r 1.36.2.164 src/common/utils.c; cvs diff -u -r 1.1.4.107 -r 1.1.4.108 src/etpan/imap-thread.c; cvs diff -u -r 1.1.2.39 -r 1.1.2.40 src/plugins/bogofilter/bogofilter.c; cvs diff -u -r 1.1.2.42 -r 1.1.2.43 src/plugins/pgpinline/pgpinline.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/smime/smime.c; ) > 3.7.0cvs37.patchset ( cvs diff -u -r 1.115.2.219 -r 1.115.2.220 src/main.c; cvs diff -u -r 1.28.2.45 -r 1.28.2.46 src/mbox.c; cvs diff -u -r 1.2.2.7 -r 1.2.2.8 src/common/md5.c; cvs diff -u -r 1.36.2.164 -r 1.36.2.165 src/common/utils.c; cvs diff -u -r 1.1.4.108 -r 1.1.4.109 src/etpan/imap-thread.c; ) > 3.7.0cvs38.patchset +( cvs diff -u -r 1.149.2.98 -r 1.149.2.99 src/inc.c; ) > 3.7.0cvs39.patchset diff --git a/configure.ac b/configure.ac index 7b0d80060..41e0bc539 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=7 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=38 +EXTRA_VERSION=39 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/inc.c b/src/inc.c index 5a6d2b89c..58563838d 100644 --- a/src/inc.c +++ b/src/inc.c @@ -1206,7 +1206,7 @@ static void inc_put_error(IncState istate, Pop3Session *session) case INC_TIMEOUT: log_msg = _("Session timed out. You may be able to " "recover by increasing the timeout value in " - "Preferences/Other."); + "Preferences/Other/Miscellaneous."); if (prefs_common.no_recv_err_panel) break; err_msg = g_strdup_printf(_("Connection to %s:%d timed out."),