aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2004-10-12 14:47:08 +0800
committerMichael Zucci <zucchi@src.gnome.org>2004-10-12 14:47:08 +0800
commita7ba5c21d168b35e2a950d82b90c141dd16ca3ba (patch)
treec26f66696384ce2c99d1292e2171a6963adc6de6 /mail
parent3263d05e9cce60ec5e31e82881f180ced908eb39 (diff)
downloadgsoc2013-evolution-a7ba5c21d168b35e2a950d82b90c141dd16ca3ba.tar
gsoc2013-evolution-a7ba5c21d168b35e2a950d82b90c141dd16ca3ba.tar.gz
gsoc2013-evolution-a7ba5c21d168b35e2a950d82b90c141dd16ca3ba.tar.bz2
gsoc2013-evolution-a7ba5c21d168b35e2a950d82b90c141dd16ca3ba.tar.lz
gsoc2013-evolution-a7ba5c21d168b35e2a950d82b90c141dd16ca3ba.tar.xz
gsoc2013-evolution-a7ba5c21d168b35e2a950d82b90c141dd16ca3ba.tar.zst
gsoc2013-evolution-a7ba5c21d168b35e2a950d82b90c141dd16ca3ba.zip
use builtin handlers (and plugins) always overriding bonobo ones.
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. svn path=/trunk/; revision=27549
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/em-format-html-display.c20
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;