From: Darko Koruga <darko@users.sourceforge.net>
Date: Thu, 17 Jan 2002 06:39:04 +0000 (+0000)
Subject: Fix wrapping crash when URL is wider than wrapping margin.
X-Git-Tag: rel_0_7_1~85
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=15a8de8705090f10d201ed1fa1a797e1c66d4a77;ds=sidebyside

Fix wrapping crash when URL is wider than wrapping margin.
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 3fb0afee1..d3d3cce10 100644
--- 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 5f6fbeeb9..f276d4c6e 100644
--- 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 d2da9c0e3..04f19c3d2 100644
--- 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);