From 15648d856902c2e45e6ee6a7575711aa10828f4a Mon Sep 17 00:00:00 2001
From: Paul Mangan <paul@claws-mail.org>
Date: Sun, 21 Apr 2002 10:16:58 +0000
Subject: [PATCH] sync with 0.7.4cvs52

---
 ChangeLog       |  2 ++
 ChangeLog.claws |  5 +++++
 ChangeLog.jp    |  2 ++
 NEWS            | 28 ++++++++++++++++++++++++++++
 configure.in    |  2 +-
 src/imap.c      | 11 ++++++++---
 6 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7b1b5b04d..d4d6b0464 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
 	  name was empty.
 	* src/prefs_account.c: prefs_account_apply(): display error dialog
 	  if account name is empty.
+	* src/imap.c: changed some log_print() to debug_print() to reduce
+	  the amount of log.
 
 2002-04-21
 
diff --git a/ChangeLog.claws b/ChangeLog.claws
index 13ef25eab..1012aa629 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-04-21 [paul]	0.7.4claws87
+
+	* sync with 0.7.4cvs52
+		see ChangeLog entry 2002-04-21 (src/imap.c)
+
 2002-04-21 [paul]	0.7.4claws86
 
 	* sync with 0.7.4cvs51
diff --git a/ChangeLog.jp b/ChangeLog.jp
index 1e3852740..77bd73d80 100644
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -6,6 +6,8 @@
 	  ¥¯¥é¥Ã¥·¥å¥Ð¥°¤ò½¤Àµ¡£
 	* src/prefs_account.c: prefs_account_apply(): ¥¢¥«¥¦¥ó¥È̾¤¬¶õ¤Î¾ì¹ç
 	  ¥¨¥é¡¼¥À¥¤¥¢¥í¥°¤òɽ¼¨¡£
+	* src/imap.c: ¥í¥°¤ÎÎ̤ò¸º¤é¤¹¤¿¤á¤Ë¤¤¤¯¤Ä¤«¤Î log_print() ¤ò
+	  debug_print() ¤ËÊѹ¹¡£
 
 2002-04-21
 
diff --git a/NEWS b/NEWS
index 9874f8862..7ee286760 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,33 @@
 Changes of Sylpheed
 
+* 0.7.5
+
+    * The license has been modified so that it will be compatible with
+      OpenSSL.
+    * Sent / Drafts / Queue folder on IMAP4 has been enabled.
+    * The internationalization of IMAP4 folder name has been implemented.
+    * IMAP4 folder renaming has been implemented.
+    * Some critical bugs in IMAP4 response parser have been fixed.
+    * Non-default mailboxes are now specifiable for inbox, sent, draft,
+      trash folder and the destination of filtering, using folder identifier.
+    * Folder property dialog has been implemented.
+    * Special folders can be specified from the folder property dialog.
+    * 'Outbox' has been changed to 'Sent'.
+    * Queued messages are now saved to Sent folder after they are actually
+      sent.
+    * The auto line-wrapping has been improved.
+    * 'Reply to sender' now works for newsgroups.
+    * The SMTP server response is now referred on SMTP AUTH.
+    * Templates can be inserted into the current cursor position now.
+    * Confirmation dialog is displayed on sending if subject is empty.
+    * Displayed newsgroup names are now abbreviated.
+    * The timeout of DNS lookup has been implemented.
+    * 'Ctrl-Enter' shortcut now works even if Num Lock is on.
+    * New message checking on IMAP or news server will be aborted immediately
+      if some errors occurred.
+    * Some menu items have been modified.
+    * Some other bugfixes have been made.
+
 * 0.7.4
 
     * The bug that lost UIDL information if any error occured before issuing
diff --git a/configure.in b/configure.in
index 80a0939dd..6b7518cd8 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws86
+EXTRA_VERSION=claws87
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/imap.c b/src/imap.c
index 747c4a843..2d94ba63b 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -1497,15 +1497,18 @@ static GSList *imap_get_uncached_messages(IMAPSession *session,
 			return newlist;
 		}
 		strretchomp(tmp);
-		log_print("IMAP4< %s\n", tmp);
 		if (tmp[0] != '*' || tmp[1] != ' ') {
+			log_print("IMAP4< %s\n", tmp);
 			g_free(tmp);
 			break;
 		}
 		if (strstr(tmp, "FETCH") == NULL) {
+			log_print("IMAP4< %s\n", tmp);
 			g_free(tmp);
 			continue;
 		}
+		/* log_print("IMAP4< %s\n", tmp); */
+		debug_print("IMAP4< %s\n", tmp);
 		g_string_assign(str, tmp);
 		g_free(tmp);
 
@@ -1776,7 +1779,8 @@ static gchar *imap_parse_atom(SockInfo *sock, gchar *src,
 		g_string_assign(str, nextline);
 		cur_pos = str->str;
 		strretchomp(nextline);
-		log_print("IMAP4< %s\n", nextline);
+		/* log_print("IMAP4< %s\n", nextline); */
+		debug_print("IMAP4< %s\n", nextline);
 		g_free(nextline);
 
 		while (isspace(*cur_pos)) cur_pos++;
@@ -1808,7 +1812,8 @@ static gchar *imap_parse_atom(SockInfo *sock, gchar *src,
 			g_string_append(str, nextline);
 			cur_pos = str->str;
 			strretchomp(nextline);
-			log_print("IMAP4< %s\n", nextline);
+			/* log_print("IMAP4< %s\n", nextline); */
+			debug_print("IMAP4< %s\n", nextline);
 			g_free(nextline);
 		} while (line_len < len);
 
-- 
2.25.1