diff options
| author | Not Zed <NotZed@Ximian.com> | 2004-09-22 09:32:18 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2004-09-22 09:32:18 +0800 |
| commit | c762fa37c35ff135322e0903a51ffd43d0f6856c (patch) | |
| tree | c1a4832683624092e2cfee3788e1889db6caea78 | |
| parent | 1442e29647323dd52b3ab7b966514c3e205c17d4 (diff) | |
| download | gsoc2013-evolution-c762fa37c35ff135322e0903a51ffd43d0f6856c.tar gsoc2013-evolution-c762fa37c35ff135322e0903a51ffd43d0f6856c.tar.gz gsoc2013-evolution-c762fa37c35ff135322e0903a51ffd43d0f6856c.tar.bz2 gsoc2013-evolution-c762fa37c35ff135322e0903a51ffd43d0f6856c.tar.lz gsoc2013-evolution-c762fa37c35ff135322e0903a51ffd43d0f6856c.tar.xz gsoc2013-evolution-c762fa37c35ff135322e0903a51ffd43d0f6856c.tar.zst gsoc2013-evolution-c762fa37c35ff135322e0903a51ffd43d0f6856c.zip | |
** See bug #65058.
2004-09-03 Not Zed <NotZed@Ximian.com>
** See bug #65058.
* em-format-html.c (efh_image): use the content-id rather than
the uri for tracking our image reference. Makes more
sense anyway, its guaranteed unique.
svn path=/trunk/; revision=27328
| -rw-r--r-- | mail/ChangeLog | 8 | ||||
| -rw-r--r-- | mail/em-format-html-display.c | 2 | ||||
| -rw-r--r-- | mail/em-format-html.c | 8 |
3 files changed, 12 insertions, 6 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index c2b24be771..74edc6e7e8 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,11 @@ +2004-09-03 Not Zed <NotZed@Ximian.com> + + ** See bug #65058. + + * em-format-html.c (efh_image): use the content-id rather than + the uri for tracking our image reference. Makes more + sense anyway, its guaranteed unique. + 2004-09-21 David Malcolm <dmalcolm@redhat.com> * em-folder-tree-model.c (em_folder_tree_model_set_selected): Fix diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index e73c4af6f2..58037057a4 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -954,7 +954,7 @@ efhd_write_image(EMFormat *emf, CamelStream *stream, EMFormatPURI *puri) CamelDataWrapper *dw = camel_medium_get_content_object((CamelMedium *)puri->part); /* TODO: identical to efh_write_image */ - d(printf("writing image '%s'\n", puri->uri?puri->uri:puri->cid)); + d(printf("writing image '%s'\n", puri->cid)); camel_data_wrapper_decode_to_stream(dw, stream); camel_stream_close(stream); } diff --git a/mail/em-format-html.c b/mail/em-format-html.c index 6d72ce3f1e..7c362c5f4c 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -1085,7 +1085,7 @@ efh_write_image(EMFormat *emf, CamelStream *stream, EMFormatPURI *puri) { CamelDataWrapper *dw = camel_medium_get_content_object((CamelMedium *)puri->part); - d(printf("writing image '%s'\n", puri->uri?puri->uri:puri->cid)); + d(printf("writing image '%s'\n", puri->cid)); camel_data_wrapper_decode_to_stream(dw, stream); camel_stream_close(stream); } @@ -1094,12 +1094,10 @@ static void efh_image(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part, EMFormatHandler *info) { EMFormatPURI *puri; - const char *location; puri = em_format_add_puri((EMFormat *)efh, sizeof(EMFormatPURI), NULL, part, efh_write_image); - location = puri->uri?puri->uri:puri->cid; - d(printf("adding image '%s'\n", location)); - camel_stream_printf(stream, "<img hspace=10 vspace=10 src=\"%s\">", location); + d(printf("adding image '%s'\n", puri->cid)); + camel_stream_printf(stream, "<img hspace=10 vspace=10 src=\"%s\">", puri->cid); } static EMFormatHandler type_builtin_table[] = { |