save attachment status when drafting

HEAD has the same bug as the one i fixed in gtk2, according to
Fabien Vantard

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 1e479e17536230b76857eef2d5dec600604b506c..00f350c85d163f7d9876127e62e6a6754effb426 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2004-07-19 [colin]     0.9.12cvs34
+
+       * src/compose.c
+               Save attachment status when drafting
+
 2004-07-19 [colin]     0.9.12cvs33
 
        * src/folder.h

diff --git a/PATCHSETS b/PATCHSETS
index ab41638da6fa808c022adea2ddd23873828f7adf..5ec01a7b38903071a33a2d5aea3acd57793c4a08 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -20,3 +20,4 @@
 ( cvs diff -u -r 1.243 -r 1.244 src/folderview.c; ) > 0.9.12cvs31.patchset
 ( cvs diff -u -r 1.64 -r 1.65 src/pop.c; ) > 0.9.12cvs32.patchset
 ( cvs diff -u -r 1.106 -r 1.107 src/folder.h; cvs diff -u -r 1.244 -r 1.245 src/folderview.c; cvs diff -u -r 1.440 -r 1.441 src/summaryview.c; ) > 0.9.12cvs33.patchset
+( cvs diff -u -r 1.430 -r 1.431 src/compose.c; ) > 0.9.12cvs34.patchset

diff --git a/configure.ac b/configure.ac
index 2e627c6303f2c23c14c51095936002eb08257010..4558f645f8e21d43ec49642ac7b1ee1f8f527de2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=33
+EXTRA_VERSION=34
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

diff --git a/src/compose.c b/src/compose.c
index 026330a064511bef60871778fd4668c4d7117b16..b704f3ae138fb47ce89bc2c36dbaa73dc24f4865 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -6431,6 +6431,10 @@ static void compose_draft_cb(gpointer data, guint action, GtkWidget *widget)
        if (newmsginfo) {
                procmsg_msginfo_unset_flags(newmsginfo, ~0, ~0);
                procmsg_msginfo_set_flags(newmsginfo, 0, MSG_DRAFT);
+               if (compose_use_attach(compose))
+                       procmsg_msginfo_set_flags(newmsginfo, 0,
+                                                 MSG_HAS_ATTACHMENT);
+
                procmsg_msginfo_free(newmsginfo);
        }