2006-07-05 [colin] 2.3.1cvs61

	* src/textview.c
	* src/compose.c
		Handle sftp:// links

diff --git a/ChangeLog b/ChangeLog
index 079a41f61508489982e96e276d7a53a59cf36d14..974be7c6538be24402e7ef6dd1a958d42c489394 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-05 [colin]     2.3.1cvs61
+
+       * src/textview.c
+       * src/compose.c
+               Handle sftp:// links
+
 2006-07-05 [paul]      2.3.1cvs60
 
        * src/gtk/filesel.c

diff --git a/PATCHSETS b/PATCHSETS
index 4bbad26618c2c424b7d874d32cd4cec9405fc160..3334a2d54c673021ec0257c5cd9ca9d430fe1d4e 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1661,3 +1661,4 @@
 ( cvs diff -u -r 1.83.2.74 -r 1.83.2.75 src/mimeview.c;  cvs diff -u -r 1.96.2.120 -r 1.96.2.121 src/textview.c;  cvs diff -u -r 1.36.2.70 -r 1.36.2.71 src/common/utils.c;  ) > 2.3.1cvs58.patchset
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/xml2pdf;  ) > 2.3.1cvs59.patchset
 ( cvs diff -u -r 1.2.2.24 -r 1.2.2.25 src/gtk/filesel.c;  ) > 2.3.1cvs60.patchset
+( cvs diff -u -r 1.96.2.121 -r 1.96.2.122 src/textview.c;  cvs diff -u -r 1.382.2.292 -r 1.382.2.293 src/compose.c;  ) > 2.3.1cvs61.patchset

diff --git a/configure.ac b/configure.ac
index 519ef88d666fa0d420794eb5c3fb86f7e208b928..be529aafd115d2699939793362e014be0b8a8f71 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=60
+EXTRA_VERSION=61
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index b92192e8601bff5f2e7d3d7835fd278e9e9dc164..2df9191b1d23dc762e7e1e9303395c81de097262 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -3520,6 +3520,7 @@ static void compose_beautify_paragraph(Compose *compose, GtkTextIter *par_iter,
                        {"http://",  strcasestr, get_uri_part,   make_uri_string},
                        {"https://", strcasestr, get_uri_part,   make_uri_string},
                        {"ftp://",   strcasestr, get_uri_part,   make_uri_string},
+                       {"sftp://",  strcasestr, get_uri_part,   make_uri_string},
                        {"www.",     strcasestr, get_uri_part,   make_http_string},
                        {"mailto:",  strcasestr, get_uri_part,   make_uri_string},
                        {"@",        strcasestr, get_email_part, make_email_string}

diff --git a/src/textview.c b/src/textview.c
index 648f15e4a1cff6d46885a87ee37a4a3c3c2b0f6a..10aa944f80dc98fb0499d78b04028739a028fc14 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -1038,6 +1038,7 @@ static void textview_make_clickable_parts(TextView *textview,
                {"http://",  strcasestr, get_uri_part,   make_uri_string},
                {"https://", strcasestr, get_uri_part,   make_uri_string},
                {"ftp://",   strcasestr, get_uri_part,   make_uri_string},
+               {"sftp://",  strcasestr, get_uri_part,   make_uri_string},
                {"www.",     strcasestr, get_uri_part,   make_http_string},
                {"mailto:",  strcasestr, get_uri_part,   make_uri_string},
                {"@",        strcasestr, get_email_part, make_email_string}