From: Colin Leroy Date: Mon, 8 Nov 2004 16:05:01 +0000 (+0000) Subject: 2004-11-08 [colin] 0.9.12cvs142.2 X-Git-Tag: gtk2_win32_last_merge~101 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=1579117dccbf7b84243ce129d75b67a2bc778f32;ds=sidebyside 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 cdeef48ab..c70d8cc3e 100644 --- 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 diff --git a/PATCHSETS b/PATCHSETS index 2162a8ba7..a27dd9703 100644 --- 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.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 ca995061e..ea2e341e4 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ INTERFACE_AGE=0 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} diff --git a/src/compose.c b/src/compose.c index ce7674002..37511f280 100644 --- 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); - if (prefs_common.autowrap) + if (compose->autowrap) compose_wrap_line_all_full(compose, TRUE); g_signal_handlers_unblock_by_func(G_OBJECT(buffer),