diff options
| author | Dan Winship <danw@src.gnome.org> | 2001-11-02 04:42:57 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2001-11-02 04:42:57 +0800 |
| commit | b5ec8bf5cfd3c1638dc41f58283909e4571fad97 (patch) | |
| tree | 1ed4539c072c7d92e81861b3b471fa4435813544 /mail | |
| parent | accdc958be3597df9e71f909814883517be2c62e (diff) | |
| download | gsoc2013-evolution-b5ec8bf5cfd3c1638dc41f58283909e4571fad97.tar.gz gsoc2013-evolution-b5ec8bf5cfd3c1638dc41f58283909e4571fad97.tar.zst gsoc2013-evolution-b5ec8bf5cfd3c1638dc41f58283909e4571fad97.zip | |
Write out the url before callind add_url since add_url may free it. Fixes
* 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
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 8 | ||||
| -rw-r--r-- | mail/mail-display.c | 2 | ||||
| -rw-r--r-- | mail/mail-format.c | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 243c6b716f..615312a61f 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -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> * mail-callbacks.c (list_add_addresses): Don't use a diff --git a/mail/mail-display.c b/mail/mail-display.c index 3cf0a405d9..cc42e4bed1 100644 --- a/mail/mail-display.c +++ b/mail/mail-display.c @@ -963,8 +963,6 @@ on_object_requested (GtkHTML *html, GtkHTMLEmbedded *eb, gpointer data) return do_attachment_header (html, eb, part, md); } else if (!strncmp (eb->classid, "signature:", 10)) { 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)) return FALSE; return do_signature (html, eb, part, md); diff --git a/mail/mail-format.c b/mail/mail-format.c index bf983de156..06e63bbdc5 100644 --- a/mail/mail-format.c +++ b/mail/mail-format.c @@ -1786,14 +1786,13 @@ handle_multipart_signed (CamelMimePart *part, const char *mime_type, /* Write out the click-for-info object */ url = g_strdup_printf ("signature:%p/%lu", subpart, (unsigned long)time (NULL)); - printf ("adding %s\n", url); - add_url ("part_urls", url, subpart, md); mail_html_write (md->html, md->stream, "<br><table cellspacing=0 cellpadding=0>" "<tr><td><table width=10 cellspacing=0 cellpadding=0><tr><td></td></tr></table></td>" "<td><object classid=\"%s\"></object></td>" "<td><table width=3 cellspacing=0 cellpadding=0><tr><td></td></tr></table></td>" "<td><font size=-1>", url); + add_url ("part_urls", url, subpart, md); mail_html_write_string (md->html, md->stream, U_("This message is digitally signed. " |