2004-11-08 [colin] 0.9.12cvs142.2

	* src/compose.c
		Don't wrap when Edit/Auto wrapping is disabled

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index cdeef48ab74d57f05048263ccda9fc371645a4a0..c70d8cc3e261b4550a2c77acb6128497ad990172 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-11-08 [colin]     0.9.12cvs142.2
+
+       * src/compose.c
+               Don't wrap when Edit/Auto wrapping is disabled
+

 2004-11-08 [colin]     0.9.12cvs142.1
 
        * src/textview.c
 2004-11-08 [colin]     0.9.12cvs142.1
 
        * src/textview.c

diff --git a/PATCHSETS b/PATCHSETS
index 2162a8ba7dd984f9d17ef25a334874f52e0e87fd..a27dd970322db8e1701709a70b3032a212f87165 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -221,3 +221,4 @@
 ( cvs diff -u -r 1.96.2.27 -r 1.96.2.28 src/textview.c; ) > 0.9.12cvs140.3.patchset
 ( cvs diff -u -r 1.2504.2.29 -r 1.2504.2.30 ChangeLog.claws; cvs diff -u -r 1.96.2.28 -r 1.96.2.29 src/textview.c; ) > 0.9.12cvs141.1.patchset
 ( cvs diff -u -r 1.96.2.29 -r 1.96.2.30 src/textview.c; ) > 0.9.12cvs142.1.patchset
 ( cvs diff -u -r 1.96.2.27 -r 1.96.2.28 src/textview.c; ) > 0.9.12cvs140.3.patchset
 ( cvs diff -u -r 1.2504.2.29 -r 1.2504.2.30 ChangeLog.claws; cvs diff -u -r 1.96.2.28 -r 1.96.2.29 src/textview.c; ) > 0.9.12cvs141.1.patchset
 ( cvs diff -u -r 1.96.2.29 -r 1.96.2.30 src/textview.c; ) > 0.9.12cvs142.1.patchset

+( cvs diff -u -r 1.382.2.60 -r 1.382.2.61 src/compose.c; ) > 0.9.12cvs142.2.patchset

diff --git a/configure.ac b/configure.ac
index ca995061eedc368859703382eac15ef1aab0fd5e..ea2e341e42e2b23dd5fa8a11e1f51533bd93a7f5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=142
 EXTRA_RELEASE=
 BINARY_AGE=0
 EXTRA_VERSION=142
 EXTRA_RELEASE=

-EXTRA_GTK2_VERSION=.1
+EXTRA_GTK2_VERSION=.2

 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

diff --git a/src/compose.c b/src/compose.c
index ce7674002020eb53ef02e4fcfb24a6ddb55f9591..37511f280492e1c15eeeb020b12adcbfb46691ec 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -7222,7 +7222,7 @@ static void text_inserted(GtkTextBuffer *buffer, GtkTextIter *iter,
        } else
                gtk_text_buffer_insert(buffer, iter, text, len);
 
        } else
                gtk_text_buffer_insert(buffer, iter, text, len);
 

-       if (prefs_common.autowrap)
+       if (compose->autowrap)

                compose_wrap_line_all_full(compose, TRUE);
 
        g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
                compose_wrap_line_all_full(compose, TRUE);
 
        g_signal_handlers_unblock_by_func(G_OBJECT(buffer),