Avoid critical errors when addresses is null

https://bugzilla.gnome.org/show_bug.cgi?id=732982
This commit is contained in:
Robert Schroll 2014-07-09 23:47:24 -04:00
parent 5040347ad8
commit 35a7e9ff81

View file

@ -1238,12 +1238,15 @@ public class ComposerWidget : Gtk.EventBox {
compact_header_label.label = to_entry.buffer.text + (tocc ? ", " : "")
+ cc_entry.buffer.text + (ccbcc ? ", " : "") + bcc_entry.buffer.text;
StringBuilder tooltip = new StringBuilder();
foreach(Geary.RFC822.MailboxAddress addr in to_entry.addresses)
tooltip.append(_("To: ") + addr.get_full_address() + "\n");
foreach(Geary.RFC822.MailboxAddress addr in cc_entry.addresses)
tooltip.append(_("Cc: ") + addr.get_full_address() + "\n");
foreach(Geary.RFC822.MailboxAddress addr in bcc_entry.addresses)
tooltip.append(_("Bcc: ") + addr.get_full_address() + "\n");
if (to_entry.addresses != null)
foreach(Geary.RFC822.MailboxAddress addr in to_entry.addresses)
tooltip.append(_("To: ") + addr.get_full_address() + "\n");
if (cc_entry.addresses != null)
foreach(Geary.RFC822.MailboxAddress addr in cc_entry.addresses)
tooltip.append(_("Cc: ") + addr.get_full_address() + "\n");
if (bcc_entry.addresses != null)
foreach(Geary.RFC822.MailboxAddress addr in bcc_entry.addresses)
tooltip.append(_("Bcc: ") + addr.get_full_address() + "\n");
compact_header_label.tooltip_text = tooltip.str.slice(0, -1); // Remove trailing \n
}