nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix crash in Geary.RFC822.Message.without_bcc

Browse source 
Second GMime workaround in that method no longer needed, and was causing
a crash, so remove it.
This commit is contained in:
Michael Gratton 2019-12-21 18:23:40 +11:00
parent ba3b91f037
commit e1295d2aa7
1 changed files with 2 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/engine/rfc822/rfc822-message.vala
View file

@ -388,21 +388,8 @@ public class Geary.RFC822.Message : BaseObject, EmailHeaderSet {
// create the new object. Kinda sucks, but our hands are tied.
this.from_buffer(email.message_to_memory_buffer(false, false));
// GMime also drops the ball for the *new* message. When it comes out of the GMime
// Parser, its "mime part" somehow isn't realizing it has a Content-Type header
// already, so whenever you manipulate the headers, it adds a duplicate one. This
// odd looking hack ensures that any header manipulation is done while the "mime
// part" is an empty object, and when we re-set the "mime part", there's only the
// one Content-Type header. In other words, this hack prevents the duplicate
// header, somehow.
GMime.Object original_mime_part = message.get_mime_part();
GMime.Message empty = new GMime.Message(true);
message.set_mime_part(empty.get_mime_part());
message.remove_header(HEADER_BCC);
bcc = null;
message.set_mime_part(original_mime_part);
this.message.remove_header(HEADER_BCC);
this.bcc = null;
}
private GMime.Object? coalesce_related(Gee.List<GMime.Object> parts,