Simplify EPlugin loading at startup.

- Require all EPlugin and EPluginHook subtypes be registered before
  loading plugins.  This drastically simplifies the EPlugin/EPluginHook
  negotiation.

- Turn most EPluginHook subtypes into GTypeModules and register their
  types from an e_module_load() function (does not include shell hooks).

- Convert EPluginLib and the Mono and Python bindings to GTypeModules
  and register their types from an e_module_load() function, and kill
  EPluginTypeHook.

9 files changed, 801 insertions, 16 deletions

diff --git a/modules/calendar/Makefile.am b/modules/calendar/Makefile.am
index 8f771167d9..490d42a05e 100644
--- a/modules/calendar/Makefile.am
+++ b/modules/calendar/Makefile.am
@@ -10,6 +10,12 @@ module_LTLIBRARIES =					\
 
 libevolution_module_calendar_la_SOURCES =		\
 	evolution-module-calendar.c			\
+	e-cal-attachment-handler.c			\
+	e-cal-attachment-handler.h			\
+	e-cal-config-hook.c				\
+	e-cal-config-hook.h				\
+	e-cal-event-hook.c				\
+	e-cal-event-hook.h				\
 	e-cal-shell-backend.c				\
 	e-cal-shell-backend.h				\
 	e-cal-shell-content.c				\
@@ -57,9 +63,6 @@ libevolution_module_calendar_la_SOURCES =		\
 	e-task-shell-view-private.c			\
 	e-task-shell-view-private.h
 
-# Removed from all three
-#	$(top_builddir)/a11y/calendar/libevolution-calendar-a11y.la
-
 libevolution_module_calendar_la_LIBADD =		\
 	$(top_builddir)/shell/libeshell.la		\
 	$(top_builddir)/calendar/gui/libevolution-calendar.la	\
