diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/em-format-html-display.c | 20 |
2 files changed, 14 insertions, 11 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 2b0d00aa6f..b6674a6b1e 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2004-10-12 Not Zed <NotZed@Ximian.com> + + * em-format-html-display.c (efhd_find_handler): use builtin + handlers (and plugins) always overriding bonobo ones. + 2004-10-11 Not Zed <NotZed@Ximian.com> ** See bug #67408. diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index 6b156daf1d..1e5c895cb8 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -925,19 +925,17 @@ static const EMFormatHandler *efhd_find_handler(EMFormat *emf, const char *mime_ { const EMFormatHandler *handle; - if (efhd_use_component(mime_type)) { - if ((handle = g_hash_table_lookup(efhd_bonobo_handlers, mime_type)) == NULL) { - EMFormatHandler *h = g_malloc0(sizeof(*h)); + if ( (handle = ((EMFormatClass *)efhd_parent)->find_handler(emf, mime_type)) == NULL + && efhd_use_component(mime_type) + && (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; - h->flags = EM_FORMAT_HANDLER_INLINE_DISPOSITION; - g_hash_table_insert(efhd_bonobo_handlers, h->mime_type, h); + h->mime_type = g_strdup(mime_type); + h->handler = efhd_bonobo_unknown; + h->flags = EM_FORMAT_HANDLER_INLINE_DISPOSITION; + g_hash_table_insert(efhd_bonobo_handlers, h->mime_type, h); - handle = h; - } - } else { - handle = ((EMFormatClass *)efhd_parent)->find_handler(emf, mime_type); + handle = h; } return handle; |