Fix wrapping crash when URL is wider than wrapping margin.

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 3fb0afee1fca4440c23438396b477fdf4168e45f..d3d3cce104efd9e9b8a3e8ba7c32fa32f1a9a579 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2001-01-16 [darko]     0.7.0claws10
+
+       * src/compose.c
+               fix wrapping crash with URL longer than wrapping margin
+
 2001-12-08 [hoa]       0.7.0claws10
 
        * src/matcher_parser_parse.y

diff --git a/configure.in b/configure.in
index 5f6fbeeb9d98d3ef76726a76a16ff584f3f0f6ad..f276d4c6e522315d14e95d5b829fae8f3808dc5d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws9
+EXTRA_VERSION=claws10
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/compose.c b/src/compose.c
index d2da9c0e317d847a26f2371d2bb63ea8e520c3c2..04f19c3d2a905e3cd1cddb81de5ddbf48e740702 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -2331,6 +2331,11 @@ static void compose_wrap_line_all(Compose *compose)
                                        do_delete = FALSE;
                        }
 
+                       /* skip delete if it is continuous URL */
+                       if (do_delete && (line_pos - p_pos <= i_len) &&
+                           gtkut_stext_is_uri_string(text, line_pos, tlen))
+                               do_delete = FALSE;
+
 #ifdef WRAP_DEBUG
                        printf("qlen=%d l_len=%d wrap_len=%d do_del=%d\n",
                                qlen, line_len, linewrap_len, do_delete);