Proper right margin calculation for smart wrapping.

Automatically wrap long lines if wrap quotation is enabled.

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 05a2884e1b72c4f0408323bd4db3d92ca7baf5ae..8d7cde931620304025b3a4f2d13e719214ec7c96 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2001-10-10 [darko]     0.6.3.claws5
+
+       * src/gtkstext.c
+               proper calculation of right margin if smart wrapping is enabled
+       * src/compose.c
+               automatically wrap long lines if wrap quotation is enabled
+
 2001-10-09 [alfons]    0.6.3.claws4
 
        * src/summaryview.c

diff --git a/configure.in b/configure.in
index f17686cf22f25366c639be99f545bb0403aeb9c6..1f92826c9c9ef796e71b899a1c396188bef458c0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws4
+EXTRA_VERSION=claws5
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/compose.c b/src/compose.c
index e107b61ba3cf6d8eb260c8cb8c343d4ec8ae6831..217dba6d3131b8e3a15de4acc8401e113643df23 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -694,6 +694,10 @@ static void compose_generic_reply(MsgInfo *msginfo, gboolean quote,
        gtk_editable_set_position(GTK_EDITABLE(text), 0);
        gtk_stext_set_point(text, 0);
 
+       if (quote && prefs_common.linewrap_quote) {
+               compose_wrap_line_all(compose);
+       }
+
        gtk_stext_thaw(text);
        gtk_widget_grab_focus(compose->text);
 

diff --git a/src/gtkstext.c b/src/gtkstext.c
index 4a4299ba16e1ac4176e37953b531381a447af8f7..1420d40d019e313bddf76f01105314890838f781 100644 (file)
--- a/src/gtkstext.c
+++ b/src/gtkstext.c
@@ -5107,7 +5107,10 @@ find_line_params (GtkSText* text,
        max_display_pixels = text->wrap_rmargin * ch_width; 
   }    
   
-  if (GTK_EDITABLE (text)->editable || !text->word_wrap)
+  /* SYLPHEED - we don't draw ugly word wrapping thing 
+   * if our wrap margin is set */
+  if (!text->wrap_rmargin &&
+      ((GTK_EDITABLE (text)->editable || !text->word_wrap)))
     max_display_pixels -= LINE_WRAP_ROOM;
   
   lp.wraps             = 0;