2006-07-08 [colin] 2.3.1cvs75

	* src/textview.c
		Fix highlighting of attached parts URIs

diff --git a/ChangeLog b/ChangeLog
index 005946c4184d38dfd63bf82577171a9c43154c7f..24b938ebf65bacc716295003ed921232b39c0998 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-08 [colin]     2.3.1cvs75
+
+       * src/textview.c
+               Fix highlighting of attached parts URIs
+
 2006-07-08 [colin]     2.3.1cvs74
 
        * src/main.c

diff --git a/PATCHSETS b/PATCHSETS
index 8df8cd0940f232f92bd5e6710dcf1d335ee887ff..585b00f80cc7f4465ee11ca8bf95bfa7eaf5dd4d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1675,3 +1675,4 @@
 ( cvs diff -u -r 1.60.2.36 -r 1.60.2.37 src/prefs_actions.c;  ) > 2.3.1cvs72.patchset
 ( cvs diff -u -r 1.60.2.37 -r 1.60.2.38 src/prefs_actions.c;  ) > 2.3.1cvs73.patchset
 ( cvs diff -u -r 1.115.2.94 -r 1.115.2.95 src/main.c;  ) > 2.3.1cvs74.patchset
+( cvs diff -u -r 1.96.2.125 -r 1.96.2.126 src/textview.c;  ) > 2.3.1cvs75.patchset

diff --git a/configure.ac b/configure.ac
index 80e1df733579dc2f430e5112f449a3f72d047f1e..5fb09e8db11589f65a70401905b58e1c0960e704 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=74
+EXTRA_VERSION=75
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/textview.c b/src/textview.c
index aca5ea28975ab563f9783ae778cd076c4eaa2ba7..4cff9ef1af269641fd114911bb2ecda838660ac0 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)]\n",
+               g_snprintf(buf, sizeof(buf), "\n[%s  %s (%d bytes)]",
                           name, content_type, mimeinfo->length);
        else
-               g_snprintf(buf, sizeof(buf), "\n[%s (%d bytes)]\n",
+               g_snprintf(buf, sizeof(buf), "\n[%s (%d bytes)]",
                           content_type, mimeinfo->length);
 
        g_free(content_type);                      
@@ -634,6 +634,7 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
        || (mimeinfo->disposition == DISPOSITIONTYPE_INLINE && 
            mimeinfo->type != MIMETYPE_TEXT)) {
                TEXT_INSERT_LINK(buf, "sc://select_attachment", mimeinfo);
+               gtk_text_buffer_insert(buffer, &iter, " \n", -1);
                if (mimeinfo->type == MIMETYPE_IMAGE  &&
                    prefs_common.inline_img ) {
                        GdkPixbuf *pixbuf;
@@ -677,7 +678,6 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
 
                        uri_str = g_filename_to_uri(filename, NULL, NULL);
                        if (uri_str) {
-                               gtk_text_buffer_insert(buffer, &iter, " ", -1);
                                uri = g_new(RemoteURI, 1);
                                uri->uri = uri_str;
                                uri->start = gtk_text_iter_get_offset(&iter);