From bb9cb294d94567462787121b116e23131f8ef5b6 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Thu, 27 Jul 2006 06:27:19 +0000 Subject: [PATCH] 2006-07-27 [colin] 2.3.1cvs86 * src/textview.c Don't include the leading \n in links Patch by Fabien --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/textview.c | 5 +++-- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c06435ae8..92ba0b19a 100644 --- 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 92140f70e..ec3c4948c 100644 --- 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 014a67f66..d1fbfcfbd 100644 --- 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 c4e571c38..96697b3bf 100644 --- 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 && -- 2.25.1