diff options
| author | Not Zed <NotZed@Ximian.com> | 2004-01-21 10:50:08 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2004-01-21 10:50:08 +0800 |
| commit | a8705a44c50e1303157b769c59d8a86d3b008839 (patch) | |
| tree | f6df7dcd2c6fca41f5717b8d242dbbc6e1221566 /mail/em-format-html-display.c | |
| parent | b476b5573e56fb9da9bc7730d920f18b5a771ab1 (diff) | |
| download | gsoc2013-evolution-a8705a44c50e1303157b769c59d8a86d3b008839.tar gsoc2013-evolution-a8705a44c50e1303157b769c59d8a86d3b008839.tar.gz gsoc2013-evolution-a8705a44c50e1303157b769c59d8a86d3b008839.tar.bz2 gsoc2013-evolution-a8705a44c50e1303157b769c59d8a86d3b008839.tar.lz gsoc2013-evolution-a8705a44c50e1303157b769c59d8a86d3b008839.tar.xz gsoc2013-evolution-a8705a44c50e1303157b769c59d8a86d3b008839.tar.zst gsoc2013-evolution-a8705a44c50e1303157b769c59d8a86d3b008839.zip | |
** See bug #53159.
2004-01-21 Not Zed <NotZed@Ximian.com>
** See bug #53159.
* em-format.c (emf_message_rfc822): removed incorrect comment,
this is not a fallback.
* em-format-html.c (efh_text_plain): check the content-type of the
containee object, not the holder.
** See bug #52979.
* em-format-html.c: take out text/x-patch and put in text/* for a
text/plain fallback handler instead.
* em-format-html-display.c (efhd_find_handler): allow the bonobo
handlers to override the builtin ones.
svn path=/trunk/; revision=24341
Diffstat (limited to 'mail/em-format-html-display.c')
| -rw-r--r-- | mail/em-format-html-display.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index 4f98729ab5..d904bf33a6 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -994,17 +994,18 @@ static const EMFormatHandler *efhd_find_handler(EMFormat *emf, const char *mime_ { const EMFormatHandler *handle; - handle = ((EMFormatClass *)efhd_parent)->find_handler(emf, mime_type); - if (handle == NULL - && efhd_use_component(mime_type) - && (handle = g_hash_table_lookup(efhd_bonobo_handlers, mime_type)) == NULL) { - EMFormatHandler *h = g_malloc0(sizeof(*h)); + if (efhd_use_component(mime_type)) { + if ((handle = g_hash_table_lookup(efhd_bonobo_handlers, mime_type)) == NULL) { + EMFormatHandler *h = g_malloc0(sizeof(*h)); - h->mime_type = g_strdup(mime_type); - h->handler = efhd_bonobo_unknown; - g_hash_table_insert(efhd_bonobo_handlers, h->mime_type, h); + h->mime_type = g_strdup(mime_type); + h->handler = efhd_bonobo_unknown; + g_hash_table_insert(efhd_bonobo_handlers, h->mime_type, h); - handle = h; + handle = h; + } + } else { + handle = ((EMFormatClass *)efhd_parent)->find_handler(emf, mime_type); } return handle; |