2004-11-08 [colin] 0.9.12cvs141.1
authorColin Leroy <colin@colino.net>
Mon, 8 Nov 2004 12:54:59 +0000 (12:54 +0000)
committerColin Leroy <colin@colino.net>
Mon, 8 Nov 2004 12:54:59 +0000 (12:54 +0000)
* src/textview.c
Sync with HEAD (fix some mail URIs)

ChangeLog-gtk2.claws
ChangeLog.claws
PATCHSETS
configure.ac
src/textview.c

index 8465c8bc7935dd1b260c9b8f955c06b17b1619f0..41293759add13bd4d343c12bc96bf26d26e20e8e 100644 (file)
@@ -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
index 9b33e9bde38c14d8f797fa22ccea7201e679d905..e86625751224715ef44fc1eca7bb959341a27fe4 100644 (file)
@@ -1,3 +1,22 @@
+2004-11-08 [colin]     0.9.12cvs141
+
+       * src/textview.c
+               fix "colin@colino.net" <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
index 0770934c3c5914e0553b2f03727463cdd859a7d6..78d026692b59aaf54916f13322264e763edd843f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index 8d9ba17e044311d91d5b24c0bf1c04147cee04f9..2da894ca5816a703af841609bc5ca123c31dbfd8 100644 (file)
@@ -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}
index 7b42c932245e8ba7d816f078a2de389c2fc10a35..a6c3381946893d80a517f3934ec22e45a0a3cfef 100644 (file)
@@ -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" <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