2007-12-29 [colin] 3.2.0cvs21

	* src/textview.c
		Fix bug 1442, 'Tags are repeated in
		encapsulated messages'

diff --git a/ChangeLog b/ChangeLog
index 2125a63bc450b100ec3f102f59dacf430a66b3ad..7c81eae3f9fff2e375cdc95b4f3b04642c9c7731 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-29 [colin]     3.2.0cvs21
+
+       * src/textview.c
+               Fix bug 1442, 'Tags are repeated in 
+               encapsulated messages'
+
 2007-12-28 [colin]     3.2.0cvs20
 
        * src/procmime.c

diff --git a/PATCHSETS b/PATCHSETS
index 3d2a2e3c819c706ad63a371b885ad8751e49d56c..dd95b87dcb7e40df51fcacddac290639086e86dc 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3157,3 +3157,4 @@
 ( cvs diff -u -r 1.274.2.226 -r 1.274.2.227 src/mainwindow.c;  ) > 3.2.0cvs18.patchset
 ( cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/plugins/pgpcore/Makefile.am;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins/pgpinline/Makefile.am;  cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/plugins/pgpmime/Makefile.am;  ) > 3.2.0cvs19.patchset
 ( cvs diff -u -r 1.49.2.104 -r 1.49.2.105 src/procmime.c;  ) > 3.2.0cvs20.patchset
+( cvs diff -u -r 1.96.2.194 -r 1.96.2.195 src/textview.c;  ) > 3.2.0cvs21.patchset

diff --git a/configure.ac b/configure.ac
index e8371ed5b64002757d6adb2e144f10bc383c3364..f6a97caaefc1a6a5deaf5bef92c4155610cf0242 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=2
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=20
+EXTRA_VERSION=21
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/textview.c b/src/textview.c
index 07403b79fd89caaabe507e93d217b9cca35a271a..f425541bd127c374e6c4cb932eb84985177e880e 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -208,6 +208,7 @@ static void save_file_cb                    (TextView       *textview,
 static void open_image_cb                      (TextView       *textview,
                                                 guint           action,
                                                 void           *data);
+static void textview_show_tags(TextView *textview);
 
 static GtkItemFactoryEntry textview_link_popup_entries[] = 
 {
@@ -634,6 +635,9 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
                if (headers) {
                        if (charcount > 0)
                                gtk_text_buffer_insert(buffer, &iter, "\n", 1);
+                       
+                       if (procmime_mimeinfo_parent(mimeinfo) == NULL)
+                               textview_show_tags(textview);
                        textview_show_header(textview, headers);
                        procheader_header_array_destroy(headers);
                }
@@ -2088,8 +2092,6 @@ static void textview_show_header(TextView *textview, GPtrArray *headers)
 
        g_return_if_fail(headers != NULL);
 
-       textview_show_tags(textview);
-
        for (i = 0; i < headers->len; i++) {
                header = g_ptr_array_index(headers, i);
                g_return_if_fail(header->name != NULL);