aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/em-format.c1
2 files changed, 8 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 3dbb9a64cb..514a00ba20 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-04 Paul Bolle <pebolle@tiscali.nl>
+
+ ** Further fix for bug #539268
+
+ * em-format.c (em_format_describe_part): Do not append description
+ if it is just an empty string.
+
2008-08-04 Matthew Barnes <mbarnes@redhat.com>
** Fixes bug #249844
diff --git a/mail/em-format.c b/mail/em-format.c
index eaa0d77185..9971528acd 100644
--- a/mail/em-format.c
+++ b/mail/em-format.c
@@ -1159,6 +1159,7 @@ em_format_describe_part(CamelMimePart *part, const char *mime_type)
if ((filename = camel_mime_part_get_filename (part)))
g_string_append_printf(stext, " (%s)", filename);
if ((description = camel_mime_part_get_description(part)) &&
+ (*description != 0) &&
!(filename && (strcmp(filename, description) == 0)))
g_string_append_printf(stext, ", \"%s\"", description);