From cdc96a3f5f06110bc05ca6c1cdcea03fbc2d3965 Mon Sep 17 00:00:00 2001 From: Suman Manjunath Date: Mon, 4 Aug 2008 03:49:36 +0000 Subject: Patch from Paul Bolle : Fix related to bug #539268 (Do not append description if it is just an empty string). svn path=/trunk/; revision=35898 --- mail/ChangeLog | 7 +++++++ mail/em-format.c | 1 + 2 files changed, 8 insertions(+) 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 + + ** 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 ** 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); -- cgit v1.2.3