diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2009-02-01 03:03:12 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2009-02-01 03:03:12 +0800 |
| commit | fee5916b60c605ff5086d8fdc2a85c5ea21351f6 (patch) | |
| tree | 4feaede1cf070448a32bd0ab846908e47747ceb7 /mail/em-format.c | |
| parent | cd5ff486fb02451645f8b4b39608edca2da5e4a2 (diff) | |
| download | gsoc2013-evolution-fee5916b60c605ff5086d8fdc2a85c5ea21351f6.tar gsoc2013-evolution-fee5916b60c605ff5086d8fdc2a85c5ea21351f6.tar.gz gsoc2013-evolution-fee5916b60c605ff5086d8fdc2a85c5ea21351f6.tar.bz2 gsoc2013-evolution-fee5916b60c605ff5086d8fdc2a85c5ea21351f6.tar.lz gsoc2013-evolution-fee5916b60c605ff5086d8fdc2a85c5ea21351f6.tar.xz gsoc2013-evolution-fee5916b60c605ff5086d8fdc2a85c5ea21351f6.tar.zst gsoc2013-evolution-fee5916b60c605ff5086d8fdc2a85c5ea21351f6.zip | |
Merge revisions 37108:37199 from trunk.
svn path=/branches/kill-bonobo/; revision=37200
Diffstat (limited to 'mail/em-format.c')
| -rw-r--r-- | mail/em-format.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mail/em-format.c b/mail/em-format.c index ef08d206ff..5b38f6cea3 100644 --- a/mail/em-format.c +++ b/mail/em-format.c @@ -1109,7 +1109,7 @@ em_format_format_text(EMFormat *emf, CamelStream *stream, CamelDataWrapper *dw) camel_object_unref(filter_stream); camel_stream_reset (mem_stream); - if (max == -1 || size < (max * 1024) || emf->composer) { + if (max == -1 || size == -1 || size < (max * 1024) || emf->composer) { camel_stream_write_to_stream(mem_stream, (CamelStream *)stream); camel_stream_flush((CamelStream *)stream); } else { |