From: Colin Leroy <colin@colino.net>
Date: Mon, 4 Jun 2007 19:56:09 +0000 (+0000)
Subject: 2007-06-04 [colin]	2.9.2cvs39
X-Git-Tag: rel_2_10_0~42
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=4aa7dee7c763b5eaacd38b502e455b4b434bcaee

2007-06-04 [colin]	2.9.2cvs39

	* src/compose.c
		More work for wwp :)
---

diff --git a/ChangeLog b/ChangeLog
index b3bcb9417..819ceeaa6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-04 [colin]	2.9.2cvs39
+
+	* src/compose.c
+		More work for wwp :)
+
 2007-06-04 [wwp]	2.9.2cvs38
 
 	* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
index 550165d9f..ca5e85df3 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2614,3 +2614,4 @@
 ( cvs diff -u -r 1.382.2.383 -r 1.382.2.384 src/compose.c;  ) > 2.9.2cvs36.patchset
 ( cvs diff -u -r 1.382.2.384 -r 1.382.2.385 src/compose.c;  ) > 2.9.2cvs37.patchset
 ( cvs diff -u -r 1.382.2.385 -r 1.382.2.386 src/compose.c;  ) > 2.9.2cvs38.patchset
+( cvs diff -u -r 1.382.2.386 -r 1.382.2.387 src/compose.c;  ) > 2.9.2cvs39.patchset
diff --git a/configure.ac b/configure.ac
index 6be1fc62f..6c81b61b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=2
 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 d94cdb247..1a11e10f0 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -7126,6 +7126,7 @@ static void compose_template_apply(Compose *compose, Template *tmpl,
 	buffer = gtk_text_view_get_buffer(text);
 
 	if (tmpl->value) {
+		/* FIXME - use per-folder/account quotemark */
 		if (prefs_common.quotemark && *prefs_common.quotemark)
 			qmark = prefs_common.quotemark;
 		else
@@ -9533,6 +9534,8 @@ static void text_inserted(GtkTextBuffer *buffer, GtkTextIter *iter,
 			len = strlen(text);
 
 		new_text = g_strndup(text, len);
+
+		/* FIXME - use per-folder/account quotemark */
 		if (prefs_common.quotemark && *prefs_common.quotemark)
 			qmark = prefs_common.quotemark;
 		else