From: Paul Mangan <paul@claws-mail.org>
Date: Mon, 14 Apr 2003 09:28:39 +0000 (+0000)
Subject: sync with 0.8.11cvs22
X-Git-Tag: rel_0_9_0~120
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=919be8aa9584932c0082358ab16a1cf66ded5bd4

sync with 0.8.11cvs22
---

diff --git a/ChangeLog b/ChangeLog
index d34dc6a84..bffd45e6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-04-14
+
+	* src/compose.c: compose_parse_header(): fixed a bug that unnecessary
+	  linebreaks were included on reediting.
+	* src/imap.c
+	  src/pop.c: fixed typos: 'occured'.
+
 2003-04-11
 
 	* src/compose.[ch]: implemented auto signature replacement on
diff --git a/ChangeLog.claws b/ChangeLog.claws
index 155942c5c..7ee2ace66 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2003-04-14 [paul]	0.8.11claws89
+
+	* sync with 0.8.11cvs22
+		see ChangeLog 2003-04-14
+
 2003-04-13 [paul]	0.8.11claws88
 
 	* src/plugins/clamav/clamav_plugin.c
diff --git a/ChangeLog.jp b/ChangeLog.jp
index 31710acb8..631de6ca7 100644
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,10 @@
+2003-04-14
+
+	* src/compose.c: compose_parse_header(): ºÆÊÔ½¸»þ¤ËÉÔÍפʲþ¹Ô¤¬´Þ¤Þ
+	  ¤ì¤ë¥Ð¥°¤ò½¤Àµ¡£
+	* src/imap.c
+	  src/pop.c: 'occured' ¤È¤¤¤¦ typo ¤ò½¤Àµ¡£
+
 2003-04-11
 
 	* src/compose.[ch]: ¥¢¥«¥¦¥ó¥ÈÊѹ¹»þ¤Î¼«Æ°½ð̾ÀÚ¤êÂؤ¨¤ò¼ÂÁõ¡£
diff --git a/configure.ac b/configure.ac
index bea699c86..9ee455b33 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws88
+EXTRA_VERSION=claws89
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/compose.c b/src/compose.c
index 2b0b66840..fabcffa09 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -1490,11 +1490,11 @@ static void compose_entries_set(Compose *compose, const gchar *mailto)
 static gint compose_parse_header(Compose *compose, MsgInfo *msginfo)
 {
 	static HeaderEntry hentry[] = {{"Reply-To:",	NULL, TRUE},
-				       {"Cc:",		NULL, FALSE},
+				       {"Cc:",		NULL, TRUE},
 				       {"References:",	NULL, FALSE},
-				       {"Bcc:",		NULL, FALSE},
-				       {"Newsgroups:",	NULL, FALSE},
-				       {"Followup-To:",	NULL, FALSE},
+				       {"Bcc:",		NULL, TRUE},
+				       {"Newsgroups:",  NULL, TRUE},
+				       {"Followup-To:", NULL, TRUE},
 				       {"List-Post:",	NULL, FALSE},
 				       {"X-Priority:",	NULL, FALSE},
 				       {NULL,		NULL, FALSE}};
diff --git a/src/imap.c b/src/imap.c
index 255399d6d..ac720e433 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -1045,7 +1045,7 @@ static GSList *imap_parse_list(Folder *folder, IMAPSession *session,
 
 	for (;;) {
 		if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) <= 0) {
-			log_warning(_("error occured while getting LIST.\n"));
+			log_warning(_("error occurred while getting LIST.\n"));
 			break;
 		}
 		strretchomp(buf);
diff --git a/src/pop.c b/src/pop.c
index 2fb7e9c60..c55448b30 100644
--- a/src/pop.c
+++ b/src/pop.c
@@ -645,7 +645,7 @@ static Pop3ErrorValue pop3_ok(Pop3Session *session, const gchar *msg)
 				ok = PS_AUTHFAIL;
 				break;
 			default:
-				log_warning(_("error occured on POP3 session\n"));
+				log_warning(_("error occurred on POP3 session\n"));
 				ok = PS_ERROR;
 			}
 		}