2007-02-23 [colin] 2.7.2cvs68

	* src/compose.c
		Fix bug that prevented colorization to
		work without wrap quotation option

diff --git a/ChangeLog b/ChangeLog
index efd15ffc07c4e8583aa655a27f7a32b0f7a5c1ef..864dc15357e3cfa522c4fbe6177d8216f2f0446a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-23 [colin]     2.7.2cvs68
+
+       * src/compose.c
+               Fix bug that prevented colorization to
+               work without wrap quotation option
+

 2007-02-23 [colin]     2.7.2cvs67
 
        * src/addr_compl.c
 2007-02-23 [colin]     2.7.2cvs67
 
        * src/addr_compl.c

diff --git a/PATCHSETS b/PATCHSETS
index f7536b6a9cb066744e3a485e87641a5053de1f43..16cb70ca0d20c126d7d12800aa0aa890d26783fd 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2385,3 +2385,4 @@
 ( cvs diff -u -r 1.27.2.28 -r 1.27.2.29 src/addr_compl.c;  ) > 2.7.2cvs65.patchset
 ( cvs diff -u -r 1.60.2.81 -r 1.60.2.82 src/addressbook.c;  cvs diff -u -r 1.28.2.23 -r 1.28.2.24 src/addrindex.c;  ) > 2.7.2cvs66.patchset
 ( cvs diff -u -r 1.27.2.29 -r 1.27.2.30 src/addr_compl.c;  ) > 2.7.2cvs67.patchset
 ( cvs diff -u -r 1.27.2.28 -r 1.27.2.29 src/addr_compl.c;  ) > 2.7.2cvs65.patchset
 ( cvs diff -u -r 1.60.2.81 -r 1.60.2.82 src/addressbook.c;  cvs diff -u -r 1.28.2.23 -r 1.28.2.24 src/addrindex.c;  ) > 2.7.2cvs66.patchset
 ( cvs diff -u -r 1.27.2.29 -r 1.27.2.30 src/addr_compl.c;  ) > 2.7.2cvs67.patchset

+( cvs diff -u -r 1.382.2.360 -r 1.382.2.361 src/compose.c;  ) > 2.7.2cvs68.patchset

diff --git a/configure.ac b/configure.ac
index 2ac5e94db88640f3b4bac8beaf8736ea915a210d..73d3c4997452fa549fb080a95c9e1bcb9a4a5836 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=67
+EXTRA_VERSION=68

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 32dfab0596ed631d0a1868e38950e514968982e7..a3225687cf5ac9e0c47d368c5764c6bc7e0ac473 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -3781,12 +3781,6 @@ static void compose_beautify_paragraph(Compose *compose, GtkTextIter *par_iter,
                quote_str = compose_get_quote_str(buffer, &iter, &quote_len);
 
                if (quote_str) {
                quote_str = compose_get_quote_str(buffer, &iter, &quote_len);
 
                if (quote_str) {

-                       if (!wrap_quote) {
-                               if (startq_offset == -1) {
-                                       startq_offset = gtk_text_iter_get_offset(&iter);
-                               }
-                               goto colorize;
-                       }

                        debug_print("compose_beautify_paragraph(): quote_str = '%s'\n", quote_str);
                        if (startq_offset == -1) 
                                startq_offset = gtk_text_iter_get_offset(&iter);
                        debug_print("compose_beautify_paragraph(): quote_str = '%s'\n", quote_str);
                        if (startq_offset == -1) 
                                startq_offset = gtk_text_iter_get_offset(&iter);


@@ -3798,6 +3792,9 @@ static void compose_beautify_paragraph(Compose *compose, GtkTextIter *par_iter,
                                else
                                        quotelevel = 2;
                        }
                                else
                                        quotelevel = 2;
                        }

+                       if (!wrap_quote) {
+                               goto colorize;
+                       }

                } else {
                        if (startq_offset == -1)
                                noq_offset = gtk_text_iter_get_offset(&iter);
                } else {
                        if (startq_offset == -1)
                                noq_offset = gtk_text_iter_get_offset(&iter);


@@ -3915,6 +3912,7 @@ colorize:
                        gtk_text_buffer_get_iter_at_offset(
                                buffer, &startquote, startq_offset);
                        endquote = iter;
                        gtk_text_buffer_get_iter_at_offset(
                                buffer, &startquote, startq_offset);
                        endquote = iter;

+

                        switch (quotelevel) {
                        case 0: gtk_text_buffer_apply_tag_by_name(
                                        buffer, "quote0", &startquote, &endquote);
                        switch (quotelevel) {
                        case 0: gtk_text_buffer_apply_tag_by_name(
                                        buffer, "quote0", &startquote, &endquote);