2006-07-27 [colin] 2.3.1cvs86

	* src/textview.c
		Don't include the leading \n in links
		Patch by Fabien

diff --git a/ChangeLog b/ChangeLog
index c06435ae823bb245c4de81f3ec4fc1affa9089e6..92ba0b19a008c52fdff7eeaee92a5332bcf204ae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-27 [colin]     2.3.1cvs86
+
+       * src/textview.c
+               Don't include the leading \n in links
+               Patch by Fabien
+
 2006-07-25 [colin]     2.3.1cvs85
 
        * src/mainwindow.c

diff --git a/PATCHSETS b/PATCHSETS
index 92140f70edfda19c8fdbdeb9fe14c8bead15f8f5..ec3c4948c68a37ee59c510736149d72b91741090 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1686,3 +1686,4 @@
 ( diff -u /dev/null sylpheed-claws.ico;  ) > 2.3.1cvs83.patchset
 ( cvs diff -u -r 1.149.2.53 -r 1.149.2.54 src/inc.c;  ) > 2.3.1cvs84.patchset
 ( cvs diff -u -r 1.274.2.125 -r 1.274.2.126 src/mainwindow.c;  cvs diff -u -r 1.13.2.6 -r 1.13.2.7 src/common/socket.h;  cvs diff -u -r 1.1.4.45 -r 1.1.4.46 src/etpan/imap-thread.c;  ) > 2.3.1cvs85.patchset
+( cvs diff -u -r 1.96.2.127 -r 1.96.2.128 src/textview.c;  ) > 2.3.1cvs86.patchset

diff --git a/configure.ac b/configure.ac
index 014a67f6601a5f1ea46d6b308c27c5d39fb8945a..d1fbfcfbd447b443dd6ac671ab2ec931e41d606b 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=85
+EXTRA_VERSION=86
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/textview.c b/src/textview.c
index c4e571c38bfc39a077dd27ad5104a09f33a0d87c..96697b3bf61c6aec66e0c9b2e4e6c02cbab3d12d 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -622,10 +622,10 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
        if (name == NULL)
                name = procmime_mimeinfo_get_parameter(mimeinfo, "name");
        if (name != NULL)
-               g_snprintf(buf, sizeof(buf), "\n[%s  %s (%d bytes)]",
+               g_snprintf(buf, sizeof(buf), _("[%s  %s (%d bytes)]"),
                           name, content_type, mimeinfo->length);
        else
-               g_snprintf(buf, sizeof(buf), "\n[%s (%d bytes)]",
+               g_snprintf(buf, sizeof(buf), _("[%s (%d bytes)]"),
                           content_type, mimeinfo->length);
 
        g_free(content_type);                      
@@ -633,6 +633,7 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
        if (mimeinfo->disposition == DISPOSITIONTYPE_ATTACHMENT
        || (mimeinfo->disposition == DISPOSITIONTYPE_INLINE && 
            mimeinfo->type != MIMETYPE_TEXT)) {
+               gtk_text_buffer_insert(buffer, &iter, "\n", 1);
                TEXT_INSERT_LINK(buf, "sc://select_attachment", mimeinfo);
                gtk_text_buffer_insert(buffer, &iter, " \n", -1);
                if (mimeinfo->type == MIMETYPE_IMAGE  &&