2006-05-19 [paul] 2.2.0cvs35

	* src/textview.c
		make Reply-To fully clickable
	* src/gtk/logwindow.c
		more colouring (SMTP ESMTP)
	Both patches by Pawel Pekala

diff --git a/ChangeLog b/ChangeLog
index 3c746502b112ea542824b25baee6b2552d23bf2e..2482f8bfa5e619baace6c7ac346f70f5bdb3a4ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-05-19 [paul]      2.2.0cvs35
+
+       * src/textview.c
+               make Reply-To fully clickable
+       * src/gtk/logwindow.c
+               more colouring (SMTP ESMTP)
+       Both patches by Pawel Pekala
+

 2006-05-19 [cleroy]    2.2.0cvs34
 
        * src/mh.c
 2006-05-19 [cleroy]    2.2.0cvs34
 
        * src/mh.c

diff --git a/PATCHSETS b/PATCHSETS
index 8c484670933173271308813078c3c1065f81fe7c..5d9eaa9ca46106f3ab96fcead3a1fef3ac44a4a0 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1504,3 +1504,4 @@
 ( cvs diff -u -r 1.395.2.200 -r 1.395.2.201 src/summaryview.c;  ) > 2.2.0cvs32.patchset
 ( cvs diff -u -r 1.382.2.272 -r 1.382.2.273 src/compose.c;  cvs diff -u -r 1.179.2.113 -r 1.179.2.114 src/imap.c;  cvs diff -u -r 1.274.2.115 -r 1.274.2.116 src/mainwindow.c;  cvs diff -u -r 1.83.2.69 -r 1.83.2.70 src/mimeview.c;  cvs diff -u -r 1.395.2.201 -r 1.395.2.202 src/summaryview.c;  cvs diff -u -r 1.43.2.44 -r 1.43.2.45 src/toolbar.c;  cvs diff -u -r 1.1.4.36 -r 1.1.4.37 src/etpan/imap-thread.c;  ) > 2.2.0cvs33.patchset
 ( cvs diff -u -r 1.79.2.27 -r 1.79.2.28 src/mh.c;  ) > 2.2.0cvs34.patchset
 ( cvs diff -u -r 1.395.2.200 -r 1.395.2.201 src/summaryview.c;  ) > 2.2.0cvs32.patchset
 ( cvs diff -u -r 1.382.2.272 -r 1.382.2.273 src/compose.c;  cvs diff -u -r 1.179.2.113 -r 1.179.2.114 src/imap.c;  cvs diff -u -r 1.274.2.115 -r 1.274.2.116 src/mainwindow.c;  cvs diff -u -r 1.83.2.69 -r 1.83.2.70 src/mimeview.c;  cvs diff -u -r 1.395.2.201 -r 1.395.2.202 src/summaryview.c;  cvs diff -u -r 1.43.2.44 -r 1.43.2.45 src/toolbar.c;  cvs diff -u -r 1.1.4.36 -r 1.1.4.37 src/etpan/imap-thread.c;  ) > 2.2.0cvs33.patchset
 ( cvs diff -u -r 1.79.2.27 -r 1.79.2.28 src/mh.c;  ) > 2.2.0cvs34.patchset

+( cvs diff -u -r 1.96.2.113 -r 1.96.2.114 src/textview.c;  cvs diff -u -r 1.1.4.15 -r 1.1.4.16 src/gtk/logwindow.c;  ) > 2.2.0cvs35.patchset

diff --git a/configure.ac b/configure.ac
index 1e2f0cff55ae0345b7b17ebbebaf36497ccbfd7c..3d0aaabd353e0430475aa66706d943043bcb3444 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=2
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=34
+EXTRA_VERSION=35

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/logwindow.c b/src/gtk/logwindow.c
index bfd27537b593e7f19b327552018a3260761b90b6..0d8129107bcdedc29218da8c2cd9cbd421d41d3d 100644 (file)
--- a/src/gtk/logwindow.c
+++ b/src/gtk/logwindow.c
@@ -246,10 +246,14 @@ static gboolean log_window_append(gpointer source, gpointer data)
        if (tag == NULL) {
                if (strstr(logtext->text, "] POP3>")
                ||  strstr(logtext->text, "] IMAP4>")
        if (tag == NULL) {
                if (strstr(logtext->text, "] POP3>")
                ||  strstr(logtext->text, "] IMAP4>")

+               ||  strstr(logtext->text, "] SMTP>")
+               ||  strstr(logtext->text, "] ESMTP>")

                ||  strstr(logtext->text, "] NNTP>"))
                        tag = "output";
                if (strstr(logtext->text, "] POP3<")
                ||  strstr(logtext->text, "] IMAP4<")
                ||  strstr(logtext->text, "] NNTP>"))
                        tag = "output";
                if (strstr(logtext->text, "] POP3<")
                ||  strstr(logtext->text, "] IMAP4<")

+               ||  strstr(logtext->text, "] SMTP<")
+               ||  strstr(logtext->text, "] ESMTP<")

                ||  strstr(logtext->text, "] NNTP<"))
                        tag = "input";
        }
                ||  strstr(logtext->text, "] NNTP<"))
                        tag = "input";
        }

diff --git a/src/textview.c b/src/textview.c
index 7559d4d980827f9496c731c2126e2eadc4faf88d..7fb68daea872cd99b048066e39c9b7ec8304b4de 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -1537,6 +1537,7 @@ static void textview_show_header(TextView *textview, GPtrArray *headers)
                          procheader_headername_equal(header->name, "To") ||
                          procheader_headername_equal(header->name, "Cc") ||
                          procheader_headername_equal(header->name, "Bcc") ||
                          procheader_headername_equal(header->name, "To") ||
                          procheader_headername_equal(header->name, "Cc") ||
                          procheader_headername_equal(header->name, "Bcc") ||

+                         procheader_headername_equal(header->name, "Reply-To") ||

                          procheader_headername_equal(header->name, "Sender");
                        textview_make_clickable_parts(textview, "header", 
                                                      "link", header->body, 
                          procheader_headername_equal(header->name, "Sender");
                        textview_make_clickable_parts(textview, "header", 
                                                      "link", header->body,