Fix wrapping crash when URL is wider than wrapping margin.
authorDarko Koruga <darko@users.sourceforge.net>
Thu, 17 Jan 2002 06:39:04 +0000 (06:39 +0000)
committerDarko Koruga <darko@users.sourceforge.net>
Thu, 17 Jan 2002 06:39:04 +0000 (06:39 +0000)
ChangeLog.claws
configure.in
src/compose.c

index 3fb0afe..d3d3cce 100644 (file)
@@ -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
 2001-12-08 [hoa]       0.7.0claws10
 
        * src/matcher_parser_parse.y
index 5f6fbee..f276d4c 100644 (file)
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 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
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
index d2da9c0..04f19c3 100644 (file)
@@ -2331,6 +2331,11 @@ static void compose_wrap_line_all(Compose *compose)
                                        do_delete = FALSE;
                        }
 
                                        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);
 #ifdef WRAP_DEBUG
                        printf("qlen=%d l_len=%d wrap_len=%d do_del=%d\n",
                                qlen, line_len, linewrap_len, do_delete);