diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-08-08 12:26:12 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-08-08 12:26:12 +0800 |
| commit | cea054cd54d84479352a43bbabc19c9ce9af5efb (patch) | |
| tree | ba02763209ba0f22989024004f57689071603ec5 /mail/em-format.c | |
| parent | 91a6b6899e5568ed34f913bedb538dd6c9e35b32 (diff) | |
| download | gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.gz gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.bz2 gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.lz gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.xz gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.zst gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.zip | |
Merge revisions 35747:35930 from trunk.
svn path=/branches/kill-bonobo/; revision=35931
Diffstat (limited to 'mail/em-format.c')
| -rw-r--r-- | mail/em-format.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mail/em-format.c b/mail/em-format.c index eaa0d77185..483b86cf34 100644 --- a/mail/em-format.c +++ b/mail/em-format.c @@ -735,7 +735,7 @@ emf_format_secure(EMFormat *emf, CamelStream *stream, CamelMimePart *part, Camel if (emf->valid == NULL) { emf->valid = valid; } else { - e_dlist_addtail(&emf->valid_parent->children, (EDListNode *)valid); + camel_dlist_addtail(&emf->valid_parent->children, (CamelDListNode *)valid); camel_cipher_validity_envelope(emf->valid_parent, valid); } @@ -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); |