From: Paul Mangan <paul@claws-mail.org>
Date: Fri, 3 Jun 2005 22:27:40 +0000 (+0000)
Subject: 2005-06-03 [paul]	1.9.11cvs39
X-Git-Tag: rel_1_9_12~69
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=b1e189ac14fd794d499e08c83b84c94d94e50e1a;hp=d30d45aa4a240d98ec8d445be96d15fd2bb8e37e

2005-06-03 [paul]	1.9.11cvs39

	* src/compose.c
		don't allow editing of mail while sending.
		patch by Colin
---

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 53eb7102c..2294ae39d 100644
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2005-06-03 [paul]	1.9.11cvs39
+
+	* src/compose.c
+		don't allow editing of mail while sending.
+		patch by Colin
+
 2005-06-03 [paul]	1.9.11cvs38
 
 	* src/folderview.c
diff --git a/PATCHSETS b/PATCHSETS
index f1f82cb3f..a910ab634 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -527,3 +527,4 @@
 ( cvs diff -u -r 1.53.2.10 -r 1.53.2.11 po/POTFILES.in;  ) > 1.9.11cvs36.patchset
 ( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/prefs_message.c;  ) > 1.9.11cvs37.patchset
 ( cvs diff -u -r 1.207.2.39 -r 1.207.2.40 src/folderview.c;  ) > 1.9.11cvs38.patchset
+( cvs diff -u -r 1.382.2.126 -r 1.382.2.127 src/compose.c;  ) > 1.9.11cvs39.patchset
diff --git a/configure.ac b/configure.ac
index 32798d6df..5b5882d3b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=38
+EXTRA_VERSION=39
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/compose.c b/src/compose.c
index 1ab79d8ea..ad8d3c6af 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -3157,7 +3157,7 @@ gint compose_send(Compose *compose)
 	val = compose_queue(compose, &msgnum, &folder);
 
 	if (val) {
-		alertpanel_error(_("Could not queue message for sending"));
+		alertpanel_error(_("Could not queue message for sending."));
 		goto bail;
 	}
 
@@ -3167,6 +3167,7 @@ gint compose_send(Compose *compose)
 		compose_close(compose);
 		/* No more compose access in the normal codepath 
 		 * after this point! */
+		compose = NULL;
 	}
 
 	if (msgnum == 0) {
@@ -6197,6 +6198,9 @@ static void compose_allow_user_actions (Compose *compose, gboolean allow)
 	menu_set_sensitive(ifactory, "/Options", allow);
 	menu_set_sensitive(ifactory, "/Tools", allow);
 	menu_set_sensitive(ifactory, "/Help", allow);
+	
+	gtk_text_view_set_editable(GTK_TEXT_VIEW(compose->text), allow);
+
 }
 
 static void compose_send_cb(gpointer data, guint action, GtkWidget *widget)