aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuman Manjunath <msuman@src.gnome.org>2008-08-04 11:49:36 +0800
committerSuman Manjunath <msuman@src.gnome.org>2008-08-04 11:49:36 +0800
commitcdc96a3f5f06110bc05ca6c1cdcea03fbc2d3965 (patch)
tree12f2e5443af90f44cae2311dc6e239740b7a865b
parent6dd3a55a40a84a8666069d5122f715f93fc03251 (diff)
downloadgsoc2013-evolution-cdc96a3f5f06110bc05ca6c1cdcea03fbc2d3965.tar.gz
gsoc2013-evolution-cdc96a3f5f06110bc05ca6c1cdcea03fbc2d3965.tar.zst
gsoc2013-evolution-cdc96a3f5f06110bc05ca6c1cdcea03fbc2d3965.zip
Patch from Paul Bolle <pebolle@tiscali.nl>: Fix related to bug #539268 (Do not append description if it is just an empty string).
svn path=/trunk/; revision=35898
-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);