sync with 0.9.0cvs5
authorPaul Mangan <paul@claws-mail.org>
Wed, 21 May 2003 06:33:19 +0000 (06:33 +0000)
committerPaul Mangan <paul@claws-mail.org>
Wed, 21 May 2003 06:33:19 +0000 (06:33 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.ac
src/pop.c

index ead2547..2356941 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-05-21
+
+       * src/pop.c: pop3_ok(): detect timeout error.
+
 2003-05-20
 
        * src/imap.c: imap_locale_to_modified_utf7(): fixed the encoding bug
index 99a1434..3a3bf27 100644 (file)
@@ -1,3 +1,8 @@
+2003-05-21 [paul]      0.8.11claws170
+
+       * sync with 0.9.0cvs5
+               see ChangeLog 2003-05-21
+
 2003-05-20 [paul]      0.8.11claws169
 
        * sync with 0.9.0cvs4
index 9757c8f..0b1f313 100644 (file)
@@ -1,3 +1,7 @@
+2003-05-21
+
+       * src/pop.c: pop3_ok(): ¥¿¥¤¥à¥¢¥¦¥È¥¨¥é¡¼¤ò¸¡½Ð¡£
+
 2003-05-20
 
        * src/imap.c: imap_locale_to_modified_utf7(): locale Ê¸»úÎ󤬠'+'
index 20e3b37..def46eb 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws169
+EXTRA_VERSION=claws170
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index 5c73b5b..ab97803 100644 (file)
--- a/src/pop.c
+++ b/src/pop.c
@@ -629,6 +629,9 @@ static Pop3ErrorValue pop3_ok(Pop3Session *session, const gchar *msg)
                    strstr(msg + 4, "wait")) {
                        log_warning(_("mailbox is locked\n"));
                        ok = PS_LOCKBUSY;
+               } else if (strcasestr(msg + 4, "timeout")) {
+                       log_warning(_("session timeout\n"));
+                       ok = PS_ERROR;
                } else {
                        switch (session->state) {
 #if USE_OPENSSL