Lookup the handler for the type. If we don't have a registered handler or

2003-03-17  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-display.c (do_external_viewer): Lookup the handler for the
	type. If we don't have a registered handler or if the registered
	handler is not meant to be handled via a bonobo component, don't
	use a bonobo component.

	* mail-format.c (mail_lookup_handler): If we register a new
	handler that is to be handled by a bonobo component, set
	handler->is_bonobo to TRUE.

svn path=/trunk/; revision=20311

1 files changed, 5 insertions, 0 deletions

diff --git a/mail/mail-format.c b/mail/mail-format.c
index 67a4604b2c..9d4423c1af 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -419,6 +419,7 @@ mail_lookup_handler (const char *mime_type)
 	
 	if (handler->builtin) {
 		handler->generic = FALSE;
+		handler->is_bonobo = FALSE;
 		goto reg;
 	}
 	
@@ -429,6 +430,7 @@ mail_lookup_handler (const char *mime_type)
 	for (iter = components; iter; iter = iter->next) {
 		if (component_supports (iter->data, mime_type)) {
 			handler->generic = FALSE;
+			handler->is_bonobo = TRUE;
 			handler->builtin = handle_via_bonobo;
 			handler->component = Bonobo_ServerInfo_duplicate (iter->data);
 			gnome_vfs_mime_component_list_free (components);
@@ -451,6 +453,7 @@ mail_lookup_handler (const char *mime_type)
 	
 	if (handler->builtin) {
 		handler->generic = TRUE;
+		handler->is_bonobo = FALSE;
 		if (handler->component) {
 			CORBA_free (handler->component);
 			handler->component = NULL;
@@ -461,6 +464,7 @@ mail_lookup_handler (const char *mime_type)
 	/* Try for a generic component match. */
 	if (handler->component) {
 		handler->generic = TRUE;
+		handler->is_bonobo = TRUE;
 		handler->builtin = handle_via_bonobo;
 		goto reg;
 	}
@@ -468,6 +472,7 @@ mail_lookup_handler (const char *mime_type)
 	/* If we at least got an application, use that. */
 	if (handler->applications) {
 		handler->generic = TRUE;
+		handler->is_bonobo = FALSE;
 		goto reg;
 	}