aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2008-09-24 09:22:59 +0000
committerhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2008-09-24 09:22:59 +0000
commitea292ceb3d8a77686a297f5f3b8454b283bb521f (patch)
treed1ea65fb181e11d23cf66c31265e09c95aa7bb07
parentb56f141352a24601b1bf45b1ebe8cf9410112314 (diff)
workaround for some broken IMAP4 servers.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2040 ee746299-78ed-0310-b773-934348b2243d
-rw-r--r--ChangeLog7
-rw-r--r--ChangeLog.ja7
-rw-r--r--libsylph/imap.c4
-rw-r--r--src/inputdialog.c4
4 files changed, 19 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6694c921..2016780e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2008-09-24
+ * src/inputdialog.c: don't debug print return string on invisible
+ mode.
+ * libsylph/imap.c: imap_parse_envelope(): allow responses such as
+ "RFC822.HEADER{...}" (workaround for some broken servers).
+
+2008-09-24
+
* src/rpop3.c: display 'Quitting...' on logout.
2008-09-19
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 63e868ee..61dab2cf 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,12 @@
2008-09-24
+ * src/inputdialog.c: 非表示モードで戻り文字列をデバッグ出力しない
+ ようにした。
+ * libsylph/imap.c: imap_parse_envelope(): ""RFC822.HEADER{...}"
+ のような応答を許容するようにした(一部の正しくないサーバへの対処)。
+
+2008-09-24
+
* src/rpop3.c: ログアウト時に「切断中...」を表示。
2008-09-19
diff --git a/libsylph/imap.c b/libsylph/imap.c
index edb8c908..c031acc5 100644
--- a/libsylph/imap.c
+++ b/libsylph/imap.c
@@ -3131,10 +3131,10 @@ static MsgInfo *imap_parse_envelope(IMAPSession *session, FolderItem *item,
} else if (!strncmp(cur_pos, "RFC822.SIZE ", 12)) {
cur_pos += 12;
size = strtol(cur_pos, &cur_pos, 10);
- } else if (!strncmp(cur_pos, "RFC822.HEADER ", 14)) {
+ } else if (!strncmp(cur_pos, "RFC822.HEADER", 13)) {
gchar *headers;
- cur_pos += 14;
+ cur_pos += 13;
cur_pos = imap_get_header(session, cur_pos, &headers,
line_str);
msginfo = procheader_parse_str(headers, flags, FALSE);
diff --git a/src/inputdialog.c b/src/inputdialog.c
index d5dfc3f4..ae8ce71a 100644
--- a/src/inputdialog.c
+++ b/src/inputdialog.c
@@ -260,7 +260,9 @@ static gchar *input_dialog_open(const gchar *title, const gchar *message,
inc_unlock();
- debug_print("return string = %s\n", str ? str : "(none)");
+ if (type != INPUT_DIALOG_INVISIBLE)
+ debug_print("return string = %s\n", str ? str : "(none)");
+
return str;
}