2006-02-08 [colin] 2.0.0cvs30

	* src/compose.c
		Don't unblock if not blocked

diff --git a/ChangeLog b/ChangeLog
index b6230fa60c406df95e155a342381620d1b25a2d3..ed6db784f949a3a5b727dfd93598b04f3109c3e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-08 [colin]     2.0.0cvs30
+
+       * src/compose.c
+               Don't unblock if not blocked
+
 2006-02-07 [colin]     2.0.0cvs29
 
        * src/action.c

diff --git a/PATCHSETS b/PATCHSETS
index 76dbde9b0fabf9cc03a762c03e9d6abe6c554b7a..5ff424df5636d6eacc067eb8bf0d1de7d2ad44e5 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1213,3 +1213,4 @@
 ( cvs diff -u -r 1.213.2.83 -r 1.213.2.84 src/folder.c;  ) > 2.0.0cvs27.patchset
 ( cvs diff -u -r 1.12.2.30 -r 1.12.2.31 src/action.c;  cvs diff -u -r 1.382.2.235 -r 1.382.2.236 src/compose.c;  ) > 2.0.0cvs28.patchset
 ( cvs diff -u -r 1.12.2.31 -r 1.12.2.32 src/action.c;  ) > 2.0.0cvs29.patchset
+( cvs diff -u -r 1.382.2.236 -r 1.382.2.237 src/compose.c;  ) > 2.0.0cvs30.patchset

diff --git a/configure.ac b/configure.ac
index dbc97d4485174b542eb80fb57572ca46093ff463..3d1a9ca43ff00e94f92927ccb89d17a006c28866 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=29
+EXTRA_VERSION=30
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 915957e82726a61bd4d5d89a8097d20539a57582..bf6764762ffe28218bc51cd16a3d4b387fc66ef2 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -3432,7 +3432,8 @@ static void compose_beautify_paragraph(Compose *compose, GtkTextIter *par_iter,
                }
 
 colorize:
-               if (!prev_autowrap) {
+               if (!prev_autowrap && num_blocks > 0) {
+                       num_blocks--;
                        g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
                                        G_CALLBACK(text_inserted),
                                        compose);