fixed out of sync response on FETCH.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1462 ee746299-78ed-0310-b773-934348b2243d

3 files changed, 15 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 51090b2f..cf653817 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-12-28
 
+	* libsylph/imap.c: imap_cmd_fetch(): read until last response on
+	  error (fixes out of sync response).
+
+2006-12-28
+
 	* src/compose.c: compose_create(): win32: don't set geometry hint
 	  (fixes compose window cannot be maximized).
 
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 86672130..c47e48a2 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,10 @@
 2006-12-28
 
+	* libsylph/imap.c: imap_cmd_fetch(): エラー時は最後の応答まで読み込む
+	  ようにした(応答の同期がずれるのを修正)。
+
+2006-12-28
+
 	* src/compose.c: compose_create(): win32: geometry hint をセットしない
 	  ようにした(メッセージ作成ウィンドウが最大化できないのを修正)。
 
diff --git a/libsylph/imap.c b/libsylph/imap.c
index 868b5e2b..4ecb3778 100644
--- a/libsylph/imap.c
+++ b/libsylph/imap.c
@@ -3608,10 +3608,11 @@ static gint imap_cmd_fetch(IMAPSession *session, guint32 uid,
 	if (ok != IMAP_SUCCESS)
 		return ok;
 
-#define RETURN_ERROR_IF_FAIL(cond)	\
-	if (!(cond)) {			\
-		g_free(buf);		\
-		return IMAP_ERROR;	\
+#define RETURN_ERROR_IF_FAIL(cond)		 \
+	if (!(cond)) {				 \
+		g_free(buf);			 \
+		ok = imap_cmd_ok(session, NULL); \
+		return IMAP_ERROR;		 \
 	}
 
 	cur_pos = strchr(buf, '{');