aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2006-02-06 04:21:48 +0000
committerhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2006-02-06 04:21:48 +0000
commit6e9b0a7553815ae4520d034613043c88047c03fc (patch)
treef1b272d39b78ef99f8fbeca043cc44be23a8c66d
parent4c9e3d272356fbf9777115f25eabd01932e7dbc6 (diff)
don't reset unread flag when moving/copying messages into trash.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@978 ee746299-78ed-0310-b773-934348b2243d
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.ja6
-rw-r--r--libsylph/imap.c3
-rw-r--r--libsylph/mh.c6
4 files changed, 17 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 226e5ce5..52df6270 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2006-02-06
+ * libsylph/mh.c
+ libsylph/imap.c: don't reset unread flag when moving/copying
+ messages into trash.
+
+2006-02-06
+
* libsylph/mh.c: win32: fixed a bug that the contents of folders which
have specific Japanese characters such as 'Hyou' (which contains
0x5c ('\') at the second byte) at the end of its name couldn't be
diff --git a/ChangeLog.ja b/ChangeLog.ja
index a4ff9ca1..785a74bf 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,11 @@
2006-02-06
+ * libsylph/mh.c
+ libsylph/imap.c: メッセージをごみ箱に移動/コピーするとき未読フラグ
+ をリセットしないようにした。
+
+2006-02-06
+
* libsylph/mh.c: win32: フォルダ名の最後に「表」など(2バイト目に 0x5c
('\')を含む)特定の日本語の文字をもつフォルダの内容が表示できない
バグを修正。
diff --git a/libsylph/imap.c b/libsylph/imap.c
index fd79454a..2d395044 100644
--- a/libsylph/imap.c
+++ b/libsylph/imap.c
@@ -1221,8 +1221,7 @@ static gint imap_add_msgs(Folder *folder, FolderItem *dest, GSList *file_list,
if (dest->stype == F_OUTBOX ||
dest->stype == F_QUEUE ||
- dest->stype == F_DRAFT ||
- dest->stype == F_TRASH)
+ dest->stype == F_DRAFT)
iflags |= IMAP_FLAG_SEEN;
g_get_current_time(&tv_cur);
diff --git a/libsylph/mh.c b/libsylph/mh.c
index c66fd541..aff7c2ee 100644
--- a/libsylph/mh.c
+++ b/libsylph/mh.c
@@ -356,10 +356,12 @@ static gchar *mh_get_new_msg_filename(FolderItem *dest)
newmsginfo.flags = fl; \
if (dest->stype == F_OUTBOX || \
dest->stype == F_QUEUE || \
- dest->stype == F_DRAFT || \
- dest->stype == F_TRASH) \
+ dest->stype == F_DRAFT) { \
MSG_UNSET_PERM_FLAGS(newmsginfo.flags, \
MSG_NEW|MSG_UNREAD|MSG_DELETED); \
+ } else if (dest->stype == F_TRASH) { \
+ MSG_UNSET_PERM_FLAGS(newmsginfo.flags, MSG_DELETED); \
+ } \
\
if (fp) \
procmsg_write_flags(&newmsginfo, fp); \