talons

commit c9fe9b2a98f07cff11869972b8a87447247d5edc
parent 061b78176e976336fdd48a5cae7201f9316ad613
Author: Colin Leroy <colin@colino.net>
Date:   Mon, 22 Dec 2008 11:31:49 +0000

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.

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/compose.c
 | 
4
+++-

4 files changed, 12 insertions(+), 2 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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)