callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Patch from Paul Bolle <pebolle@tiscali.nl>: Fix for bug #539268 (Do not use both filename and description if they are identical)

Browse Source 
svn path=/trunk/; revision=35673
This commit is contained in:
Suman Manjunath
2008-06-21 17:48:26 +00:00
parent 7e2c873b8d
commit 09cf8261f0
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mail/ChangeLog
View File

@ -1,3 +1,10 @@
2008-06-21 Paul Bolle <pebolle@tiscali.nl>
** Fix for bug #539268
* em-format.c: (em_format_describe_part): do not use both filename
and description if these are identical.
2008-06-21 Paul Bolle <pebolle@tiscali.nl>
** Fix for bug #538741

11
mail/em-format.c
View File

@ -1148,7 +1148,7 @@ char *
em_format_describe_part(CamelMimePart *part, const char *mime_type)
{
GString *stext;
const char *text;
const char *filename, *description;
char *out, *desc;
stext = g_string_new("");
@ -1156,10 +1156,11 @@ em_format_describe_part(CamelMimePart *part, const char *mime_type)
desc = g_content_type_get_description (mime_type);
g_string_append_printf (stext, _("%s attachment"), desc ? desc : mime_type);
g_free (desc);
if ((text = camel_mime_part_get_filename (part)))
g_string_append_printf(stext, " (%s)", text);
if ((text = camel_mime_part_get_description(part)))
g_string_append_printf(stext, ", \"%s\"", text);
if ((filename = camel_mime_part_get_filename (part)))
g_string_append_printf(stext, " (%s)", filename);
if ((description = camel_mime_part_get_description(part)) &&
!(filename && (strcmp(filename, description) == 0)))
g_string_append_printf(stext, ", \"%s\"", description);
out = stext->str;
g_string_free(stext, FALSE);