sync with 0.8.11cvs13

diff --git a/ChangeLog b/ChangeLog
index ac90e4b0e1c9ede988ecad9e80b6c84a1cb6377e..98445b921856d1ec07558f79df4f58b9b865d593 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-03-27
+
+       * src/inc.c: inc_pop3_session_do(): retrun appropriate error if
+         Session::state == SESSION_ERROR.
+       * po/POTFILES.in: removed src/automaton.c and src/send.c.
+         Added src/send_message.c.
+
 2003-03-26
 
        * src/pop.[ch]

diff --git a/ChangeLog.claws b/ChangeLog.claws
index a0f3a756ea0a0415db11aa97e0cad8474a5e426e..73bdfd5fdf6857ba15af0203bf059cf2f1a567e3 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2003-03-27 [paul]      0.8.11claws57
+
+       * sync with 0.8.11cvs13
+               see ChangeLog 2003-03-27
+
 2003-03-27 [oliver]    0.8.11claws56
 
        * src/maiwindow.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index a91028a0e239ccfe88cb3445de54a55bb3bb430e..e6560377cc56839b672baf0a8d0b002f88dc0fb4 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,10 @@
+2003-03-27
+
+       * src/inc.c: inc_pop3_session_do(): Session::state == SESSION_ERROR
+         ¤Î¾ì¹ç¤ÏŬÀڤʥ¨¥é¡¼¤òÊÖ¤¹¤è¤¦¤Ë¤·¤¿¡£
+       * po/POTFILES.in: src/automaton.c, src/send.c ¤òºï½ü¡£
+         src/send_message.c ¤òÄɲá£
+
 2003-03-26
 
        * src/pop.[ch]

diff --git a/configure.ac b/configure.ac
index 70e9b590e9dc4d41255e5ee2b3da60c52622591a..ac9220e536a645707e72f81a3de172bccf09afc9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws56
+EXTRA_VERSION=claws57
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/po/POTFILES.in b/po/POTFILES.in
index d4c70212a1ee81ba22b89f87e570cb195a8ae77a..ef681d5e662d028e38caa25c1dceabd813c7dc66 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -69,8 +69,7 @@ src/progressdialog.c
 src/quote_fmt.c
 src/rfc2015.c
 src/select-keys.c
-src/selective_download.c
-src/send.c
+src/send_message.c
 src/setup.c
 src/sigstatus.c
 src/sourcewindow.c

diff --git a/src/inc.c b/src/inc.c
index c59b7a3f5179d27336668ce1b69e7ec557e5c1e9..fa6ae58840860553a6764f2693082d55bd597002 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -735,7 +735,13 @@ static IncState inc_pop3_session_do(IncSession *session)
        if (session->inc_state == INC_SUCCESS) {
                switch (pop3_session->error_val) {
                case PS_SUCCESS:
-                       session->inc_state = INC_SUCCESS;
+                       if (SESSION(pop3_session)->state == SESSION_ERROR) {
+                               if (pop3_session->state == POP3_READY)
+                                       session->inc_state = INC_CONNECT_ERROR;
+                               else
+                                       session->inc_state = INC_ERROR;
+                       } else
+                               session->inc_state = INC_SUCCESS;
                        break;
                case PS_AUTHFAIL:
                        session->inc_state = INC_AUTH_FAILED;