diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 8 | ||||
| -rw-r--r-- | mail/mail-component-factory.c | 23 | ||||
| -rw-r--r-- | mail/mail-component.c | 13 |
3 files changed, 29 insertions, 15 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 1f6677f89d..e2ef6e9d7b 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,11 @@ +2004-12-08 Not Zed <NotZed@Ximian.com> + + * mail-component-factory.c (make_factory): and put them here + instead so they're available even when the mailer isn't activated + yet. + + * mail-component.c (mc_startup): remove plugin hook registrations. + 2004-11-22 Not Zed <NotZed@Ximian.com> * em-account-editor.c (emae_receive_options_extra_item): dont diff --git a/mail/mail-component-factory.c b/mail/mail-component-factory.c index 435c0339c5..f0fafe58e1 100644 --- a/mail/mail-component-factory.c +++ b/mail/mail-component-factory.c @@ -35,6 +35,13 @@ #include "mail-config.h" #include "mail-mt.h" +#include "em-popup.h" +#include "em-menu.h" +#include "em-event.h" +#include "em-config.h" +#include "em-format-hook.h" +#include "em-format-html-display.h" + #include "importers/mail-importer.h" #include <bonobo-activation/bonobo-activation.h> @@ -81,9 +88,21 @@ make_factory (PortableServer_POA poa, const char *iid, gpointer impl_ptr, CORBA_ static int init = 0; if (!init) { - mail_config_init (); - mail_msg_init (); init = 1; + + mail_config_init(); + mail_msg_init(); + + 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()); + + 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_format_hook_get_type()); + + e_plugin_hook_register_type(em_event_hook_get_type()); } return bonobo_shlib_factory_std (FACTORY_ID, poa, impl_ptr, factory, NULL, ev); diff --git a/mail/mail-component.c b/mail/mail-component.c index fe52f409df..d56bafc637 100644 --- a/mail/mail-component.c +++ b/mail/mail-component.c @@ -35,8 +35,6 @@ #include <fcntl.h> #include <errno.h> -#include "em-popup.h" -#include "em-menu.h" #include "em-utils.h" #include "em-composer-utils.h" #include "em-format.h" @@ -342,17 +340,6 @@ mc_startup(MailComponent *mc) mc_setup_local_store(mc); load_accounts(mc, mail_config_get_accounts()); vfolder_load_storage(); - - 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()); - - 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_format_hook_get_type()); - - e_plugin_hook_register_type(em_event_hook_get_type()); } static void |