2008-12-22 [colin] 3.7.0cvs4

	* src/compose.c
		Fix bug 1799, '"Discard message" deletes manually
		saved draft'. Switch rmode to REEDIT after
		manually saving.

diff --git a/ChangeLog b/ChangeLog
index f81fe0859d0328a1c05495a32666f2179467b7e1..07a94df7d5b9c4a2aa33984286fda40b956d6232 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-22 [colin]     3.7.0cvs4
+
+       * src/compose.c
+               Fix bug 1799, '"Discard message" deletes manually 
+               saved draft'. Switch rmode to REEDIT after 
+               manually saving.
+
 2008-12-21 [paul]      3.7.0cvs3
 
        * tools/claws.i18n.status.pl

diff --git a/PATCHSETS b/PATCHSETS
index 09c34eb54a049b74b2a4570320bdd805614e64e6..8ed4b0c7a31fac521efb6e88f154fc8d1d822966 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3665,3 +3665,4 @@
 ( cvs diff -u -r 1.100.2.63 -r 1.100.2.64 AUTHORS;  cvs diff -u -r 1.1.2.51 -r 1.1.2.52 src/gtk/authors.h;  ) > 3.7.0cvs1.patchset
 ( cvs diff -u -r 1.100.2.64 -r 1.100.2.65 AUTHORS;  cvs diff -u -r 1.1.2.52 -r 1.1.2.53 src/gtk/authors.h;  ) > 3.7.0cvs2.patchset
 ( cvs diff -u -r 1.1.2.17 -r 1.1.2.18 tools/claws.i18n.status.pl;  ) > 3.7.0cvs3.patchset
+( cvs diff -u -r 1.382.2.490 -r 1.382.2.491 src/compose.c;  ) > 3.7.0cvs4.patchset

diff --git a/configure.ac b/configure.ac
index 727f8d8686a051aa198c59feefb62627bbd5f3e3..4889ebdad1089de66738712c1809e7fc91ef5f4d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=3
+EXTRA_VERSION=4
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index daa43bc7a7937532db2ebcaa9a49a7c5bca18c62..e07c67f8f6475b1d53157e91808df6745baaa727 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -9191,7 +9191,9 @@ void compose_reopen_exit_drafts(void)
 
 static void compose_save_cb(GtkAction *action, gpointer data)
 {
-       compose_draft(data, COMPOSE_KEEP_EDITING);
+       Compose *compose = (Compose *)data;
+       compose_draft(compose, COMPOSE_KEEP_EDITING);
+       compose->rmode = COMPOSE_REEDIT;
 }
 
 static void compose_attach_from_list(Compose *compose, GList *file_list, gboolean free_data)