aboutsummaryrefslogtreecommitdiffstats
path: root/mail/mail-display.c
diff options
context:
space:
mode:
authorJon Trowbridge <trow@ximian.com>2001-08-28 05:21:14 +0800
committerJon Trowbridge <trow@src.gnome.org>2001-08-28 05:21:14 +0800
commit68a8a866bb4036b6aea03d62634fc27a6fa4c4c4 (patch)
tree08904dce3d0022d904f5d8a1dab7df8629a878ef /mail/mail-display.c
parent7c5fe3b52c54cf3223edbd2e5870cbc5795b1abc (diff)
downloadgsoc2013-evolution-68a8a866bb4036b6aea03d62634fc27a6fa4c4c4.tar
gsoc2013-evolution-68a8a866bb4036b6aea03d62634fc27a6fa4c4c4.tar.gz
gsoc2013-evolution-68a8a866bb4036b6aea03d62634fc27a6fa4c4c4.tar.bz2
gsoc2013-evolution-68a8a866bb4036b6aea03d62634fc27a6fa4c4c4.tar.lz
gsoc2013-evolution-68a8a866bb4036b6aea03d62634fc27a6fa4c4c4.tar.xz
gsoc2013-evolution-68a8a866bb4036b6aea03d62634fc27a6fa4c4c4.tar.zst
gsoc2013-evolution-68a8a866bb4036b6aea03d62634fc27a6fa4c4c4.zip
Check if we are trying to reply to a message with no From: field, and try
2001-08-27 Jon Trowbridge <trow@ximian.com> * mail-callbacks.c (mail_generate_reply): Check if we are trying to reply to a message with no From: field, and try to do something graceful in that case. (Bug #7028) * mail-display.c (ebook_callback): Add paranoid checks for the case of a message with a From: field. (Also maybe bug #7028) svn path=/trunk/; revision=12490
Diffstat (limited to 'mail/mail-display.c')
-rw-r--r--mail/mail-display.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/mail/mail-display.c b/mail/mail-display.c
index 9a9fe89db6..75bc012a00 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -952,11 +952,14 @@ ebook_callback (EBook *book, const gchar *addr, ECard *card, gpointer data)
if (card && md->current_message) {
const CamelInternetAddress *from = camel_mime_message_get_from (md->current_message);
- const char *md_name, *md_addr;
+ const char *md_name = NULL, *md_addr = NULL;
- if (camel_internet_address_get (from, 0, &md_name, &md_addr) &&
- !strcmp (addr, md_addr))
- mail_display_load_images (md);
+ /* We are extra anal, in case we are dealing with some sort of pathological message
+ w/o a From: header. */
+ if (from != NULL && camel_internet_address_get (from, 0, &md_name, &md_addr)) {
+ if (md_addr != NULL && strcmp (addr, md_addr))
+ mail_display_load_images (md);
+ }
}
}