sync with 0.9.3cvs16

diff --git a/ChangeLog b/ChangeLog
index 68e7ececbd59401f7411c13ef9cdc52ca0f23eac..52f4552cacf2889143672a991310b0c9f5aba24b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-23
+
+       * src/procmsg.h: changed MsgPermFlags and MsgTmpFlags from enum to
+         guint32 for portability (thanks to Alfons).
+       * src/imap.c: imap_add_msgs(): removed redundant unlink().
+
 2003-07-22
 
        * src/session.[ch]:

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 0410f4d499bb37ee4be4fab1ffb4f50f70d88483..03010e981d307292e6d5e9c5ed6dcb1bbf488dbe 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2003-07-23 [paul]      0.9.3claws41
+
+       * sync with 0.9.3cvs16
+               see ChangeLog 2003-07-23
+
 2003-07-23 [alfons]    0.9.3claws40
 
        * src/inc.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 2c67d5d1b789703269c1924b26b8d13895b4c7b0..85475fadbb4bd70e873ca10e56cb5ccb2d3c13f2 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,9 @@
+2003-07-23
+
+       * src/procmsg.h: °Ü¿¢À­¤Î¤¿¤á MsgPermFlags ¤È MsgTmpFlags ¤ò enum
+         ¤«¤é guint32 ¤ËÊѹ¹(Alfons ¤µ¤ó thanks)¡£
+       * src/imap.c: imap_add_msgs(): ¾éĹ¤Ê unlink() ¤òºï½ü¡£
+
 2003-07-22
 
        * src/session.[ch]:

diff --git a/configure.ac b/configure.ac
index a158226f2672c19794decd48c9ea74c032de79e2..3653a22dfd5f696366032ab122e238209333b75e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=40
+EXTRA_VERSION=41
 VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws${EXTRA_VERSION}
 
 dnl set $target

diff --git a/src/procmsg.h b/src/procmsg.h
index 532aac7fba9874e5709f88f6b296e662847778e7..e794c94027228d4625edec5bbc6fe117db3c2088 100644 (file)
--- a/src/procmsg.h
+++ b/src/procmsg.h
@@ -38,30 +38,27 @@ typedef struct _MailFilteringData   MailFilteringData;
 typedef GSList MsgInfoList;
 typedef GSList MsgNumberList;
 
-typedef enum
-{
-       MSG_NEW         = 1 << 0,
-       MSG_UNREAD      = 1 << 1,
-       MSG_MARKED      = 1 << 2,
-       MSG_DELETED     = 1 << 3,
-       MSG_REPLIED     = 1 << 4,
-       MSG_FORWARDED   = 1 << 5,
-       
-       MSG_REALLY_DELETED = 1 << 6,            /* mbox stuff */
+#define MSG_NEW                        (1U << 0)
+#define MSG_UNREAD             (1U << 1)
+#define MSG_MARKED             (1U << 2)
+#define MSG_DELETED            (1U << 3)
+#define MSG_REPLIED            (1U << 4)
+#define MSG_FORWARDED          (1U << 5)
+#define MSG_REALLY_DELETED     (1U << 6)               /* mbox stuff */
 
 #define MSG_CLABEL_SBIT        (7)             /* start bit of color label */
 #define MAKE_MSG_CLABEL(h, m, l)       (((h) << (MSG_CLABEL_SBIT + 2)) | \
                                         ((m) << (MSG_CLABEL_SBIT + 1)) | \
                                         ((l) << (MSG_CLABEL_SBIT + 0)))
 
-       MSG_CLABEL_NONE = MAKE_MSG_CLABEL(0, 0, 0),
-       MSG_CLABEL_1    = MAKE_MSG_CLABEL(0, 0, 1),
-       MSG_CLABEL_2    = MAKE_MSG_CLABEL(0, 1, 0),
-       MSG_CLABEL_3    = MAKE_MSG_CLABEL(0, 1, 1),
-       MSG_CLABEL_4    = MAKE_MSG_CLABEL(1, 0, 0),
-       MSG_CLABEL_5    = MAKE_MSG_CLABEL(1, 0, 1),
-       MSG_CLABEL_6    = MAKE_MSG_CLABEL(1, 1, 0),
-       MSG_CLABEL_7    = MAKE_MSG_CLABEL(1, 1, 1),
+#define MSG_CLABEL_NONE                MAKE_MSG_CLABEL(0U, 0U, 0U)
+#define MSG_CLABEL_1           MAKE_MSG_CLABEL(0U, 0U, 1U)
+#define MSG_CLABEL_2           MAKE_MSG_CLABEL(0U, 1U, 0U)
+#define MSG_CLABEL_3           MAKE_MSG_CLABEL(0U, 1U, 1U)
+#define MSG_CLABEL_4           MAKE_MSG_CLABEL(1U, 0U, 0U)
+#define MSG_CLABEL_5           MAKE_MSG_CLABEL(1U, 0U, 1U)
+#define MSG_CLABEL_6           MAKE_MSG_CLABEL(1U, 1U, 0U)
+#define MSG_CLABEL_7           MAKE_MSG_CLABEL(1U, 1U, 1U)
 
 #define MSG_CLABEL_ORANGE      MSG_CLABEL_1
 #define MSG_CLABEL_RED         MSG_CLABEL_2
@@ -71,27 +68,28 @@ typedef enum
 #define MSG_CLABEL_GREEN       MSG_CLABEL_6
 #define MSG_CLABEL_BROWN       MSG_CLABEL_7
 
-       MSG_IGNORE_THREAD   = 1 << 10,   /* ignore threads */
-       MSG_LOCKED          = 1 << 11,   /* msg is locked  */
-       MSG_RETRCPT_PENDING = 1 << 12,   /* return receipt pending */
-} MsgPermFlags;
+#define MSG_IGNORE_THREAD      (1U << 10)   /* ignore threads */
+#define MSG_LOCKED             (1U << 11)   /* msg is locked  */
+#define MSG_RETRCPT_PENDING    (1U << 12)   /* return receipt pending */
+/* RESERVED */
+#define        MSG_RESERVED            (1U << 31)
+
+typedef guint32 MsgPermFlags;
 
 #define MSG_CLABEL_FLAG_MASK   (MSG_CLABEL_7)
 
-typedef enum
-{
-       MSG_MOVE        = 1 << 0,
-       MSG_COPY        = 1 << 1,
-
-       MSG_QUEUED      = 1 << 16,
-       MSG_DRAFT       = 1 << 17,
-       MSG_ENCRYPTED   = 1 << 18,
-       MSG_IMAP        = 1 << 19,
-       MSG_NEWS        = 1 << 20,
-       MSG_SIGNED      = 1 << 21,
-
-       MSG_MIME        = 1 << 29,
-} MsgTmpFlags;
+#define MSG_MOVE               (1U << 0)
+#define MSG_COPY               (1U << 1)
+#define MSG_QUEUED             (1U << 16)
+#define MSG_DRAFT              (1U << 17)
+#define MSG_ENCRYPTED          (1U << 18)
+#define MSG_IMAP               (1U << 19)
+#define MSG_NEWS               (1U << 20)
+#define MSG_SIGNED             (1U << 21)
+#define MSG_MIME               (1U << 29)
+#define MSG_CACHED             (1U << 31)
+
+typedef guint32 MsgTmpFlags;
 
 #define MSG_CACHED_FLAG_MASK   (MSG_MIME | MSG_ENCRYPTED | MSG_SIGNED)