From ef6a3af717132e0750f226fa8a0ee0f3c98e19f0 Mon Sep 17 00:00:00 2001 From: Michael Zucci Date: Mon, 20 Sep 2004 05:59:55 +0000 Subject: Merged notzed-eplugin-2-branch to head. svn path=/trunk/; revision=27300 --- mail/mail-component.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'mail/mail-component.c') diff --git a/mail/mail-component.c b/mail/mail-component.c index 6d2201937a..4ac09c0ce3 100644 --- a/mail/mail-component.c +++ b/mail/mail-component.c @@ -36,6 +36,7 @@ #include #include "em-popup.h" +#include "em-menu.h" #include "em-utils.h" #include "em-composer-utils.h" #include "em-format.h" @@ -75,6 +76,7 @@ #include #include +#include #include #include @@ -319,6 +321,24 @@ mc_startup(MailComponent *mc) mc_setup_local_store(mc); load_accounts(mc, mail_config_get_accounts()); vfolder_load_storage(); + +#ifdef ENABLE_MONO + if (getenv("EVOLUTION_DISABLE_MONO") == NULL) + e_plugin_register_type(e_plugin_mono_get_type()); +#endif + e_plugin_register_type(e_plugin_lib_get_type()); + e_plugin_hook_register_type(em_popup_hook_get_type()); + e_plugin_hook_register_type(em_menu_hook_get_type()); + e_plugin_hook_register_type(em_config_hook_get_type()); + + e_plugin_hook_register_type(em_format_hook_get_type()); + em_format_hook_register_type(em_format_get_type()); + em_format_hook_register_type(em_format_html_get_type()); + em_format_hook_register_type(em_format_html_display_get_type()); + + e_plugin_hook_register_type(em_event_hook_get_type()); + + e_plugin_load_plugins(); } static void @@ -857,7 +877,7 @@ mail_component_init (MailComponent *component) priv->async_event = mail_async_event_new(); priv->store_hash = g_hash_table_new (NULL, NULL); - mail_autoreceive_setup(); + mail_autoreceive_init(); offline = mail_offline_handler_new(); bonobo_object_add_interface((BonoboObject *)component, (BonoboObject *)offline); -- cgit v1.2.3