2004-11-22 [colin] 0.9.12cvs158.6
authorColin Leroy <colin@colino.net>
Mon, 22 Nov 2004 13:40:55 +0000 (13:40 +0000)
committerColin Leroy <colin@colino.net>
Mon, 22 Nov 2004 13:40:55 +0000 (13:40 +0000)
* src/compose.c
Remove unneeded code and duplicated
wrapping - patch by Alfons

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/compose.c

index d0157e6..f988803 100644 (file)
@@ -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
index e80f97b..cb75459 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index efd2fbf..0e75f5b 100644 (file)
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 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}
index dbd86ff..ed0d0a8 100644 (file)
@@ -990,18 +990,13 @@ static void compose_generic_reply(MsgInfo *msginfo, gboolean quote,
        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);
-
-       if (quote && prefs_common.linewrap_quote) {
+       
+       if (quote && prefs_common.linewrap_quote)
                compose_wrap_line_all(compose);
-               gtk_text_view_set_editable(GTK_TEXT_VIEW(compose->text), TRUE);
-       }
 
        gtk_widget_grab_focus(compose->text);