2007-06-04 [colin] 2.9.2cvs39
authorColin Leroy <colin@colino.net>
Mon, 4 Jun 2007 19:56:09 +0000 (19:56 +0000)
committerColin Leroy <colin@colino.net>
Mon, 4 Jun 2007 19:56:09 +0000 (19:56 +0000)
* src/compose.c
More work for wwp :)

ChangeLog
PATCHSETS
configure.ac
src/compose.c

index b3bcb9417c6f326537db5cc3ac591f738ba30b6e..819ceeaa6afe9487b2b76489d08667babe84a04b 100644 (file)
--- 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
index 550165d9f2013847467ffeb1de34f24d29adf8ff..ca5e85df399a850f8f8a8e1a96907afbb1d19d8a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index 6be1fc62fce23a7cb3dec6741d3e1a0e7186c123..6c81b61b6316363dae3956cbe662912e833bd02f 100644 (file)
@@ -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=
 
index d94cdb24784bf89e099418eca965dfdb9d70e7c9..1a11e10f017f6db2480a775f0171aa2a5ea3e776 100644 (file)
@@ -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