From: Colin Leroy Date: Mon, 8 Nov 2004 12:54:59 +0000 (+0000) Subject: 2004-11-08 [colin] 0.9.12cvs141.1 X-Git-Tag: gtk2_win32_last_merge~103 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=f96c2837a4049db3071299d4ca55e58be39c7c32 2004-11-08 [colin] 0.9.12cvs141.1 * src/textview.c Sync with HEAD (fix some mail URIs) --- diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 8465c8bc7..41293759a 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,8 @@ +2004-11-08 [colin] 0.9.12cvs141.1 + + * src/textview.c + Sync with HEAD (fix some mail URIs) + 2004-11-08 [colin] 0.9.12cvs140.3 * src/textview.c diff --git a/ChangeLog.claws b/ChangeLog.claws index 9b33e9bde..e86625751 100644 --- a/ChangeLog.claws +++ b/ChangeLog.claws @@ -1,3 +1,22 @@ +2004-11-08 [colin] 0.9.12cvs141 + + * src/textview.c + fix "colin@colino.net" + types of URIs + +2004-11-06 [colin] 0.9.12cvs140 + + * src/compose.c + Don't ask for passphrase if not sending + +2004-11-05 [christoph] 0.9.12cvs139 + + * src/compose.c + o encode text content of composed mails + * src/procmime.c + o allow encoding of MimeInfos that are stored in memory buffers + + 2004-11-03 [paul] 0.9.12cvs138 * po/POTFILES.in @@ -26,7 +45,6 @@ > Malformed message: Unexpected characters at end of parameters: > =_Thu__28_Oct_2) - 2004-10-29 [paul] * tools/textviewer.sh diff --git a/PATCHSETS b/PATCHSETS index 0770934c3..78d026692 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -219,3 +219,4 @@ ( cvs diff -u -r 1.382.2.59 -r 1.382.2.60 src/compose.c; ) > 0.9.12cvs140.1.patchset ( cvs diff -u -r 1.96.2.26 -r 1.96.2.27 src/textview.c; ) > 0.9.12cvs140.2.patchset ( cvs diff -u -r 1.96.2.27 -r 1.96.2.28 src/textview.c; ) > 0.9.12cvs140.3.patchset +( cvs diff -u -r 1.2504.2.29 -r 1.2504.2.30 ChangeLog.claws; cvs diff -u -r 1.96.2.28 -r 1.96.2.29 src/textview.c; ) > 0.9.12cvs141.1.patchset diff --git a/configure.ac b/configure.ac index 8d9ba17e0..2da894ca5 100644 --- a/configure.ac +++ b/configure.ac @@ -11,9 +11,9 @@ MINOR_VERSION=9 MICRO_VERSION=12 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=140 +EXTRA_VERSION=141 EXTRA_RELEASE= -EXTRA_GTK2_VERSION=.3 +EXTRA_GTK2_VERSION=.1 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION} diff --git a/src/textview.c b/src/textview.c index 7b42c9322..a6c338194 100644 --- a/src/textview.c +++ b/src/textview.c @@ -1029,7 +1029,7 @@ static void textview_make_clickable_parts(TextView *textview, const gchar *bp, *ep; /* text position */ gint pti; /* index in parse table */ struct txtpos *next; /* next */ - } head = {NULL, NULL, 0, NULL}, *last = &head; + } head = {NULL, NULL, 0, NULL}, *last = &head, *next = NULL; gtk_text_buffer_get_end_iter(buffer, &iter); @@ -1072,7 +1072,15 @@ static void textview_make_clickable_parts(TextView *textview, for (last = head.next; last != NULL; normal_text = last->ep, last = last->next) { RemoteURI *uri; - + next = last->next; + /* fix "colin@colino.net" types of URIs + /* FIXME would be better to fix it in the email parser */ + if (next && next->bp == last->ep) { + next->bp = last->bp; + if (*(next->bp -1 )=='"' && strchr(next->bp, '"')) + next->bp--; + continue; + } uri = g_new(RemoteURI, 1); if (last->bp - normal_text > 0) gtk_text_buffer_insert_with_tags_by_name