diff --git a/modules/calendar/e-cal-attachment-handler.c b/modules/calendar/e-cal-attachment-handler.c
new file mode 100644
index 0000000000..dd95cc5d08
--- /dev/null
+++ b/modules/calendar/e-cal-attachment-handler.c
@@ -0,0 +1,512 @@
+/*
+ * e-cal-attachment-handler.c
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
+#include "e-cal-attachment-handler.h"
+
+#include <glib/gi18n.h>
+#include <libical/ical.h>
+#include <libecal/e-cal.h>
+#include <camel/camel-stream-mem.h>
+#include <libedataserverui/e-source-selector.h>
+
+#include "calendar/common/authentication.h"
+
+#define E_CAL_ATTACHMENT_HANDLER_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), E_TYPE_CAL_ATTACHMENT_HANDLER, ECalAttachmentHandlerPrivate))
+
+typedef struct _ImportContext ImportContext;
+
+struct _ECalAttachmentHandlerPrivate {
+	gint placeholder;
+};
+
+struct _ImportContext {
+	ECal *client;
+	icalcomponent *component;
+	ECalSourceType source_type;
+};
+
+static gpointer parent_class;
+static GType cal_attachment_handler_type;
+
+static const gchar *ui =
+"<ui>"
+"  <popup name='context'>"
+"    <placeholder name='custom-actions'>"
+"      <menuitem action='import-to-calendar'/>"
+"      <menuitem action='import-to-tasks'/>"
+"    </placeholder>"
+"  </popup>"
+"</ui>";
+
+static icalcomponent *
+attachment_handler_get_component (EAttachment *attachment)
+{
+	CamelDataWrapper *wrapper;
+	CamelMimePart *mime_part;
+	CamelStream *stream;
+	GByteArray *buffer;
+	icalcomponent *component;
+	const gchar *key = "__icalcomponent__";
+
+	component = g_object_get_data (G_OBJECT (attachment), key);
+	if (component != NULL)
+		return component;
+
+	mime_part = e_attachment_get_mime_part (attachment);
+	if (!CAMEL_IS_MIME_PART (mime_part))
+		return NULL;
+
+	buffer = g_byte_array_new ();
+	stream = camel_stream_mem_new ();
+	camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (stream), buffer);
+	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
+	camel_data_wrapper_decode_to_stream (wrapper, stream);
+	camel_object_unref (stream);
+
+	component = e_cal_util_parse_ics_string ((gchar *) buffer->data);
+
+	g_byte_array_free (buffer, TRUE);
+
+	if (component == NULL)
+		return NULL;
+
+	g_object_set_data_full (
+		G_OBJECT (attachment), key, component,
+		(GDestroyNotify) icalcomponent_free);
+
+	return component;
+}
+
+static gboolean
+attachment_handler_update_objects (ECal *client,
+                                   icalcomponent *component)
+{
+	icalcomponent_kind kind;
+	icalcomponent *vcalendar;
+	gboolean success;
+
+	kind = icalcomponent_isa (component);
+
+	switch (kind) {
+		case ICAL_VTODO_COMPONENT:
+		case ICAL_VEVENT_COMPONENT:
+			vcalendar = e_cal_util_new_top_level ();
+			if (icalcomponent_get_method (component) == ICAL_METHOD_CANCEL)
+				icalcomponent_set_method (vcalendar, ICAL_METHOD_CANCEL);
+			else
+				icalcomponent_set_method (vcalendar, ICAL_METHOD_PUBLISH);
+			icalcomponent_add_component (
+				vcalendar, icalcomponent_new_clone (component));
+			break;
+
+		case ICAL_VCALENDAR_COMPONENT:
+			vcalendar = icalcomponent_new_clone (component);
+			if (!icalcomponent_get_first_property (vcalendar, ICAL_METHOD_PROPERTY))
+				icalcomponent_set_method (vcalendar, ICAL_METHOD_PUBLISH);
+			break;
+
+		default:
+			return FALSE;
+	}
+
+	success = e_cal_receive_objects (client, vcalendar, NULL);
+
+	icalcomponent_free (vcalendar);
+
+	return success;
+}
+
+static void
+attachment_handler_import_event (ECal *client,
+                                 ECalendarStatus status,
+                                 EAttachment *attachment)
+{
+	icalcomponent *component;
+	icalcomponent *subcomponent;
+	icalcompiter iter;
+
+	/* FIXME Notify the user somehow. */
+	g_return_if_fail (status == E_CALENDAR_STATUS_OK);
+
+	component = attachment_handler_get_component (attachment);
+	g_return_if_fail (component != NULL);
+
+	iter = icalcomponent_begin_component (component, ICAL_ANY_COMPONENT);
+
+	while ((subcomponent = icalcompiter_deref (&iter)) != NULL) {
+		icalcomponent_kind kind;
+
+		kind = icalcomponent_isa (subcomponent);
+		icalcompiter_next (&iter);
+
+		if (kind == ICAL_VEVENT_COMPONENT)
+			continue;
+
+		if (kind == ICAL_VTIMEZONE_COMPONENT)
+			continue;
+
+		icalcomponent_remove_component (component, subcomponent);
+		icalcomponent_free (subcomponent);
+	}
+
+	/* XXX Do something with the return value. */
+	attachment_handler_update_objects (client, component);
+
+	g_object_unref (attachment);
+	g_object_unref (client);
+}
+
+static void
+attachment_handler_import_todo (ECal *client,
+                                ECalendarStatus status,
+                                EAttachment *attachment)
+{
+	icalcomponent *component;
+	icalcomponent *subcomponent;
+	icalcompiter iter;
+
+	/* FIXME Notify the user somehow. */
+	g_return_if_fail (status == E_CALENDAR_STATUS_OK);
+
+	component = attachment_handler_get_component (attachment);
+	g_return_if_fail (component != NULL);
+
+	iter = icalcomponent_begin_component (component, ICAL_ANY_COMPONENT);
+
+	while ((subcomponent = icalcompiter_deref (&iter)) != NULL) {
+		icalcomponent_kind kind;
+
+		kind = icalcomponent_isa (subcomponent);
+		icalcompiter_next (&iter);
+
+		if (kind == ICAL_VTODO_COMPONENT)
+			continue;
+
+		if (kind == ICAL_VTIMEZONE_COMPONENT)
+			continue;
+
+		icalcomponent_remove_component (component, subcomponent);
+		icalcomponent_free (subcomponent);
+	}
+
+	/* XXX Do something with the return value. */
+	attachment_handler_update_objects (client, component);
+
+	g_object_unref (attachment);
+	g_object_unref (client);
+}
+
+static void
+attachment_handler_row_activated_cb (GtkDialog *dialog)
+{
+	gtk_dialog_response (dialog, GTK_RESPONSE_OK);
+}
+
+static void
+attachment_handler_run_dialog (GtkWindow *parent,
+                               EAttachment *attachment,
+                               ECalSourceType source_type,
+                               const gchar *title)
+{
+	GtkWidget *dialog;
+	GtkWidget *container;
+	GtkWidget *widget;
+	GCallback callback;
+	ESourceSelector *selector;
+	ESourceList *source_list;
+	ESource *source;
+	ECal *client;
+	icalcomponent *component;
+	GError *error = NULL;
+
+	component = attachment_handler_get_component (attachment);
+	g_return_if_fail (component != NULL);
+
+	e_cal_get_sources (&source_list, source_type, &error);
+	if (error != NULL) {
+		g_warning ("%s", error->message);
+		g_error_free (error);
+		return;
+	}
+
+	source = e_source_list_peek_source_any (source_list);
+	g_return_if_fail (source != NULL);
+
+	dialog = gtk_dialog_new_with_buttons (
+		title, parent, GTK_DIALOG_DESTROY_WITH_PARENT,
+		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL);
+
+	widget = gtk_button_new_with_mnemonic (_("I_mport"));
+	gtk_button_set_image (
+		GTK_BUTTON (widget), gtk_image_new_from_icon_name (
+		"stock_mail-import", GTK_ICON_SIZE_MENU));
+	gtk_dialog_add_action_widget (
+		GTK_DIALOG (dialog), widget, GTK_RESPONSE_OK);
+	gtk_widget_show (widget);
+
+	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+	gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 400);
+
+	container = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+
+	widget = gtk_scrolled_window_new (NULL, NULL);
+	gtk_scrolled_window_set_policy (
+		GTK_SCROLLED_WINDOW (widget),
+		GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+	gtk_scrolled_window_set_shadow_type (
+		GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN);
+	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
+	gtk_widget_show (widget);
+
+	container = widget;
+
+	widget = e_source_selector_new (source_list);
+	selector = E_SOURCE_SELECTOR (widget);
+	e_source_selector_set_primary_selection (selector, source);
+	e_source_selector_show_selection (selector, FALSE);
+	gtk_container_add (GTK_CONTAINER (container), widget);
+	gtk_widget_show (widget);
+
+	g_signal_connect_swapped (
+		widget, "row-activated",
+		G_CALLBACK (attachment_handler_row_activated_cb), dialog);
+
+	if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_OK)
+		goto exit;
+
+	source = e_source_selector_peek_primary_selection (selector);
+	if (source == NULL)
+		goto exit;
+
+	client = auth_new_cal_from_source (source, source_type);
+	if (client == NULL)
+		goto exit;
+
+	if (source_type == E_CAL_SOURCE_TYPE_EVENT)
+		callback = G_CALLBACK (attachment_handler_import_event);
+	else if (source_type == E_CAL_SOURCE_TYPE_TODO)
+		callback = G_CALLBACK (attachment_handler_import_todo);
+	else
+		goto exit;
+
+	g_object_ref (attachment);
+	g_signal_connect (client, "cal-opened", callback, attachment);
+	e_cal_open_async (client, FALSE);
+
+exit:
+	gtk_widget_destroy (dialog);
+}
+
+static void
+attachment_handler_import_to_calendar (GtkAction *action,
+                                       EAttachmentHandler *handler)
+{
+	EAttachment *attachment;
+	EAttachmentView *view;
+	GList *selected;
+	gpointer parent;
+
+	view = e_attachment_handler_get_view (handler);
+
+	parent = gtk_widget_get_toplevel (GTK_WIDGET (view));
+	parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL;
+
+	selected = e_attachment_view_get_selected_attachments (view);
+	g_return_if_fail (g_list_length (selected) == 1);
+	attachment = E_ATTACHMENT (selected->data);
+
+	attachment_handler_run_dialog (
+		parent, attachment,
+		E_CAL_SOURCE_TYPE_EVENT,
+		_("Select a Calendar"));
+
+	g_object_unref (attachment);
+	g_list_free (selected);
+}
+
+static void
+attachment_handler_import_to_tasks (GtkAction *action,
+                                    EAttachmentHandler *handler)
+{
+	EAttachment *attachment;
+	EAttachmentView *view;
+	GList *selected;
+	gpointer parent;
+
+	view = e_attachment_handler_get_view (handler);
+
+	parent = gtk_widget_get_toplevel (GTK_WIDGET (view));
+	parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL;
+
+	selected = e_attachment_view_get_selected_attachments (view);
+	g_return_if_fail (g_list_length (selected) == 1);
+	attachment = E_ATTACHMENT (selected->data);
+
+	attachment_handler_run_dialog (
+		parent, attachment,
+		E_CAL_SOURCE_TYPE_TODO,
+		_("Select a Task List"));
+
+	g_object_unref (attachment);
+	g_list_free (selected);
+}
+
+static GtkActionEntry standard_entries[] = {
+
+	{ "import-to-calendar",
+	  "stock_mail-import",
+	  N_("I_mport to Calendar"),
+	  NULL,
+	  NULL,  /* XXX Add a tooltip! */
+	  G_CALLBACK (attachment_handler_import_to_calendar) },
+
+	{ "import-to-tasks",
+	  "stock_mail-import",
+	  N_("I_mport to Tasks"),
+	  NULL,
+	  NULL,  /* XXX Add a tooltip! */
+	  G_CALLBACK (attachment_handler_import_to_tasks) }
+};
+
+static void
+cal_attachment_handler_update_actions (EAttachmentView *view)
+{
+	EAttachment *attachment;
+	GtkAction *action;
+	GList *selected;
+	icalcomponent *component;
+	icalcomponent *subcomponent;
+	icalcomponent_kind kind;
+	gboolean is_vevent = FALSE;
+	gboolean is_vtodo = FALSE;
+
+	selected = e_attachment_view_get_selected_attachments (view);
+
+	if (g_list_length (selected) != 1)
+		goto exit;
+
+	attachment = E_ATTACHMENT (selected->data);
+	component = attachment_handler_get_component (attachment);
+
+	if (component == NULL)
+		goto exit;
+
+	subcomponent = icalcomponent_get_inner (component);
+
+	if (subcomponent == NULL)
+		goto exit;
+
+	kind = icalcomponent_isa (subcomponent);
+	is_vevent = (kind == ICAL_VEVENT_COMPONENT);
+	is_vtodo = (kind == ICAL_VTODO_COMPONENT);
+
+exit:
+	action = e_attachment_view_get_action (view, "import-to-calendar");
+	gtk_action_set_visible (action, is_vevent);
+
+	action = e_attachment_view_get_action (view, "import-to-tasks");
+	gtk_action_set_visible (action, is_vtodo);
+
+	g_list_foreach (selected, (GFunc) g_object_unref, NULL);
+	g_list_free (selected);
+}
+
+static void
+cal_attachment_handler_constructed (GObject *object)
+{
+	EAttachmentHandler *handler;
+	EAttachmentView *view;
+	GtkActionGroup *action_group;
+	GtkUIManager *ui_manager;
+	GError *error = NULL;
+
+	handler = E_ATTACHMENT_HANDLER (object);
+
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (parent_class)->constructed (object);
+
+	view = e_attachment_handler_get_view (handler);
+
+	action_group = e_attachment_view_add_action_group (view, "calendar");
+	gtk_action_group_add_actions (
+		action_group, standard_entries,
+		G_N_ELEMENTS (standard_entries), handler);
+
+	ui_manager = e_attachment_view_get_ui_manager (view);
+	gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, &error);
+
+	if (error != NULL) {
+		g_warning ("%s", error->message);
+		g_error_free (error);
+	}
+
+	g_signal_connect (
+		view, "update_actions",
+		G_CALLBACK (cal_attachment_handler_update_actions),
+		NULL);
+}
+
+static void
+cal_attachment_handler_class_init (ECalAttachmentHandlerClass *class)
+{
+	GObjectClass *object_class;
+
+	parent_class = g_type_class_peek_parent (class);
+	g_type_class_add_private (class, sizeof (ECalAttachmentHandlerPrivate));
+
+	object_class = G_OBJECT_CLASS (class);
+	object_class->constructed = cal_attachment_handler_constructed;
+}
+
+static void
+cal_attachment_handler_init (ECalAttachmentHandler *handler)
+{
+	handler->priv = E_CAL_ATTACHMENT_HANDLER_GET_PRIVATE (handler);
+}
+
+GType
+e_cal_attachment_handler_get_type (void)
+{
+	return cal_attachment_handler_type;
+}
+
+void
+e_cal_attachment_handler_register_type (GTypeModule *type_module)
+{
+	static const GTypeInfo type_info = {
+		sizeof (ECalAttachmentHandlerClass),
+		(GBaseInitFunc) NULL,
+		(GBaseFinalizeFunc) NULL,
+		(GClassInitFunc) cal_attachment_handler_class_init,
+		(GClassFinalizeFunc) NULL,
+		NULL,  /* class_data */
+		sizeof (ECalAttachmentHandler),
+		0,     /* n_preallocs */
+		(GInstanceInitFunc) cal_attachment_handler_init,
+		NULL   /* value_table */
+	};
+
+	cal_attachment_handler_type = g_type_module_register_type (
+		type_module, E_TYPE_ATTACHMENT_HANDLER,
+		"ECalAttachmentHandler", &type_info, 0);
+}
diff --git a/modules/calendar/e-cal-attachment-handler.h b/modules/calendar/e-cal-attachment-handler.h
new file mode 100644
index 0000000000..b792fbf765
--- /dev/null
+++ b/modules/calendar/e-cal-attachment-handler.h
@@ -0,0 +1,67 @@
+/*
+ * e-cal-attachment-handler.h
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
+#ifndef E_CAL_ATTACHMENT_HANDLER_H
+#define E_CAL_ATTACHMENT_HANDLER_H
+
+#include <misc/e-attachment-handler.h>
+
+/* Standard GObject macros */
+#define E_TYPE_CAL_ATTACHMENT_HANDLER \
+	(e_cal_attachment_handler_get_type ())
+#define E_CAL_ATTACHMENT_HANDLER(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_CAL_ATTACHMENT_HANDLER, ECalAttachmentHandler))
+#define E_CAL_ATTACHMENT_HANDLER_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_CAL_ATTACHMENT_HANDLER, ECalAttachmentHandlerClass))
+#define E_IS_CAL_ATTACHMENT_HANDLER(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_CAL_ATTACHMENT_HANDLER))
+#define E_IS_CAL_ATTACHMENT_HANDLER_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_CAL_ATTACHMENT_HANDLER))
+#define E_CAL_ATTACHMENT_HANDLER_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_CAL_ATTACHMENT_HANDLER, ECalAttachmentHandlerClass))
+
+G_BEGIN_DECLS
+
+typedef struct _ECalAttachmentHandler ECalAttachmentHandler;
+typedef struct _ECalAttachmentHandlerClass ECalAttachmentHandlerClass;
+typedef struct _ECalAttachmentHandlerPrivate ECalAttachmentHandlerPrivate;
+
+struct _ECalAttachmentHandler {
+	EAttachmentHandler parent;
+	ECalAttachmentHandlerPrivate *priv;
+};
+
+struct _ECalAttachmentHandlerClass {
+	EAttachmentHandlerClass parent_class;
+};
+
+GType		e_cal_attachment_handler_get_type	(void);
+void		e_cal_attachment_handler_register_type
+						(GTypeModule *type_module);
+
+G_END_DECLS
+
+#endif /* E_CAL_ATTACHMENT_HANDLER_H */
diff --git a/modules/calendar/e-cal-config-hook.c b/modules/calendar/e-cal-config-hook.c
new file mode 100644
index 0000000000..4a0522460c
--- /dev/null
+++ b/modules/calendar/e-cal-config-hook.c
@@ -0,0 +1,68 @@
+/*
+ * e-cal-config-hook.c
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
+#include "e-cal-config-hook.h"
+
+#include "e-util/e-config.h"
+#include "calendar/gui/e-cal-config.h"
+
+static const EConfigHookTargetMask no_masks[] = {
+	{ NULL }
+};
+
+static const EConfigHookTargetMap targets[] = {
+	{ "source", EC_CONFIG_TARGET_SOURCE, no_masks },
+	{ "prefs", EC_CONFIG_TARGET_PREFS, no_masks },
+	{ NULL }
+};
+
+static void
+cal_config_hook_class_init (EPluginHookClass *class)
+{
+	gint ii;
+
+	class->id = "org.gnome.evolution.calendar.config:1.0";
+
+	for (ii = 0; targets[ii].type != NULL; ii++)
+		e_config_hook_class_add_target_map (
+			(EConfigHookClass *) class, &targets[ii]);
+}
+
+void
+e_cal_config_hook_register_type (GTypeModule *type_module)
+{
+	const GTypeInfo type_info = {
+		sizeof (EConfigHookClass),
+		(GBaseInitFunc) NULL,
+		(GBaseFinalizeFunc) NULL,
+		(GClassInitFunc) cal_config_hook_class_init,
+		(GClassFinalizeFunc) NULL,
+		NULL,  /* class_data */
+		sizeof (EConfigHook),
+		0,     /* n_preallocs */
+		(GInstanceInitFunc) NULL,
+		NULL   /* value_table */
+	};
+
+	g_type_module_register_type (
+		type_module, e_config_hook_get_type (),
+		"ECalConfigHook", &type_info, 0);
+}
diff --git a/modules/calendar/e-cal-config-hook.h b/modules/calendar/e-cal-config-hook.h
new file mode 100644
index 0000000000..a22ec56bbc
--- /dev/null
+++ b/modules/calendar/e-cal-config-hook.h
@@ -0,0 +1,33 @@
+/*
+ * e-cal-config-hook.h
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
+#ifndef E_CAL_CONFIG_HOOK_H
+#define E_CAL_CONFIG_HOOK_H
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+void e_cal_config_hook_register_type (GTypeModule *type_module);
+
+G_END_DECLS
+
+#endif /* E_CAL_CONFIG_HOOK_H */
diff --git a/modules/calendar/e-cal-event-hook.c b/modules/calendar/e-cal-event-hook.c
new file mode 100644
index 0000000000..b263727107
--- /dev/null
+++ b/modules/calendar/e-cal-event-hook.c
@@ -0,0 +1,72 @@
+/*
+ * e-cal-event-hook.c
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
+#include "e-cal-event-hook.h"
+
+#include "e-util/e-event.h"
+#include "calendar/gui/e-cal-event.h"
+
+static const EEventHookTargetMask masks[] = {
+	{ "migration", E_CAL_EVENT_MODULE_MIGRATION },
+	{ NULL }
+};
+
+static const EEventHookTargetMap targets[] = {
+	{ "module", E_CAL_EVENT_TARGET_BACKEND, masks },
+	{ NULL }
+};
+
+static void
+cal_event_hook_class_init (EPluginHookClass *class)
+{
+	EEventHookClass *event_hook_class;
+	gint ii;
+
+	event_hook_class = (EEventHookClass *) class;
+	event_hook_class->event = (EEvent *) e_cal_event_peek ();
+
+	class->id = "org.gnome.evolution.calendar.events:1.0";
+
+	for (ii = 0; targets[ii].type != NULL; ii++)
+		e_event_hook_class_add_target_map (
+			(EEventHookClass *) class, &targets[ii]);
+}
+
+void
+e_cal_event_hook_register_type (GTypeModule *type_module)
+{
+	const GTypeInfo type_info = {
+		sizeof (EEventHookClass),
+		(GBaseInitFunc) NULL,
+		(GBaseFinalizeFunc) NULL,
+		(GClassInitFunc) cal_event_hook_class_init,
+		(GClassFinalizeFunc) NULL,
+		NULL,  /* class_data */
+		sizeof (EEventHook),
+		0,     /* n_preallocs */
+		(GInstanceInitFunc) NULL,
+		NULL   /* value_table */
+	};
+
+	g_type_module_register_type (
+		type_module, e_event_hook_get_type (),
+		"ECalEventHook", &type_info, 0);
+}
diff --git a/modules/calendar/e-cal-event-hook.h b/modules/calendar/e-cal-event-hook.h
new file mode 100644
index 0000000000..9dde31f900
--- /dev/null
+++ b/modules/calendar/e-cal-event-hook.h
@@ -0,0 +1,33 @@
+/*
+ * e-cal-event-hook.h
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
+#ifndef E_CAL_EVENT_HOOK_H
+#define E_CAL_EVENT_HOOK_H
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+void e_cal_event_hook_register_type (GTypeModule *type_module);
+
+G_END_DECLS
+
+#endif /* E_CAL_EVENT_HOOK_H */
diff --git a/modules/calendar/e-cal-shell-backend.c b/modules/calendar/e-cal-shell-backend.c
index 6d9c74411b..5149574323 100644
--- a/modules/calendar/e-cal-shell-backend.c
+++ b/modules/calendar/e-cal-shell-backend.c
@@ -38,9 +38,6 @@
 #include "calendar/common/authentication.h"
 #include "calendar/gui/calendar-config.h"
 #include "calendar/gui/comp-util.h"
