2004-11-08 [colin] 0.9.12cvs141

	* src/textview.c
		fix "colin@colino.net" <colin@colino.net>
		types of URIs

diff --git a/ChangeLog.claws b/ChangeLog.claws
index f405d32485315c773066fd7bde8e5cdacb4a56ec..e86625751224715ef44fc1eca7bb959341a27fe4 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+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
 2004-11-06 [colin]     0.9.12cvs140
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 102edd23c09b299840c1f7f04ddabf252a9311db..5144fe1a22910d08a966148d4e30e6d7c357d6fb 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -123,3 +123,4 @@
 ( cvs diff -u -r 1.74 -r 1.75 po/POTFILES.in; cvs diff -u -r 1.4 -r 1.5 src/prefs_ext_prog.c; cvs diff -u -r 1.3 -r 1.4 tools/kdeservicemenu/template_sylpheed-attach-files.desktop; cvs diff -u -r 1.3 -r 1.4 tools/kdeservicemenu/template_sylpheed-compress-attach.desktop; ) > 0.9.12cvs138.patchset
 ( cvs diff -u -r 1.3087 -r 1.3088 ChangeLog.claws; cvs diff -u -r 1.451 -r 1.452 src/compose.c; cvs diff -u -r 1.90 -r 1.91 src/procmime.c; cvs diff -u -r 1.1 -r 1.2 src/plugins/trayicon/README; ) > 0.9.12cvs139.patchset
 ( cvs diff -u -r 1.452 -r 1.453 src/compose.c; ) > 0.9.12cvs140.patchset
 ( cvs diff -u -r 1.74 -r 1.75 po/POTFILES.in; cvs diff -u -r 1.4 -r 1.5 src/prefs_ext_prog.c; cvs diff -u -r 1.3 -r 1.4 tools/kdeservicemenu/template_sylpheed-attach-files.desktop; cvs diff -u -r 1.3 -r 1.4 tools/kdeservicemenu/template_sylpheed-compress-attach.desktop; ) > 0.9.12cvs138.patchset
 ( cvs diff -u -r 1.3087 -r 1.3088 ChangeLog.claws; cvs diff -u -r 1.451 -r 1.452 src/compose.c; cvs diff -u -r 1.90 -r 1.91 src/procmime.c; cvs diff -u -r 1.1 -r 1.2 src/plugins/trayicon/README; ) > 0.9.12cvs139.patchset
 ( cvs diff -u -r 1.452 -r 1.453 src/compose.c; ) > 0.9.12cvs140.patchset

+( cvs diff -u -r 1.126 -r 1.127 src/textview.c; ) > 0.9.12cvs141.patchset

diff --git a/configure.ac b/configure.ac
index d2ba0d950573d3b03cc9b2da434504935a8b3401..c0d99ebb342837d0bfb415467a31d3bb69df2a17 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=140
+EXTRA_VERSION=141

 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

diff --git a/src/textview.c b/src/textview.c
index c95c9f64d8f74589d9c88b1f806ae70c4790d9bc..cbf9ed295ede0906aafd678809e35aee27ef3855 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -1004,7 +1004,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 */
                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;

 
        GtkSText *text = GTK_STEXT(textview->text);
 
 
        GtkSText *text = GTK_STEXT(textview->text);
 


@@ -1047,7 +1047,15 @@ static void textview_make_clickable_parts(TextView *textview,
                for (last = head.next; last != NULL;
                     normal_text = last->ep, last = last->next) {
                        RemoteURI *uri;
                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_stext_insert(text, font,
                        uri = g_new(RemoteURI, 1);
                        if (last->bp - normal_text > 0)
                                gtk_stext_insert(text, font,