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

** See bug #65058.

Browse Source 
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
This commit is contained in:
Not Zed
2004-09-22 01:32:18 +00:00
committed by Michael Zucci
parent 1442e29647
commit c762fa37c3
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mail/ChangeLog
View File

@ -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

2
mail/em-format-html-display.c
View File

@ -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);
}

8
mail/em-format-html.c
View File

@ -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[] = {