callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Write out the url before callind add_url since add_url may free it. Fixes

Browse Source 
* mail-format.c (handle_multipart_signed): Write out the url
	before callind add_url since add_url may free it. Fixes #13839.
	Remove debug printf.

	* mail-display.c (on_object_requested): Remove debug printf.

svn path=/trunk/; revision=14564
This commit is contained in:
Dan Winship
2001-11-01 20:42:57 +00:00
parent accdc958be
commit b5ec8bf5cf
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mail/ChangeLog
View File

@ -1,3 +1,11 @@
2001-11-01 Dan Winship <danw@ximian.com>
* mail-format.c (handle_multipart_signed): Write out the url
before callind add_url since add_url may free it. Fixes #13839.
Remove debug printf.
* mail-display.c (on_object_requested): Remove debug printf.
2001-10-31 Jeffrey Stedfast <fejj@ximian.com> 2001-10-31 Jeffrey Stedfast <fejj@ximian.com>
* mail-callbacks.c (list_add_addresses): Don't use a * mail-callbacks.c (list_add_addresses): Don't use a

2
mail/mail-display.c
View File

@ -963,8 +963,6 @@ on_object_requested (GtkHTML *html, GtkHTMLEmbedded *eb, gpointer data)
return do_attachment_header (html, eb, part, md); return do_attachment_header (html, eb, part, md);
} else if (!strncmp (eb->classid, "signature:", 10)) { } else if (!strncmp (eb->classid, "signature:", 10)) {
part = g_hash_table_lookup (urls, eb->classid); part = g_hash_table_lookup (urls, eb->classid);
printf ("%s -> %p (IS%s a mime part)\n",
eb->classid, part, CAMEL_IS_MIME_PART (part) ? "" : " NOT");
if (!CAMEL_IS_MIME_PART (part)) if (!CAMEL_IS_MIME_PART (part))
return FALSE; return FALSE;
return do_signature (html, eb, part, md); return do_signature (html, eb, part, md);

3
mail/mail-format.c
View File

@ -1786,14 +1786,13 @@ handle_multipart_signed (CamelMimePart *part, const char *mime_type,
/* Write out the click-for-info object */ /* Write out the click-for-info object */
url = g_strdup_printf ("signature:%p/%lu", subpart, url = g_strdup_printf ("signature:%p/%lu", subpart,
(unsigned long)time (NULL)); (unsigned long)time (NULL));
printf ("adding %s\n", url);
add_url ("part_urls", url, subpart, md);
mail_html_write (md->html, md->stream, mail_html_write (md->html, md->stream,
"<br><table cellspacing=0 cellpadding=0>" "<br><table cellspacing=0 cellpadding=0>"
"<tr><td><table width=10 cellspacing=0 cellpadding=0><tr><td></td></tr></table></td>" "<tr><td><table width=10 cellspacing=0 cellpadding=0><tr><td></td></tr></table></td>"
"<td><object classid=\"%s\"></object></td>" "<td><object classid=\"%s\"></object></td>"
"<td><table width=3 cellspacing=0 cellpadding=0><tr><td></td></tr></table></td>" "<td><table width=3 cellspacing=0 cellpadding=0><tr><td></td></tr></table></td>"
"<td><font size=-1>", url); "<td><font size=-1>", url);
add_url ("part_urls", url, subpart, md);
mail_html_write_string (md->html, md->stream, mail_html_write_string (md->html, md->stream,
U_("This message is digitally signed. " U_("This message is digitally signed. "