From: Paul Mangan <paul@claws-mail.org>
Date: Fri, 7 Jan 2005 07:44:28 +0000 (+0000)
Subject: 2005-01-07 [paul]	0.9.13cvs29
X-Git-Tag: rel_1_0_0~17
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=f86eab49e2da32b95bf9ef6244a95ab2e375fdbe

2005-01-07 [paul]	0.9.13cvs29

	* ChangeLog
	* ChangeLog.jp
	* src/pop.c
	* src/pop.h
		sync with main, see ChangeLog 2005-01-06
---

diff --git a/ChangeLog b/ChangeLog
index 5cd4183ab..9011f9841 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-01-06
+
+	* src/pop.[ch]: added POP3_DONE to Pop3State (it is set when logout
+	  is completed).
+	  pop3_write_uidl_list(): force output of UIDLs of deleted messages
+	  when POP3 session is aborted (thanks to Masahiro Tomita).
+
+2005-01-06
+
+	* src/Makefile.am: use AM_CPPFLAGS and AM_YFLAGS instead of CPPFLAGS
+	  and YFLAGS (they are reserved for users).
+
 2004-12-24
 
 	* version 1.0.0
diff --git a/ChangeLog.claws b/ChangeLog.claws
index d65fbc233..2da6784e0 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,11 @@
+2005-01-07 [paul]	0.9.13cvs29
+
+	* ChangeLog
+	* ChangeLog.jp
+	* src/pop.c
+	* src/pop.h
+		sync with main, see ChangeLog 2005-01-06
+
 2005-01-06 [colin]	0.9.13cvs28
 
 	* src/prefs_matcher.c
diff --git a/ChangeLog.jp b/ChangeLog.jp
index d0195b4f4..3064b8196 100644
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,16 @@
+2005-01-06
+
+	* src/pop.[ch]: Pop3State ¤Ë POP3_DONE ¤òÄɲÃ(¥í¥°¥¢¥¦¥È¤¬´°Î»¤·¤¿
+	  ¤È¤­¤Ë¥»¥Ã¥È¤µ¤ì¤ë)¡£
+	  pop3_write_uidl_list(): POP3 ¥»¥Ã¥·¥ç¥ó¤¬ÃæÃǤµ¤ì¤¿¾ì¹ç¤Ïºï½ü
+	  ¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤Î UIDL ¤ò¶¯À©Åª¤Ë½ÐÎϤ¹¤ë¤è¤¦¤Ë¤·¤¿
+	  (¤È¤ß¤¿¤Þ¤µ¤Ò¤í¤µ¤ó thanks)¡£
+
+2005-01-06
+
+	* src/Makefile.am: CPPFLAGS ¤È YFLAGS ¤ÎÂå¤ï¤ê¤Ë AM_CPPFLAGS ¤È
+	  AM_YFLAGS ¤ò»ÈÍÑ(¥æ¡¼¥¶ÍѤËͽÌ󤵤ì¤Æ¤¤¤ë¤¿¤á)¡£
+
 2004-12-24
 
 	* version 1.0.0
diff --git a/PATCHSETS b/PATCHSETS
index 985844c98..6395aed4a 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -198,3 +198,4 @@
 ( cvs diff -u -r 1.150 -r 1.151 src/main.c; ) > 0.9.13cvs26.patchset
 ( cvs diff -u -r 1.253 -r 1.254 src/folderview.c; cvs diff -u -r 1.3 -r 1.4 src/imap_gtk.c; cvs diff -u -r 1.3 -r 1.4 src/news_gtk.c; ) > 0.9.13cvs27.patchset
 ( cvs diff -u -r 1.49 -r 1.50 src/prefs_matcher.c; ) > 0.9.13cvs28.patchset
+( cvs diff -u -r 1.453 -r 1.454 ChangeLog; cvs diff -u -r 1.448 -r 1.449 ChangeLog.jp; cvs diff -u -r 1.73 -r 1.74 src/pop.c; cvs diff -u -r 1.23 -r 1.24 src/pop.h; ) > 0.9.13cvs29.patchset
diff --git a/configure.ac b/configure.ac
index c44b9e1d4..f02ec7133 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=28
+EXTRA_VERSION=29
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
diff --git a/src/pop.c b/src/pop.c
index ce3c75076..b57d097f5 100644
--- a/src/pop.c
+++ b/src/pop.c
@@ -648,10 +648,10 @@ gint pop3_write_uidl_list(Pop3Session *session)
 
 	for (n = 1; n <= session->count; n++) {
 		msg = &session->msg[n];
-		if (msg->uidl && msg->received && !msg->deleted) {
+		if (msg->uidl && msg->received &&
+		    (!msg->deleted || session->state != POP3_DONE))
 			fprintf(fp, "%s\t%ld\t%d\n", 
 				msg->uidl, msg->recv_time, msg->partial_recv);
-		}
 	}
 
 	if (fclose(fp) == EOF) FILE_OP_ERROR(path, "fclose");
@@ -964,6 +964,7 @@ static gint pop3_session_recv_msg(Session *session, const gchar *msg)
 		}
 		break;
 	case POP3_LOGOUT:
+		pop3_session->state = POP3_DONE;
 		session_disconnect(session);
 		break;
 	case POP3_ERROR:
diff --git a/src/pop.h b/src/pop.h
index a63af6f6e..d33bea5ba 100644
--- a/src/pop.h
+++ b/src/pop.h
@@ -65,6 +65,7 @@ typedef enum {
 	POP3_TOP_RECV,
 	POP3_DELETE,
 	POP3_LOGOUT,
+	POP3_DONE,
 	POP3_ERROR,
 
 	N_POP3_STATE