2005-08-07 [colin] 1.9.13cvs24

	* src/folder.c
		Fix big mistake (passing MsgInfo instead
		of FolderItem)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index cc5d8017bd1dea707036c097dd32640fda6775ba..f5a7edf9eae2cd59159a19eb41c94888ec2c3cbe 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2005-08-07 [colin]     1.9.13cvs24
+
+       * src/folder.c
+               Fix big mistake (passing MsgInfo instead 
+               of FolderItem)
+
 2005-08-07 [colin]     1.9.13cvs23
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index d7a86e3d34c32acf0e35676259129bf19e04b04b..010e2c61edfc43fc094594151dbeb3fccb3a08ff 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -709,3 +709,4 @@
 ( cvs diff -u -r 1.395.2.104 -r 1.395.2.105 src/summaryview.c;  ) > 1.9.13cvs21.patchset
 ( cvs diff -u -r 1.60.2.23 -r 1.60.2.24 src/addressbook.c;  ) > 1.9.13cvs22.patchset
 ( cvs diff -u -r 1.382.2.148 -r 1.382.2.149 src/compose.c;  cvs diff -u -r 1.213.2.45 -r 1.213.2.46 src/folder.c;  cvs diff -u -r 1.87.2.14 -r 1.87.2.15 src/folder.h;  cvs diff -u -r 1.26.2.18 -r 1.26.2.19 src/foldersel.c;  cvs diff -u -r 1.3.2.5 -r 1.3.2.6 src/folderutils.c;  cvs diff -u -r 1.207.2.53 -r 1.207.2.54 src/folderview.c;  cvs diff -u -r 1.179.2.57 -r 1.179.2.58 src/imap.c;  cvs diff -u -r 1.274.2.52 -r 1.274.2.53 src/mainwindow.c;  cvs diff -u -r 1.94.2.60 -r 1.94.2.61 src/messageview.c;  cvs diff -u -r 1.79.2.15 -r 1.79.2.16 src/mh.c;  cvs diff -u -r 1.16.2.23 -r 1.16.2.24 src/msgcache.c;  cvs diff -u -r 1.49.2.52 -r 1.49.2.53 src/procmime.c;  cvs diff -u -r 1.395.2.105 -r 1.395.2.106 src/summaryview.c;  ) > 1.9.13cvs23.patchset
+( cvs diff -u -r 1.213.2.46 -r 1.213.2.47 src/folder.c;  ) > 1.9.13cvs24.patchset

diff --git a/configure.ac b/configure.ac
index d4ab51a0a291a9b14e49d9ff431a8a57bf339347..225689dd28f51d3ef2dcaa939cb80c9876fe3f31 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=23
+EXTRA_VERSION=24
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folder.c b/src/folder.c
index a8675bdf348ada463c477a367873d48f1d5458c6..c6f30b530d0374ac47deaf95762aa59e650c0cde 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -2360,10 +2360,10 @@ static void copy_msginfo_flags(MsgInfo *source, MsgInfo *dest)
        }
 
        /* remove new, unread and deleted in special folders */
-       if (folder_has_parent_of_type(dest, F_OUTBOX) || 
-           folder_has_parent_of_type(dest, F_QUEUE) || 
-           folder_has_parent_of_type(dest, F_DRAFT) || 
-           folder_has_parent_of_type(dest, F_TRASH))
+       if (folder_has_parent_of_type(dest->folder, F_OUTBOX) || 
+           folder_has_parent_of_type(dest->folder, F_QUEUE) || 
+           folder_has_parent_of_type(dest->folder, F_DRAFT) || 
+           folder_has_parent_of_type(dest->folder, F_TRASH))
                perm_flags &= ~(MSG_NEW | MSG_UNREAD | MSG_DELETED);
 
        /* set ignore flag of ignored parent exists */