-#include "calendar/gui/e-attachment-handler-calendar.h"
-#include "calendar/gui/e-cal-config.h"
-#include "calendar/gui/e-cal-event.h"
 #include "calendar/gui/dialogs/cal-prefs-dialog.h"
 #include "calendar/gui/dialogs/calendar-setup.h"
 #include "calendar/gui/dialogs/event-editor.h"
@@ -509,13 +506,6 @@ static GtkActionEntry source_entries[] = {
 };
 
 static void
-cal_shell_backend_init_hooks (void)
-{
-	e_plugin_hook_register_type (e_cal_config_hook_get_type ());
-	e_plugin_hook_register_type (e_cal_event_hook_get_type ());
-}
-
-static void
 cal_shell_backend_init_importers (void)
 {
 	EImportClass *import_class;
@@ -778,15 +768,12 @@ cal_shell_backend_constructed (GObject *object)
 		G_CALLBACK (cal_shell_backend_window_created_cb),
 		shell_backend);
 
-	cal_shell_backend_init_hooks ();
 	cal_shell_backend_init_importers ();
 
 	/* Initialize settings before initializing preferences,
 	 * since the preferences bind to the shell settings. */
 	e_cal_shell_backend_init_settings (shell);
 	cal_shell_backend_init_preferences (shell);
-
-	e_attachment_handler_calendar_get_type ();
 }
 
 static void
diff --git a/modules/calendar/evolution-module-calendar.c b/modules/calendar/evolution-module-calendar.c
index 63bf98ead9..f72e8a97e4 100644
--- a/modules/calendar/evolution-module-calendar.c
+++ b/modules/calendar/evolution-module-calendar.c
@@ -19,6 +19,11 @@
  *
  */
 
+#include "e-cal-attachment-handler.h"
+
+#include "e-cal-config-hook.h"
+#include "e-cal-event-hook.h"
+
 #include "e-cal-shell-backend.h"
 #include "e-cal-shell-content.h"
 #include "e-cal-shell-sidebar.h"
@@ -43,6 +48,11 @@ e_module_load (GTypeModule *type_module)
 {
 	/* Register dynamically loaded types. */
 
+	e_cal_attachment_handler_register_type (type_module);
+
+	e_cal_config_hook_register_type (type_module);
+	e_cal_event_hook_register_type (type_module);
+
 	e_cal_shell_backend_register_type (type_module);
 	e_cal_shell_content_register_type (type_module);
 	e_cal_shell_sidebar_register_type (type_module);