2004-11-22 [colin] 0.9.12cvs158.6

	* src/compose.c
		Remove unneeded code and duplicated
		wrapping - patch by Alfons

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index d0157e6fa552a89d0f59d971e36f61178ccda8e1..f988803a4c6dd9df056690cd92d6ad417e4c2c76 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2004-11-22 [colin]     0.9.12cvs158.6
+
+       * src/compose.c
+               Remove unneeded code and duplicated
+               wrapping - patch by Alfons
+

 2004-11-22 [colin]     0.9.12cvs158.5
 
        * src/prefs_themes.c
 2004-11-22 [colin]     0.9.12cvs158.5
 
        * src/prefs_themes.c

diff --git a/PATCHSETS b/PATCHSETS
index e80f97bb4762f3379b4137d9664db6dcd069fbdc..cb75459e65552cdd6086517fd5b67ab91efa210a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -251,3 +251,4 @@
 ( cvs diff -u -r 1.96.2.35 -r 1.96.2.36 src/textview.c; ) > 0.9.12cvs158.3.patchset
 ( cvs diff -u -r 1.382.2.69 -r 1.382.2.70 src/compose.c; ) > 0.9.12cvs158.4.patchset
 ( cvs diff -u -r 1.3.2.12 -r 1.3.2.13 src/prefs_themes.c; ) > 0.9.12cvs158.5.patchset
 ( cvs diff -u -r 1.96.2.35 -r 1.96.2.36 src/textview.c; ) > 0.9.12cvs158.3.patchset
 ( cvs diff -u -r 1.382.2.69 -r 1.382.2.70 src/compose.c; ) > 0.9.12cvs158.4.patchset
 ( cvs diff -u -r 1.3.2.12 -r 1.3.2.13 src/prefs_themes.c; ) > 0.9.12cvs158.5.patchset

+( cvs diff -u -r 1.382.2.70 -r 1.382.2.71 src/compose.c; ) > 0.9.12cvs158.6.patchset

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

-EXTRA_GTK2_VERSION=.5
+EXTRA_GTK2_VERSION=.6

 
 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 dbd86ff2ff37e04232733b0f25a33b102f2a4eba..ed0d0a8f6c2cfff6d4c8797c6f49af8f353966a9 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -990,18 +990,13 @@ static void compose_generic_reply(MsgInfo *msginfo, gboolean quote,
        if (account->auto_sig)
                compose_insert_sig(compose, FALSE);
 
        if (account->auto_sig)
                compose_insert_sig(compose, FALSE);
 

-       if (quote && prefs_common.linewrap_quote)
-               compose_wrap_line_all(compose);
-

        cursor_pos = quote_fmt_get_cursor_pos();
        gtk_text_buffer_get_start_iter(textbuf, &iter);
        gtk_text_buffer_get_iter_at_offset(textbuf, &iter, cursor_pos);
        gtk_text_buffer_place_cursor(textbuf, &iter);
        cursor_pos = quote_fmt_get_cursor_pos();
        gtk_text_buffer_get_start_iter(textbuf, &iter);
        gtk_text_buffer_get_iter_at_offset(textbuf, &iter, cursor_pos);
        gtk_text_buffer_place_cursor(textbuf, &iter);

-
-       if (quote && prefs_common.linewrap_quote) {
+       
+       if (quote && prefs_common.linewrap_quote)

                compose_wrap_line_all(compose);
                compose_wrap_line_all(compose);

-               gtk_text_view_set_editable(GTK_TEXT_VIEW(compose->text), TRUE);
-       }

 
        gtk_widget_grab_focus(compose->text);
 
 
        gtk_widget_grab_focus(compose->text);