Fixes #56504

2004-04-21  JP Rosevear  <jpr@ximian.com>

	Fixes #56504

	* gui/gnome-cal.c (gnome_calendar_destroy): no need to destroy the
	creatable item handler
	(gnome_calendar_set_ui_component): don't do the creatable
	item stuff here

	* gui/e-tasks.c (e_tasks_set_ui_component): don't do the creatable
	item stuff here
	(e_tasks_destroy): no need to destroy creatable item handler

	* gui/e-calendar-table.c (e_calendar_table_set_status_message):
	comment out temporarily

	* gui/e-calendar-view.c (e_calendar_view_set_status_message): ditto

	* gui/calendar-component.c: switch to using per component view
	information; don't listen for config changes to the primary
	selection and selection so that different windows can have
	different calendar selections; use a local creatable items handler
	so that the new button is associated with the right window when
	setting the default times

	* gui/tasks-component.c: ditto

svn path=/trunk/; revision=25566

7 files changed, 883 insertions, 678 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index fe432ef39d..faaf240722 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,30 @@
+2004-04-21  JP Rosevear  <jpr@ximian.com>
+
+	Fixes #56504
+	
+	* gui/gnome-cal.c (gnome_calendar_destroy): no need to destroy the
+	creatable item handler
+	(gnome_calendar_set_ui_component): don't do the creatable
+	item stuff here
+
+	* gui/e-tasks.c (e_tasks_set_ui_component): don't do the creatable
+	item stuff here
+	(e_tasks_destroy): no need to destroy creatable item handler
+
+	* gui/e-calendar-table.c (e_calendar_table_set_status_message):
+	comment out temporarily
+
+	* gui/e-calendar-view.c (e_calendar_view_set_status_message): ditto
+	
+	* gui/calendar-component.c: switch to using per component view
+	information; don't listen for config changes to the primary
+	selection and selection so that different windows can have
+	different calendar selections; use a local creatable items handler
+	so that the new button is associated with the right window when
+	setting the default times
+
+	* gui/tasks-component.c: ditto
+	
 2004-04-21  JP Rosevear <jpr@ximian.com>
 
 	* gui/e-tasks.c (set_timezone): only set the preview zone if the
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 930a80049e..7e04ac4a95 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -31,6 +31,7 @@
 #include <bonobo/bonobo-i18n.h>
 #include <bonobo/bonobo-exception.h>
 #include <libical/icalvcal.h>
+#include <shell/e-user-creatable-items-handler.h>
 #include "e-pub-utils.h"
 #include "e-calendar-view.h"
 #include "calendar-config-keys.h"
@@ -71,6 +72,28 @@ static gint num_drag_types = sizeof(drag_types) / sizeof(drag_types[0]);
 #define PARENT_TYPE bonobo_object_get_type ()
 static BonoboObjectClass *parent_class = NULL;
 
+typedef struct 
+{
+	ESourceList *source_list;
+	ESourceList *task_source_list;
+	
+	GSList *source_selection;
+	GSList *task_source_selection;
+	
+	GnomeCalendar *calendar;
+	GtkWidget *source_selector;
+
+	BonoboControl *view_control;
+	BonoboControl *sidebar_control;
+	BonoboControl *statusbar_control;
+
+	GList *notifications;
+
+	EUserCreatableItemsHandler *creatable_items_handler;
+
+	EActivityHandler *activity_handler;
+} CalendarComponentView;
+
 struct _CalendarComponentPrivate {
 	char *base_directory;
 	char *config_directory;
@@ -79,21 +102,13 @@ struct _CalendarComponentPrivate {
 	int gconf_notify_id;
 
 	ESourceList *source_list;
-	GSList *source_selection;
-
 	ESourceList *task_source_list;
-	GSList *task_source_selection;
-	
-	GnomeCalendar *calendar;
-	GtkWidget *source_selector;
 
-	BonoboControl *view_control;
+	GList *views;
 
 	ECal *create_ecal;
 
 	GList *notifications;
-
-	EActivityHandler *activity_handler;
 };
 
 /* FIXME This should be gnome cal likely */
@@ -132,31 +147,28 @@ is_in_uids (GSList *uids, ESource *source)
 }
 
 static void
-update_uris_for_selection (CalendarComponent *calendar_component)
+update_uris_for_selection (CalendarComponentView *component_view)
 {
-	CalendarComponentPrivate *priv;
 	GSList *selection, *l, *uids_selected = NULL;
 	
-	priv = calendar_component->priv;
-	
-	selection = e_source_selector_get_selection (E_SOURCE_SELECTOR (priv->source_selector));
+	selection = e_source_selector_get_selection (E_SOURCE_SELECTOR (component_view->source_selector));
 
-	for (l = priv->source_selection; l; l = l->next) {
+	for (l = component_view->source_selection; l; l = l->next) {
 		ESource *old_selected_source = l->data;
 
 		if (!is_in_selection (selection, old_selected_source))
-			gnome_calendar_remove_source (priv->calendar, E_CAL_SOURCE_TYPE_EVENT, old_selected_source);
+			gnome_calendar_remove_source (component_view->calendar, E_CAL_SOURCE_TYPE_EVENT, old_selected_source);
 	}
 
 	for (l = selection; l; l = l->next) {
 		ESource *selected_source = l->data;
 		
-		if (gnome_calendar_add_source (priv->calendar, E_CAL_SOURCE_TYPE_EVENT, selected_source))
+		if (gnome_calendar_add_source (component_view->calendar, E_CAL_SOURCE_TYPE_EVENT, selected_source))
 			uids_selected = g_slist_append (uids_selected, (char *) e_source_peek_uid (selected_source));
 	}
 	
-	e_source_selector_free_selection (priv->source_selection);
-	priv->source_selection = selection;
+	e_source_selector_free_selection (component_view->source_selection);
+	component_view->source_selection = selection;
 
 	/* Save the selection for next time we start up */
 	calendar_config_set_calendars_selected (uids_selected);
@@ -164,46 +176,40 @@ update_uris_for_selection (CalendarComponent *calendar_component)
 }
 
 static void
-update_uri_for_primary_selection (CalendarComponent *calendar_component)
+update_uri_for_primary_selection (CalendarComponentView *component_view)
 {
-	CalendarComponentPrivate *priv;
 	ESource *source;
 
-	priv = calendar_component->priv;
-
-	source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (priv->source_selector));
+	source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector));
 	if (!source)
 		return;
 
 	/* Set the default */
-	gnome_calendar_set_default_source (priv->calendar, E_CAL_SOURCE_TYPE_EVENT, source);
+	gnome_calendar_set_default_source (component_view->calendar, E_CAL_SOURCE_TYPE_EVENT, source);
 
 	/* Make sure we are embedded first */
-	calendar_control_sensitize_calendar_commands (priv->view_control, priv->calendar, TRUE);
+	calendar_control_sensitize_calendar_commands (component_view->view_control, component_view->calendar, TRUE);
 
 	/* Save the selection for next time we start up */
 	calendar_config_set_primary_calendar (e_source_peek_uid (source));
 }
 
 static void
-update_selection (CalendarComponent *calendar_component)
+update_selection (CalendarComponentView *component_view)
 {
-	CalendarComponentPrivate *priv;
 	GSList *selection, *uids_selected, *l;
 
-	priv = calendar_component->priv;
-
 	/* Get the selection in gconf */
 	uids_selected = calendar_config_get_calendars_selected ();
 
 	/* Remove any that aren't there any more */
-	selection = e_source_selector_get_selection (E_SOURCE_SELECTOR (priv->source_selector));
+	selection = e_source_selector_get_selection (E_SOURCE_SELECTOR (component_view->source_selector));
 
 	for (l = selection; l; l = l->next) {
 		ESource *source = l->data;
 
 		if (!is_in_uids (uids_selected, source)) 
-			e_source_selector_unselect_source (E_SOURCE_SELECTOR (priv->source_selector), source);
+			e_source_selector_unselect_source (E_SOURCE_SELECTOR (component_view->source_selector), source);
 	}
 	
 	e_source_selector_free_selection (selection);
@@ -213,9 +219,9 @@ update_selection (CalendarComponent *calendar_component)
 		char *uid = l->data;
 		ESource *source;
 
-		source = e_source_list_peek_source_by_uid (priv->source_list, uid);
+		source = e_source_list_peek_source_by_uid (component_view->source_list, uid);
 		if (source) 
-			e_source_selector_select_source (E_SOURCE_SELECTOR (priv->source_selector), source);
+			e_source_selector_select_source (E_SOURCE_SELECTOR (component_view->source_selector), source);
 		
 		g_free (uid);
 	}
@@ -223,86 +229,78 @@ update_selection (CalendarComponent *calendar_component)
 }
 
 static void
-update_task_selection (CalendarComponent *calendar_component)
+update_task_selection (CalendarComponentView *component_view)
 {
-	CalendarComponentPrivate *priv;
 	GSList *uids_selected, *l;
 
-	priv = calendar_component->priv;
-
 	/* Get the selection in gconf */
 	uids_selected = calendar_config_get_tasks_selected ();
 
 	/* Remove any that aren't there any more */
-	for (l = priv->task_source_selection; l; l = l->next) {
+	for (l = component_view->task_source_selection; l; l = l->next) {
 		char *uid = l->data;
 		ESource *source;
 
-		source = e_source_list_peek_source_by_uid (priv->task_source_list, uid);
+		source = e_source_list_peek_source_by_uid (component_view->task_source_list, uid);
 		if (!source)
-			gnome_calendar_remove_source_by_uid (priv->calendar, E_CAL_SOURCE_TYPE_TODO, uid);
+			gnome_calendar_remove_source_by_uid (component_view->calendar, E_CAL_SOURCE_TYPE_TODO, uid);
 		else if (!is_in_uids (uids_selected, source))
-			gnome_calendar_remove_source (priv->calendar, E_CAL_SOURCE_TYPE_TODO, source);
+			gnome_calendar_remove_source (component_view->calendar, E_CAL_SOURCE_TYPE_TODO, source);
 		
 		g_free (uid);
 	}
-	g_slist_free (priv->task_source_selection);
+	g_slist_free (component_view->task_source_selection);
 
 	/* Make sure the whole selection is there */
 	for (l = uids_selected; l; l = l->next) {
 		char *uid = l->data;
 		ESource *source;
 
-		source = e_source_list_peek_source_by_uid (priv->task_source_list, uid);
-		if (!gnome_calendar_add_source (priv->calendar, E_CAL_SOURCE_TYPE_TODO, source))
+		source = e_source_list_peek_source_by_uid (component_view->task_source_list, uid);
+		if (!gnome_calendar_add_source (component_view->calendar, E_CAL_SOURCE_TYPE_TODO, source))
 			/* FIXME do something */;
 	}
 
-	priv->task_source_selection = uids_selected;
+	component_view->task_source_selection = uids_selected;
 }
 
 static void
-update_primary_selection (CalendarComponent *calendar_component)
+update_primary_selection (CalendarComponentView *component_view)
 {
-	CalendarComponentPrivate *priv;
 	ESource *source = NULL;
 	char *uid;
 
-	priv = calendar_component->priv;
-
 	uid = calendar_config_get_primary_calendar ();
 	if (uid) {
-		source = e_source_list_peek_source_by_uid (priv->source_list, uid);
+		source = e_source_list_peek_source_by_uid (component_view->source_list, uid);
 		g_free (uid);
 	}
 	
 	if (source) {
-		e_source_selector_set_primary_selection (E_SOURCE_SELECTOR (priv->source_selector), source);
+		e_source_selector_set_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector), source);
 	} else {
 		/* Try to create a default if there isn't one */
-		source = e_source_list_peek_source_any (priv->source_list);
+		source = e_source_list_peek_source_any (component_view->source_list);
 		if (source)
-			e_source_selector_set_primary_selection (E_SOURCE_SELECTOR (priv->source_selector), source);
+			e_source_selector_set_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector), source);
 	}
 }
 
 static void
-update_primary_task_selection (CalendarComponent *calendar_component)
+update_primary_task_selection (CalendarComponentView *component_view)
 {
-	CalendarComponentPrivate *priv;
 	ESource *source = NULL;
 	char *uid;
 
-	priv = calendar_component->priv;
-
 	uid = calendar_config_get_primary_tasks ();
 	if (uid) {
-		source = e_source_list_peek_source_by_uid (priv->task_source_list, uid);
+		source = e_source_list_peek_source_by_uid (component_view->source_list, uid);
+
 		g_free (uid);
 	}
 	
 	if (source)
-		gnome_calendar_set_default_source (priv->calendar, E_CAL_SOURCE_TYPE_TODO, source);
+		gnome_calendar_set_default_source (component_view->calendar, E_CAL_SOURCE_TYPE_TODO, source);
 }
 
 /* Callbacks.  */
@@ -339,14 +337,11 @@ add_popup_menu_item (GtkMenu *menu, const char *label, const char *icon_name,
 }
 
 static void
-copy_calendar_cb (GtkWidget *widget, CalendarComponent *comp)
+copy_calendar_cb (GtkWidget *widget, CalendarComponentView *component_view)
 {
 	ESource *selected_source;
-	CalendarComponentPrivate *priv;
-
-	priv = comp->priv;
 	
-	selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (priv->source_selector));
+	selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector));
 	if (!selected_source)
 		return;
 
@@ -354,15 +349,12 @@ copy_calendar_cb (GtkWidget *widget, CalendarComponent *comp)
 }
 
 static void
-delete_calendar_cb (GtkWidget *widget, CalendarComponent *comp)
+delete_calendar_cb (GtkWidget *widget, CalendarComponentView *component_view)
 {
 	ESource *selected_source;
-	CalendarComponentPrivate *priv;
 	GtkWidget *dialog;
 
-	priv = comp->priv;
-	
-	selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (priv->source_selector));
+	selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector));
 	if (!selected_source)
 		return;
 
@@ -380,21 +372,21 @@ delete_calendar_cb (GtkWidget *widget, CalendarComponent *comp)
 
 		/* first, ask the backend to remove the calendar */
 		uri = e_source_get_uri (selected_source);
-		cal = e_cal_model_get_client_for_uri (gnome_calendar_get_calendar_model (priv->calendar), uri);
+		cal = e_cal_model_get_client_for_uri (gnome_calendar_get_calendar_model (component_view->calendar), uri);
 		if (!cal)
 			cal = e_cal_new_from_uri (uri, E_CAL_SOURCE_TYPE_EVENT);
 		g_free (uri);
 		if (cal) {
 			if (e_cal_remove (cal, NULL)) {
-				if (e_source_selector_source_is_selected (E_SOURCE_SELECTOR (priv->source_selector),
+				if (e_source_selector_source_is_selected (E_SOURCE_SELECTOR (component_view->source_selector),
 									  selected_source)) {
-					gnome_calendar_remove_source (priv->calendar, E_CAL_SOURCE_TYPE_EVENT, selected_source);
-					e_source_selector_unselect_source (E_SOURCE_SELECTOR (priv->source_selector),
+					gnome_calendar_remove_source (component_view->calendar, E_CAL_SOURCE_TYPE_EVENT, selected_source);
+					e_source_selector_unselect_source (E_SOURCE_SELECTOR (component_view->source_selector),
 									   selected_source);
 				}
 		
 				e_source_group_remove_source (e_source_peek_group (selected_source), selected_source);
-				e_source_list_sync (priv->source_list, NULL);
+				e_source_list_sync (component_view->source_list, NULL);
 			}
 		}
 	}
@@ -403,20 +395,17 @@ delete_calendar_cb (GtkWidget *widget, CalendarComponent *comp)
 }
 
 static void
-new_calendar_cb (GtkWidget *widget, CalendarComponent *comp)
+new_calendar_cb (GtkWidget *widget, CalendarComponentView *component_view)
 {
 	calendar_setup_new_calendar (GTK_WINDOW (gtk_widget_get_toplevel (widget)));
 }
 
 static void
-edit_calendar_cb (GtkWidget *widget, CalendarComponent *comp)
+edit_calendar_cb (GtkWidget *widget, CalendarComponentView *component_view)
 {
-	CalendarComponentPrivate *priv;
 	ESource *selected_source;
 
-	priv = comp->priv;
-	
-	selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (priv->source_selector));
+	selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector));
 	if (!selected_source)
 		return;
 
@@ -424,53 +413,43 @@ edit_calendar_cb (GtkWidget *widget, CalendarComponent *comp)
 }
 
 static void
-fill_popup_menu_cb (ESourceSelector *selector, GtkMenu *menu, CalendarComponent *comp)
+fill_popup_menu_cb (ESourceSelector *selector, GtkMenu *menu, CalendarComponentView *component_view)
 {
 	gboolean sensitive;
 
-	sensitive = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (comp->priv->source_selector)) ?
+	sensitive = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector)) ?
 		TRUE : FALSE;
 
 	add_popup_menu_item (menu, _("New Calendar"), "stock_calendar",
-			     G_CALLBACK (new_calendar_cb), comp, TRUE);
+			     G_CALLBACK (new_calendar_cb), component_view, TRUE);
 	add_popup_menu_item (menu, _("Copy"), "stock_folder-copy",
-			     G_CALLBACK (copy_calendar_cb), comp, sensitive);
-	add_popup_menu_item (menu, _("Delete"), "stock_delete", G_CALLBACK (delete_calendar_cb), comp, sensitive);
-	add_popup_menu_item (menu, _("Properties..."), NULL, G_CALLBACK (edit_calendar_cb), comp, sensitive);
+			     G_CALLBACK (copy_calendar_cb), component_view, sensitive);
+	add_popup_menu_item (menu, _("Delete"), "stock_delete", G_CALLBACK (delete_calendar_cb), component_view, sensitive); 
+	add_popup_menu_item (menu, _("Properties..."), NULL, G_CALLBACK (edit_calendar_cb), component_view, sensitive);
 }
 
 static void
-source_selection_changed_cb (ESourceSelector *selector, 
-			     CalendarComponent *calendar_component)
+source_selection_changed_cb (ESourceSelector *selector, CalendarComponentView *component_view)
 {
-	update_uris_for_selection (calendar_component);
-}
-
-static void
-primary_source_selection_changed_cb (ESourceSelector *selector,
-				     CalendarComponent *calendar_component)
-{
-	CalendarComponentPrivate *priv = calendar_component->priv;
-
-	if (priv->create_ecal) {
-		g_object_unref (priv->create_ecal);
-		priv->create_ecal = NULL;
-	}
-
-	update_uri_for_primary_selection (calendar_component);
+	update_uris_for_selection (component_view);
 }
 
 static void
-config_selection_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
+primary_source_selection_changed_cb (ESourceSelector *selector, CalendarComponentView *component_view)
 {
-	update_selection (data);
+	update_uri_for_primary_selection (component_view);
 }
 
-
 static void
 config_primary_selection_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
 {
-	update_primary_selection (data);
+	CalendarComponent *calendar_component = data;
+	CalendarComponentPrivate *priv = calendar_component->priv;
+	
+	if (priv->create_ecal) {
+		g_object_unref (priv->create_ecal);
+		priv->create_ecal = NULL;
+	}
 }
 
 static void
@@ -505,58 +484,6 @@ conf_changed_callback (GConfClient *client,
 	e_pub_publish (TRUE);
 }
 
-/* GObject methods.  */
-
-static void
-impl_dispose (GObject *object)
-{
-	CalendarComponentPrivate *priv = CALENDAR_COMPONENT (object)->priv;
-	GList *l;
-	
-	if (priv->source_list != NULL) {
-		g_object_unref (priv->source_list);
-		priv->source_list = NULL;
-	}
-
-	if (priv->source_selection != NULL) {
-		e_source_selector_free_selection (priv->source_selection);
-		priv->source_selection = NULL;
-	}
-	
-	if (priv->gconf_client != NULL) {
-		g_object_unref (priv->gconf_client);
-		priv->gconf_client = NULL;
-	}
-
-	if (priv->create_ecal) {
-		g_object_unref (priv->create_ecal);
-		priv->create_ecal = NULL;
-	}
-		
-	for (l = priv->notifications; l; l = l->next)
-		calendar_config_remove_notification (GPOINTER_TO_UINT (l->data));
-	g_list_free (priv->notifications);
-	priv->notifications = NULL;
-
-	if (priv->activity_handler != NULL) {
-		g_object_unref (priv->activity_handler);
-		priv->activity_handler = NULL;
-	}
-
-	(* G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
-static void
-impl_finalize (GObject *object)
-{
-	CalendarComponentPrivate *priv = CALENDAR_COMPONENT (object)->priv;
-
-	g_free (priv->base_directory);
-	g_free (priv->config_directory);
-	g_free (priv);
-
-	(* G_OBJECT_CLASS (parent_class)->finalize) (object);
-}
 
 
 /* Evolution::Component CORBA methods.  */
@@ -788,164 +715,19 @@ selector_tree_drag_leave (GtkWidget *widget, GdkDragContext *context, guint time
 }
 
 static void
-impl_createControls (PortableServer_Servant servant,
-		     Bonobo_Control *corba_sidebar_control,
-		     Bonobo_Control *corba_view_control,
-		     Bonobo_Control *corba_statusbar_control,
-		     CORBA_Environment *ev)
+control_activate_cb (BonoboControl *control, gboolean activate, gpointer data)
 {
-	CalendarComponent *calendar_component = CALENDAR_COMPONENT (bonobo_object_from_servant (servant));
-	CalendarComponentPrivate *priv;
-	GtkWidget *selector_scrolled_window, *vbox, *info;
-	GtkWidget *statusbar_widget;
-	BonoboControl *sidebar_control;
-	BonoboControl *statusbar_control;
-	guint not;
-	
-	priv = calendar_component->priv;
-	
-	/* Create sidebar selector */
-	priv->source_selector = e_source_selector_new (calendar_component->priv->source_list);
-
-	g_signal_connect (priv->source_selector, "drag-motion", G_CALLBACK (selector_tree_drag_motion), 
-			  calendar_component);
-	g_signal_connect (priv->source_selector, "drag-leave", G_CALLBACK (selector_tree_drag_leave), 
-			  calendar_component);
-	g_signal_connect (priv->source_selector, "drag-drop", G_CALLBACK (selector_tree_drag_drop), 
-			  calendar_component);
-	g_signal_connect (priv->source_selector, "drag-data-received", 
-			  G_CALLBACK (selector_tree_drag_data_received), calendar_component);
-
-	gtk_drag_dest_set(priv->source_selector, GTK_DEST_DEFAULT_ALL, drag_types,
-			  num_drag_types, GDK_ACTION_COPY | GDK_ACTION_MOVE);
-
-	gtk_widget_show (priv->source_selector);
-
-	selector_scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-	gtk_container_add (GTK_CONTAINER (selector_scrolled_window), priv->source_selector);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (selector_scrolled_window),
-					GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (selector_scrolled_window),
-					     GTK_SHADOW_IN);
-	gtk_widget_show (selector_scrolled_window);
-
-	info = e_info_label_new("stock_calendar");
-	e_info_label_set_info((EInfoLabel *)info, _("Calendars"), "");
-	gtk_widget_show (info);
-
-	vbox = gtk_vbox_new(FALSE, 0);
-	gtk_box_pack_start(GTK_BOX (vbox), info, FALSE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX (vbox), selector_scrolled_window, TRUE, TRUE, 0);
-	gtk_widget_show (vbox);
-
-	sidebar_control = bonobo_control_new (vbox);
-
-	/* Create main calendar view */
-	/* FIXME Instead of returning, we should make a control with a
-	 * label describing the problem */
-	priv->view_control = control_factory_new_control ();
-	if (!priv->view_control) {
-		g_warning (G_STRLOC ": could not create the control!");
-		bonobo_exception_set (ev, ex_GNOME_Evolution_Component_Failed);
-		return;
-	}
-
-	priv->calendar = (GnomeCalendar *) bonobo_control_get_widget (priv->view_control);
-
-	statusbar_widget = e_task_bar_new ();
-	e_activity_handler_attach_task_bar (priv->activity_handler, E_TASK_BAR (statusbar_widget));
-	gtk_widget_show (statusbar_widget);
-	statusbar_control = bonobo_control_new (statusbar_widget);
-	
-	/* connect after setting the initial selections, or we'll get unwanted calls
-	   to calendar_control_sensitize_calendar_commands */
-	g_signal_connect_object (priv->source_selector, "selection_changed",
-				 G_CALLBACK (source_selection_changed_cb), 
-				 G_OBJECT (calendar_component), 0);
-	g_signal_connect_object (priv->source_selector, "primary_selection_changed",
-				 G_CALLBACK (primary_source_selection_changed_cb), 
-				 G_OBJECT (calendar_component), 0);
-	g_signal_connect_object (priv->source_selector, "fill_popup_menu",
-				 G_CALLBACK (fill_popup_menu_cb),
-				 G_OBJECT (calendar_component), 0);
-
-	/* Load the selection from the last run */
-	update_selection (calendar_component);	
-	update_primary_selection (calendar_component);
-	update_task_selection (calendar_component);
-	update_primary_task_selection (calendar_component);
-	
-	/* If the selection changes elsewhere, update it */
-	not = calendar_config_add_notification_calendars_selected (config_selection_changed_cb, 
-								   calendar_component);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-
-	not = calendar_config_add_notification_primary_calendar (config_primary_selection_changed_cb, 
-								 calendar_component);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-
-	not = calendar_config_add_notification_tasks_selected (config_tasks_selection_changed_cb, 
-							       calendar_component);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-
-	not = calendar_config_add_notification_primary_tasks (config_primary_tasks_selection_changed_cb, 
-							      calendar_component);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
+	CalendarComponentView *component_view = data;
 
-	/* Return the controls */
-	*corba_sidebar_control = CORBA_Object_duplicate (BONOBO_OBJREF (sidebar_control), ev);
-	*corba_view_control = CORBA_Object_duplicate (BONOBO_OBJREF (priv->view_control), ev);
-	*corba_statusbar_control = CORBA_Object_duplicate (BONOBO_OBJREF (statusbar_control), ev);
+	if (activate) {
+		BonoboUIComponent *uic;
+		uic = bonobo_control_get_ui_component (component_view->view_control);
+		
+		e_user_creatable_items_handler_activate (component_view->creatable_items_handler, uic);
+	}	
 }
 
 
-static GNOME_Evolution_CreatableItemTypeList *
-impl__get_userCreatableItems (PortableServer_Servant servant,
-			      CORBA_Environment *ev)
-{
-	GNOME_Evolution_CreatableItemTypeList *list = GNOME_Evolution_CreatableItemTypeList__alloc ();
-
-	list->_length  = 4;
-	list->_maximum = list->_length;
-	list->_buffer  = GNOME_Evolution_CreatableItemTypeList_allocbuf (list->_length);
-
-	CORBA_sequence_set_release (list, FALSE);
-
-	list->_buffer[0].id = CREATE_EVENT_ID;
-	list->_buffer[0].description = _("New appointment");
-	list->_buffer[0].menuDescription = _("_Appointment");
-	list->_buffer[0].tooltip = _("Create a new appointment");
-	list->_buffer[0].menuShortcut = 'a';
-	list->_buffer[0].iconName = "stock_new-appointment";
-	list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT;
-
-	list->_buffer[1].id = CREATE_MEETING_ID;
-	list->_buffer[1].description = _("New meeting");
-	list->_buffer[1].menuDescription = _("M_eeting");
-	list->_buffer[1].tooltip = _("Create a new meeting request");
-	list->_buffer[1].menuShortcut = 'e';
-	list->_buffer[1].iconName = "stock_new-meeting";
-	list->_buffer[1].type = GNOME_Evolution_CREATABLE_OBJECT;
-
-	list->_buffer[2].id = CREATE_ALLDAY_EVENT_ID;
-	list->_buffer[2].description = _("New all day appointment");
-	list->_buffer[2].menuDescription = _("All _Day Appointment");
-	list->_buffer[2].tooltip = _("Create a new all-day appointment");
-	list->_buffer[2].menuShortcut = 'd';
-	list->_buffer[2].iconName = "stock_new-24h-appointment";
-	list->_buffer[2].type = GNOME_Evolution_CREATABLE_OBJECT;
-
-	list->_buffer[3].id = CREATE_CALENDAR_ID;
-	list->_buffer[3].description = _("New calendar");
-	list->_buffer[3].menuDescription = _("C_alendar");
-	list->_buffer[3].tooltip = _("Create a new calendar");
-	list->_buffer[3].menuShortcut = 'a';
-	list->_buffer[3].iconName = "stock_calendar";
-	list->_buffer[3].type = GNOME_Evolution_CREATABLE_FOLDER;
-
-	return list;
-}
-
 static void
 config_create_ecal_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
 {	
@@ -960,8 +742,8 @@ config_create_ecal_changed_cb (GConfClient *client, guint id, GConfEntry *entry,
 	priv->notifications = g_list_remove (priv->notifications, GUINT_TO_POINTER (id));
 }
 
-static gboolean
-setup_create_ecal (CalendarComponent *calendar_component) 
+static ECal *
+setup_create_ecal (CalendarComponent *calendar_component, CalendarComponentView *component_view) 
 {
 	CalendarComponentPrivate *priv;
 	ESource *source = NULL;
@@ -970,20 +752,19 @@ setup_create_ecal (CalendarComponent *calendar_component)
 	
 	priv = calendar_component->priv;
 
-	if (priv->create_ecal)
-		return TRUE; 
-
 	/* Try to use the client from the calendar first to avoid re-opening things */
-	if (priv->calendar) {
+	if (component_view) {
 		ECal *default_ecal;
 		
-		default_ecal = gnome_calendar_get_default_client (priv->calendar);
-		if (default_ecal) {
-			priv->create_ecal = g_object_ref (default_ecal);
-			return TRUE;
-		}
+		default_ecal = gnome_calendar_get_default_client (component_view->calendar);
+		if (default_ecal)
+			return default_ecal;
 	}
 	
+	/* If there is an existing fall back, use that */
+	if (priv->create_ecal)
+		return priv->create_ecal; 
+
 	/* Get the current primary calendar, or try to set one if it doesn't already exist */		
 	uid = calendar_config_get_primary_calendar ();
 	if (uid) {
@@ -1011,7 +792,7 @@ setup_create_ecal (CalendarComponent *calendar_component)
 			gtk_dialog_run (GTK_DIALOG (dialog));
 			gtk_widget_destroy (dialog);
 
-			return FALSE;
+			return NULL;
 		}
 	} else {
 		GtkWidget *dialog;
@@ -1022,7 +803,7 @@ setup_create_ecal (CalendarComponent *calendar_component)
 		gtk_dialog_run (GTK_DIALOG (dialog));
 		gtk_widget_destroy (dialog);
 
-		return FALSE;
+		return NULL;
 	}		
 
 	/* Handle the fact it may change on us */
@@ -1033,21 +814,21 @@ setup_create_ecal (CalendarComponent *calendar_component)
 	/* Save the primary source for use elsewhere */
 	calendar_config_set_primary_calendar (e_source_peek_uid (source));
 
-	return TRUE;
+	return priv->create_ecal;
 }
 
-static void
-create_new_event (CalendarComponent *calendar_component, gboolean is_allday, gboolean is_meeting, CORBA_Environment *ev)
+static gboolean
+create_new_event (CalendarComponent *calendar_component, CalendarComponentView *component_view, gboolean is_allday, gboolean is_meeting)
 {
-	CalendarComponentPrivate *priv = calendar_component->priv;
+	ECal *ecal;
 	gboolean read_only;
 	ECalendarView *view;
 
-	if (!setup_create_ecal (calendar_component)) {
-		bonobo_exception_set (ev, ex_GNOME_Evolution_Component_Failed);
-		return;
-	}
-	if (!e_cal_is_read_only (priv->create_ecal, &read_only, NULL) || read_only) {
+	ecal = setup_create_ecal (calendar_component, component_view);
+	if (!ecal)
+		return FALSE;
+
+	if (!e_cal_is_read_only (ecal, &read_only, NULL) || read_only) {
 		GtkWidget *dialog;
 			
 		dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
@@ -1055,14 +836,14 @@ create_new_event (CalendarComponent *calendar_component, gboolean is_allday, gbo
 						 _("Selected calendar is read-only, events cannot be created. Please select a read-write calendar."));
 		gtk_dialog_run (GTK_DIALOG (dialog));
 		gtk_widget_destroy (dialog);
-		return;
+		return TRUE;
 	}
-	
-	if (priv->calendar && (view = E_CALENDAR_VIEW (gnome_calendar_get_current_view_widget (priv->calendar)))) {
+
+	if (component_view->calendar && (view = E_CALENDAR_VIEW (gnome_calendar_get_current_view_widget (component_view->calendar)))) {
 		GnomeCalendarViewType view_type;
 
 		/* Force all for these view types because thats what's selected and it mimics a double click */
-		view_type = gnome_calendar_get_view (priv->calendar);
+		view_type = gnome_calendar_get_view (component_view->calendar);
 		if (view_type == GNOME_CAL_WEEK_VIEW 
 		    || view_type == GNOME_CAL_MONTH_VIEW
 		    || view_type == GNOME_CAL_LIST_VIEW)
@@ -1073,8 +854,8 @@ create_new_event (CalendarComponent *calendar_component, gboolean is_allday, gbo
 		ECalComponent *comp;
 		EventEditor *editor;
 
-		editor = event_editor_new (priv->create_ecal);
-		comp = cal_comp_event_new_with_current_time (priv->create_ecal, is_allday);
+		editor = event_editor_new (ecal);
+		comp = cal_comp_event_new_with_current_time (ecal, is_allday);
 
 		comp_editor_edit_comp (COMP_EDITOR (editor), comp);
 		if (is_meeting)
@@ -1083,6 +864,266 @@ create_new_event (CalendarComponent *calendar_component, gboolean is_allday, gbo
 
 		e_comp_editor_registry_add (comp_editor_registry, COMP_EDITOR (editor), TRUE);
 	}
+
+	return TRUE;	
+}
+
+static void
+create_local_item_cb (EUserCreatableItemsHandler *handler, const char *item_type_name, void *data)
+{
+	CalendarComponent *calendar_component = data;
+	CalendarComponentPrivate *priv;
+	CalendarComponentView *component_view = NULL;
+	GList *l;
+	
+	priv = calendar_component->priv;
+	
+	for (l = priv->views; l; l = l->next) {
+		component_view = l->data;
+
+		if (component_view->creatable_items_handler == handler)
+			break;
+		
+		component_view = NULL;
+	}
+	
+	if (strcmp (item_type_name, CREATE_EVENT_ID) == 0)
+		create_new_event (calendar_component, component_view, FALSE, FALSE);
+ 	else if (strcmp (item_type_name, CREATE_ALLDAY_EVENT_ID) == 0)
+		create_new_event (calendar_component, component_view, TRUE, FALSE);
+	else if (strcmp (item_type_name, CREATE_MEETING_ID) == 0)
+		create_new_event (calendar_component, component_view, FALSE, TRUE);
+	else if (strcmp (item_type_name, CREATE_CALENDAR_ID) == 0)
+		calendar_setup_new_calendar (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (component_view->calendar))));
+}
+
+static CalendarComponentView *
+create_component_view (CalendarComponent *calendar_component)
+{
+	CalendarComponentPrivate *priv;
+	CalendarComponentView *component_view;
+	GtkWidget *selector_scrolled_window, *vbox, *info;
+	GtkWidget *statusbar_widget;
+	guint not;
+	
+	priv = calendar_component->priv;
+
+	/* Create the calendar component view */
+	component_view = g_new0 (CalendarComponentView, 1);
+	
+	/* Add the source lists */
+	component_view->source_list = g_object_ref (priv->source_list);
+	component_view->task_source_list = g_object_ref (priv->task_source_list);
+	
+	/* Create sidebar selector */
+	component_view->source_selector = e_source_selector_new (calendar_component->priv->source_list);
+
+	g_signal_connect (component_view->source_selector, "drag-motion", G_CALLBACK (selector_tree_drag_motion), 
+			  calendar_component);
+	g_signal_connect (component_view->source_selector, "drag-leave", G_CALLBACK (selector_tree_drag_leave), 
+			  calendar_component);
+	g_signal_connect (component_view->source_selector, "drag-drop", G_CALLBACK (selector_tree_drag_drop), 
+			  calendar_component);
+	g_signal_connect (component_view->source_selector, "drag-data-received", 
+			  G_CALLBACK (selector_tree_drag_data_received), calendar_component);
+
+	gtk_drag_dest_set(component_view->source_selector, GTK_DEST_DEFAULT_ALL, drag_types,
+			  num_drag_types, GDK_ACTION_COPY | GDK_ACTION_MOVE);
+
+	gtk_widget_show (component_view->source_selector);
+
+	selector_scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+	gtk_container_add (GTK_CONTAINER (selector_scrolled_window), component_view->source_selector);
+	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (selector_scrolled_window),
+					GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (selector_scrolled_window),
+					     GTK_SHADOW_IN);
+	gtk_widget_show (selector_scrolled_window);
+
+	info = e_info_label_new("stock_calendar");
+	e_info_label_set_info((EInfoLabel *)info, _("Calendars"), "");
+	gtk_widget_show (info);
+
+	vbox = gtk_vbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX (vbox), info, FALSE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX (vbox), selector_scrolled_window, TRUE, TRUE, 0);
+	gtk_widget_show (vbox);
+
+	component_view->sidebar_control = bonobo_control_new (vbox);
+
+	/* Create main view */
+	component_view->view_control = control_factory_new_control ();
+	if (!component_view->view_control) {
+		/* FIXME free memory */
+
+		return NULL;
+	}
+
+	component_view->calendar = (GnomeCalendar *) bonobo_control_get_widget (component_view->view_control);
+
+	/* Create status bar */
+	statusbar_widget = e_task_bar_new ();
+	e_activity_handler_attach_task_bar (component_view->activity_handler, E_TASK_BAR (statusbar_widget));
+	gtk_widget_show (statusbar_widget);
+
+	component_view->statusbar_control = bonobo_control_new (statusbar_widget);
+	
+	/* connect after setting the initial selections, or we'll get unwanted calls
+	   to calendar_control_sensitize_calendar_commands */
+	g_signal_connect (component_view->source_selector, "selection_changed",
+			  G_CALLBACK (source_selection_changed_cb), component_view);
+	g_signal_connect (component_view->source_selector, "primary_selection_changed",
+			  G_CALLBACK (primary_source_selection_changed_cb), component_view);
+	g_signal_connect (component_view->source_selector, "fill_popup_menu",
+			  G_CALLBACK (fill_popup_menu_cb), component_view);
+
+	/* Set up the "new" item handler */
+	component_view->creatable_items_handler = e_user_creatable_items_handler_new ("calendar", create_local_item_cb, calendar_component);
+	g_signal_connect (component_view->view_control, "activate", G_CALLBACK (control_activate_cb), component_view);
+
+	/* Load the selection from the last run */
+	update_selection (component_view);	
+	update_primary_selection (component_view);
+	update_task_selection (component_view);
+	update_primary_task_selection (component_view);
+
+	/* If the task selection changes elsewhere, update it */
+	not = calendar_config_add_notification_tasks_selected (config_tasks_selection_changed_cb, 
+							       component_view);
+	component_view->notifications = g_list_prepend (component_view->notifications, GUINT_TO_POINTER (not));
+
+	not = calendar_config_add_notification_primary_tasks (config_primary_tasks_selection_changed_cb, 
+							      component_view);
+	component_view->notifications = g_list_prepend (component_view->notifications, GUINT_TO_POINTER (not));
+
+	return component_view;
+}
+
+static void
+destroy_component_view (CalendarComponentView *component_view)
+{	
+	GList *l;
+	
+	if (component_view->source_list)
+		g_object_unref (component_view->source_list);
+
+	if (component_view->task_source_list)
+		g_object_unref (component_view->task_source_list);
+
+	if (component_view->source_selection)
+		e_source_selector_free_selection (component_view->source_selection);
+	
+	for (l = component_view->notifications; l; l = l->next)
+		calendar_config_remove_notification (GPOINTER_TO_UINT (l->data));
+	g_list_free (component_view->notifications);
+
+	if (component_view->creatable_items_handler)
+		g_object_unref (component_view->creatable_items_handler);
+
+	if (component_view->activity_handler)
+		g_object_unref (component_view->activity_handler);
+
+	g_free (component_view);
+}
+
+static void
+view_destroyed_cb (gpointer data, GObject *where_the_object_was)
+{
+	CalendarComponent *calendar_component = data;
+	CalendarComponentPrivate *priv;
+	GList *l;
+	
+	priv = calendar_component->priv;
+
+	for (l = priv->views; l; l = l->next) {
+		CalendarComponentView *component_view = l->data;
+		
+		if (G_OBJECT (component_view->view_control) == where_the_object_was) {
+			priv->views = g_list_remove (priv->views, component_view);
+			destroy_component_view (component_view);
+
+			break;
+		}
+	}
+}
+
+static void
+impl_createControls (PortableServer_Servant servant,
+		     Bonobo_Control *corba_sidebar_control,
+		     Bonobo_Control *corba_view_control,
+		     Bonobo_Control *corba_statusbar_control,
+		     CORBA_Environment *ev)
+{
+	CalendarComponent *calendar_component = CALENDAR_COMPONENT (bonobo_object_from_servant (servant));
+	CalendarComponentPrivate *priv;
+	CalendarComponentView *component_view;
+	
+	priv = calendar_component->priv;
+
+	/* Create the calendar component view */
+	component_view = create_component_view (calendar_component);
+	if (!component_view) {
+		/* FIXME Should we describe the problem in a control? */
+		bonobo_exception_set (ev, ex_GNOME_Evolution_Component_Failed);
+
+		return;
+	}
+
+	g_object_weak_ref (G_OBJECT (component_view->view_control), view_destroyed_cb, calendar_component);
+	priv->views = g_list_append (priv->views, component_view);
+	
+	/* Return the controls */
+	*corba_sidebar_control = CORBA_Object_duplicate (BONOBO_OBJREF (component_view->sidebar_control), ev);
+	*corba_view_control = CORBA_Object_duplicate (BONOBO_OBJREF (component_view->view_control), ev);
+	*corba_statusbar_control = CORBA_Object_duplicate (BONOBO_OBJREF (component_view->statusbar_control), ev);
+}
+
+
+static GNOME_Evolution_CreatableItemTypeList *
+impl__get_userCreatableItems (PortableServer_Servant servant,
+			      CORBA_Environment *ev)
+{
+	GNOME_Evolution_CreatableItemTypeList *list = GNOME_Evolution_CreatableItemTypeList__alloc ();
+
+	list->_length  = 4;
+	list->_maximum = list->_length;
+	list->_buffer  = GNOME_Evolution_CreatableItemTypeList_allocbuf (list->_length);
+
+	CORBA_sequence_set_release (list, FALSE);
+
+	list->_buffer[0].id = CREATE_EVENT_ID;
+	list->_buffer[0].description = _("New appointment");
+	list->_buffer[0].menuDescription = _("_Appointment");
+	list->_buffer[0].tooltip = _("Create a new appointment");
+	list->_buffer[0].menuShortcut = 'a';
+	list->_buffer[0].iconName = "stock_new-appointment";
+	list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT;
+
+	list->_buffer[1].id = CREATE_MEETING_ID;
+	list->_buffer[1].description = _("New meeting");
+	list->_buffer[1].menuDescription = _("M_eeting");
+	list->_buffer[1].tooltip = _("Create a new meeting request");
+	list->_buffer[1].menuShortcut = 'e';
+	list->_buffer[1].iconName = "stock_new-meeting";
+	list->_buffer[1].type = GNOME_Evolution_CREATABLE_OBJECT;
+
+	list->_buffer[2].id = CREATE_ALLDAY_EVENT_ID;
+	list->_buffer[2].description = _("New all day appointment");
+	list->_buffer[2].menuDescription = _("All _Day Appointment");
+	list->_buffer[2].tooltip = _("Create a new all-day appointment");
+	list->_buffer[2].menuShortcut = 'd';
+	list->_buffer[2].iconName = "stock_new-24h-appointment";
+	list->_buffer[2].type = GNOME_Evolution_CREATABLE_OBJECT;
+
+	list->_buffer[3].id = CREATE_CALENDAR_ID;
+	list->_buffer[3].description = _("New calendar");
+	list->_buffer[3].menuDescription = _("C_alendar");
+	list->_buffer[3].tooltip = _("Create a new calendar");
+	list->_buffer[3].menuShortcut = 'a';
+	list->_buffer[3].iconName = "stock_calendar";
+	list->_buffer[3].type = GNOME_Evolution_CREATABLE_FOLDER;
+
+	return list;
 }
 
 static void
@@ -1091,20 +1132,83 @@ impl_requestCreateItem (PortableServer_Servant servant,
 			CORBA_Environment *ev)
 {
 	CalendarComponent *calendar_component = CALENDAR_COMPONENT (bonobo_object_from_servant (servant));
+	gboolean result = FALSE;
 	
 	if (strcmp (item_type_name, CREATE_EVENT_ID) == 0)
-		create_new_event (calendar_component, FALSE, FALSE, ev);
+		result = create_new_event (calendar_component, NULL, FALSE, FALSE);
  	else if (strcmp (item_type_name, CREATE_ALLDAY_EVENT_ID) == 0)
-		create_new_event (calendar_component, TRUE, FALSE, ev);
+		result = create_new_event (calendar_component, NULL, TRUE, FALSE);
 	else if (strcmp (item_type_name, CREATE_MEETING_ID) == 0)
-		create_new_event (calendar_component, FALSE, TRUE, ev);
+		result = create_new_event (calendar_component, NULL, FALSE, TRUE);
 	else if (strcmp (item_type_name, CREATE_CALENDAR_ID) == 0)
-		calendar_setup_new_calendar (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (calendar_component->priv->calendar))));
+		/* FIXME Should we use the last opened window? */
+		calendar_setup_new_calendar (NULL);
 	else
 		bonobo_exception_set (ev, ex_GNOME_Evolution_Component_UnknownType);
+
+	if (!result)
+		bonobo_exception_set (ev, ex_GNOME_Evolution_Component_Failed);
+}
+
+/* GObject methods.  */
+
+static void
+impl_dispose (GObject *object)
+{
+	CalendarComponent *calendar_component = CALENDAR_COMPONENT (object);
+	CalendarComponentPrivate *priv = calendar_component->priv;
+	GList *l;
+	
+	if (priv->source_list != NULL) {
+		g_object_unref (priv->source_list);
+		priv->source_list = NULL;
+	}
+
+	if (priv->gconf_client != NULL) {
+		g_object_unref (priv->gconf_client);
+		priv->gconf_client = NULL;
+	}
+
+	if (priv->create_ecal) {
+		g_object_unref (priv->create_ecal);
+		priv->create_ecal = NULL;
+	}
+
+	for (l = priv->views; l; l = l->next) {
+		CalendarComponentView *component_view = l->data;
+	
+		g_object_weak_unref (G_OBJECT (component_view->view_control), view_destroyed_cb, calendar_component);
+	}
+	g_list_free (priv->views);
+	priv->views = NULL;
+	
+	for (l = priv->notifications; l; l = l->next)
+		calendar_config_remove_notification (GPOINTER_TO_UINT (l->data));
+	g_list_free (priv->notifications);
+	priv->notifications = NULL;
+
+	(* G_OBJECT_CLASS (parent_class)->dispose) (object);
 }
 
-/* Initialization.  */
+static void
+impl_finalize (GObject *object)
+{
+	CalendarComponentPrivate *priv = CALENDAR_COMPONENT (object)->priv;
+	GList *l;
+	
+	for (l = priv->views; l; l = l->next) {
+		CalendarComponentView *component_view = l->data;
+		
+		destroy_component_view (component_view);
+	}
+	g_list_free (priv->views);
+	
+	g_free (priv->base_directory);
+	g_free (priv->config_directory);
+	g_free (priv);
+
+	(* G_OBJECT_CLASS (parent_class)->finalize) (object);
+}
 
 static void
 calendar_component_class_init (CalendarComponentClass *class)
@@ -1127,7 +1231,8 @@ static void
 calendar_component_init (CalendarComponent *component)
 {
 	CalendarComponentPrivate *priv;
-
+	guint not;
+	
 	priv = g_new0 (CalendarComponentPrivate, 1);
 
 	priv->base_directory = g_build_filename (g_get_home_dir (), ".evolution", NULL);
@@ -1139,13 +1244,17 @@ calendar_component_init (CalendarComponent *component)
 	 * calendar_component_peek_gconf_client().  */
 	priv->gconf_client = gconf_client_get_default ();
 
-	/* FIXME Use ecal convenience functions */
-	priv->source_list = e_source_list_new_for_gconf (priv->gconf_client,
-							 "/apps/evolution/calendar/sources");
-	priv->task_source_list = e_source_list_new_for_gconf (priv->gconf_client,
-							 "/apps/evolution/tasks/sources");
+	
+	if (!e_cal_get_sources (&priv->source_list, E_CAL_SOURCE_TYPE_EVENT, NULL))
+		;
+	
+	if (!e_cal_get_sources (&priv->task_source_list, E_CAL_SOURCE_TYPE_TODO, NULL))
+		;
+
+	not = calendar_config_add_notification_primary_calendar (config_primary_selection_changed_cb, 
+								 component);
+	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
 
-	priv->activity_handler = e_activity_handler_new ();
 
 	component->priv = priv;
 }
@@ -1194,13 +1303,15 @@ calendar_component_peek_source_list (CalendarComponent *component)
 ESourceSelector *
 calendar_component_peek_source_selector (CalendarComponent *component)
 {
-	return E_SOURCE_SELECTOR (component->priv->source_selector);
+// return E_SOURCE_SELECTOR (component->priv->source_selector);
+	return NULL;
 }
 
 EActivityHandler *
 calendar_component_peek_activity_handler (CalendarComponent *component)
 {
-	return component->priv->activity_handler;
+//	return component->priv->activity_handler;
+	return NULL;
 }
 
 void
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index 78817553af..ac79a1b262 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -1372,6 +1372,7 @@ static GdkPixbuf *progress_icon = NULL;
 void
 e_calendar_table_set_status_message (ECalendarTable *cal_table, const gchar *message)
 {
+#if 0
 	EActivityHandler *activity_handler = tasks_component_peek_activity_handler (tasks_component_peek ());
 
         g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));
@@ -1394,4 +1395,5 @@ e_calendar_table_set_status_message (ECalendarTable *cal_table, const gchar *mes
         } else {
                 e_activity_handler_operation_progressing (activity_handler, cal_table->activity_id, message, -1.0);
 	}
+#endif
 }
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 4c51a2b0a0..5aae73b6a0 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -531,6 +531,7 @@ e_calendar_view_set_use_24_hour_format (ECalendarView *cal_view, gboolean use_24
 void
 e_calendar_view_set_status_message (ECalendarView *cal_view, const gchar *message)
 {
+#if 0
 	EActivityHandler *activity_handler = calendar_component_peek_activity_handler (calendar_component_peek ());
 
 	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
@@ -552,6 +553,7 @@ e_calendar_view_set_status_message (ECalendarView *cal_view, const gchar *messag
 	} else {
 		e_activity_handler_operation_progressing (activity_handler, cal_view->priv->activity_id, message, -1.0);
 	}
+#endif
 }
 
 GList *
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
index dbee3dab4c..fab404b38d 100644
--- a/calendar/gui/e-tasks.c
+++ b/calendar/gui/e-tasks.c
@@ -79,8 +79,6 @@ struct _ETasksPrivate {
 	GalViewMenus *view_menus;
 
 	GList *notifications;
-
-	EUserCreatableItemsHandler *creatable_items_handler;
 };
 
 
@@ -446,14 +444,6 @@ e_tasks_set_ui_component (ETasks *tasks,
 	g_return_if_fail (ui_component == NULL || BONOBO_IS_UI_COMPONENT (ui_component));
 
 	e_search_bar_set_ui_component (E_SEARCH_BAR (tasks->priv->search_bar), ui_component);
-
-	if (ui_component) {
-		if (!tasks->priv->creatable_items_handler) {
-			tasks->priv->creatable_items_handler =
-				e_user_creatable_items_handler_new ("tasks", NULL, NULL);
-		}
-		e_user_creatable_items_handler_activate (tasks->priv->creatable_items_handler, ui_component);
-	}
 }
 
 
@@ -494,11 +484,6 @@ e_tasks_destroy (GtkObject *object)
 		for (l = priv->notifications; l; l = l->next)
 			calendar_config_remove_notification (GPOINTER_TO_UINT (l->data));
 		priv->notifications = NULL;
-		
-		if (priv->creatable_items_handler) {
-			g_object_unref (priv->creatable_items_handler);
-			priv->creatable_items_handler = NULL;
-		}
 
 		g_free (priv);
 		tasks->priv = NULL;
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 6722442cee..4872c7e274 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -155,9 +155,6 @@ struct _GnomeCalendarPrivate {
 	   'dates-shown-changed' signal.*/
 	time_t visible_start;
 	time_t visible_end;
-
-	/* Our associated creatable items handler */
-	EUserCreatableItemsHandler *creatable_items_handler;
 };
 
 /* Signal IDs */
@@ -169,6 +166,7 @@ enum {
 	CALENDAR_FOCUS_CHANGE,
 	TASKPAD_FOCUS_CHANGE,
 	GOTO_DATE,
+	ACTIVITY,
 	LAST_SIGNAL
 };
 
@@ -1197,11 +1195,6 @@ gnome_calendar_destroy (GtkObject *object)
 			priv->view_menus = NULL;
 		}
 
-		if (priv->creatable_items_handler) {
-			g_object_unref (priv->creatable_items_handler);
-			priv->creatable_items_handler = NULL;
-		}
-
 		g_free (priv);
 		gcal->priv = NULL;
 	}
@@ -2011,14 +2004,6 @@ gnome_calendar_set_ui_component (GnomeCalendar *gcal,
 	g_return_if_fail (ui_component == NULL || BONOBO_IS_UI_COMPONENT (ui_component));
 
 	e_search_bar_set_ui_component (E_SEARCH_BAR (gcal->priv->search_bar), ui_component);
-
-	if (ui_component) {
-		if (!gcal->priv->creatable_items_handler) {
-			gcal->priv->creatable_items_handler =
-				e_user_creatable_items_handler_new ("calendar", NULL, NULL);
-		}
-		e_user_creatable_items_handler_activate (gcal->priv->creatable_items_handler, ui_component);
-	}
 }
 
 /**
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index 0adf321dc2..e94a5d0cf8 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -31,6 +31,7 @@
 #include <bonobo/bonobo-exception.h>
 #include <gconf/gconf-client.h>
 #include <libecal/e-cal.h>
+#include <shell/e-user-creatable-items-handler.h>
 #include "e-cal-model.h"
 #include "e-tasks.h"
 #include "tasks-component.h"
@@ -59,25 +60,39 @@ static BonoboObjectClass *parent_class = NULL;
 /* Tasks should have their own registry */
 extern ECompEditorRegistry *comp_editor_registry;
 
-struct _TasksComponentPrivate {
-	char *base_directory;
-	char *config_directory;
-
-	GConfClient *gconf_client;
 
+typedef struct 
+{
 	ESourceList *source_list;
+	
 	GSList *source_selection;
-
+	
 	ETasks *tasks;
 	GtkWidget *source_selector;
 
 	BonoboControl *view_control;
-
-	ECal *create_ecal;
+	BonoboControl *sidebar_control;
+	BonoboControl *statusbar_control;
 
 	GList *notifications;
 
+	EUserCreatableItemsHandler *creatable_items_handler;
+
 	EActivityHandler *activity_handler;
+} TasksComponentView;
+
+struct _TasksComponentPrivate {
+	char *base_directory;
+	char *config_directory;
+
+	ESourceList *source_list;
+	GSList *source_selection;
+
+	GList *views;
+	
+	ECal *create_ecal;
+	
+	GList *notifications;
 };
 
 /* Utility functions.  */
@@ -113,31 +128,28 @@ is_in_uids (GSList *uids, ESource *source)
 }
 
 static void
-update_uris_for_selection (TasksComponent *component)
+update_uris_for_selection (TasksComponentView *component_view)
 {
-	TasksComponentPrivate *priv;
 	GSList *selection, *l, *uids_selected = NULL;
 	
-	priv = component->priv;
-
-	selection = e_source_selector_get_selection (E_SOURCE_SELECTOR (priv->source_selector));
+	selection = e_source_selector_get_selection (E_SOURCE_SELECTOR (component_view->source_selector));
 	
-	for (l = priv->source_selection; l; l = l->next) {
+	for (l = component_view->source_selection; l; l = l->next) {
 		ESource *old_selected_source = l->data;
 
 		if (!is_in_selection (selection, old_selected_source))
-			e_tasks_remove_todo_source (priv->tasks, old_selected_source);
+			e_tasks_remove_todo_source (component_view->tasks, old_selected_source);
 	}	
 	
 	for (l = selection; l; l = l->next) {
 		ESource *selected_source = l->data;
 		
-		e_tasks_add_todo_source (priv->tasks, selected_source);
+		e_tasks_add_todo_source (component_view->tasks, selected_source);
 		uids_selected = g_slist_append (uids_selected, (char *)e_source_peek_uid (selected_source));
 	}
 
-	e_source_selector_free_selection (priv->source_selection);
-	priv->source_selection = selection;
+	e_source_selector_free_selection (component_view->source_selection);
+	component_view->source_selection = selection;
 
 	/* Save the selection for next time we start up */
 	calendar_config_set_tasks_selected (uids_selected);
@@ -145,50 +157,44 @@ update_uris_for_selection (TasksComponent *component)
 }
 
 static void
-update_uri_for_primary_selection (TasksComponent *component)
+update_uri_for_primary_selection (TasksComponentView *component_view)
 {
-	TasksComponentPrivate *priv;
 	ESource *source;
 	ECalendarTable *cal_table;
 	ETable *etable;
 
-	priv = component->priv;
-	
-	source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (priv->source_selector));
+	source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector));
 	if (!source)
 		return;
 
 	/* Set the default */
-	e_tasks_set_default_source (priv->tasks, source);
+	e_tasks_set_default_source (component_view->tasks, source);
 
-	cal_table = e_tasks_get_calendar_table (priv->tasks);
+	cal_table = e_tasks_get_calendar_table (component_view->tasks);
 	etable = e_calendar_table_get_table (cal_table);
 
-	tasks_control_sensitize_commands (priv->view_control, priv->tasks, e_table_selected_count (etable));
+	tasks_control_sensitize_commands (component_view->view_control, component_view->tasks, e_table_selected_count (etable));
 	
 	/* Save the selection for next time we start up */
 	calendar_config_set_primary_tasks (e_source_peek_uid (source));
 }
 
 static void
-update_selection (TasksComponent *task_component)
+update_selection (TasksComponentView *component_view)
 {
-	TasksComponentPrivate *priv;
 	GSList *selection, *uids_selected, *l;
 
-	priv = task_component->priv;
-
 	/* Get the selection in gconf */
 	uids_selected = calendar_config_get_tasks_selected ();
 
 	/* Remove any that aren't there any more */
-	selection = e_source_selector_get_selection (E_SOURCE_SELECTOR (priv->source_selector));
+	selection = e_source_selector_get_selection (E_SOURCE_SELECTOR (component_view->source_selector));
 
 	for (l = selection; l; l = l->next) {
 		ESource *source = l->data;
 
 		if (!is_in_uids (uids_selected, source)) 
-			e_source_selector_unselect_source (E_SOURCE_SELECTOR (priv->source_selector), source);
+			e_source_selector_unselect_source (E_SOURCE_SELECTOR (component_view->source_selector), source);
 	}
 	
 	e_source_selector_free_selection (selection);
@@ -198,9 +204,9 @@ update_selection (TasksComponent *task_component)
 		char *uid = l->data;
 		ESource *source;
 
-		source = e_source_list_peek_source_by_uid (priv->source_list, uid);
+		source = e_source_list_peek_source_by_uid (component_view->source_list, uid);
 		if (source) 
-			e_source_selector_select_source (E_SOURCE_SELECTOR (priv->source_selector), source);
+			e_source_selector_select_source (E_SOURCE_SELECTOR (component_view->source_selector), source);
 		
 		g_free (uid);
 	}
@@ -208,27 +214,24 @@ update_selection (TasksComponent *task_component)
 }
 
 static void
-update_primary_selection (TasksComponent *component)
+update_primary_selection (TasksComponentView *component_view)
 {
-	TasksComponentPrivate *priv;
 	ESource *source = NULL;
 	char *uid;
 
-	priv = component->priv;
-
 	uid = calendar_config_get_primary_tasks ();
 	if (uid) {
-		source = e_source_list_peek_source_by_uid (priv->source_list, uid);
+		source = e_source_list_peek_source_by_uid (component_view->source_list, uid);
 		g_free (uid);
 	}
 	
 	if (source) {
-		e_source_selector_set_primary_selection (E_SOURCE_SELECTOR (priv->source_selector), source);
+		e_source_selector_set_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector), source);
 	} else {
 		/* Try to create a default if there isn't one */
-		source = e_source_list_peek_source_any (priv->source_list);
+		source = e_source_list_peek_source_any (component_view->source_list);
 		if (source)
-			e_source_selector_set_primary_selection (E_SOURCE_SELECTOR (priv->source_selector), source);
+			e_source_selector_set_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector), source);
 	}
 }
 
@@ -266,14 +269,11 @@ add_popup_menu_item (GtkMenu *menu, const char *label, const char *icon_name,
 }
 
 static void
-copy_task_list_cb (GtkWidget *widget, TasksComponent *comp)
+copy_task_list_cb (GtkWidget *widget, TasksComponentView *component_view)
 {
 	ESource *selected_source;
-	TasksComponentPrivate *priv;
-
-	priv = comp->priv;
 	
-	selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (priv->source_selector));
+	selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector));
 	if (!selected_source)
 		return;
 
@@ -281,15 +281,12 @@ copy_task_list_cb (GtkWidget *widget, TasksComponent *comp)
 }
 
 static void
-delete_task_list_cb (GtkWidget *widget, TasksComponent *comp)
+delete_task_list_cb (GtkWidget *widget, TasksComponentView *component_view)
 {
 	ESource *selected_source;
-	TasksComponentPrivate *priv;
 	GtkWidget *dialog;
 
-	priv = comp->priv;
-	
-	selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (priv->source_selector));
+	selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector));
 	if (!selected_source)
 		return;
 
@@ -308,22 +305,22 @@ delete_task_list_cb (GtkWidget *widget, TasksComponent *comp)
 		/* first, ask the backend to remove the task list */
 		uri = e_source_get_uri (selected_source);
 		cal = e_cal_model_get_client_for_uri (
-			e_calendar_table_get_model (E_CALENDAR_TABLE (e_tasks_get_calendar_table (priv->tasks))),
+			e_calendar_table_get_model (E_CALENDAR_TABLE (e_tasks_get_calendar_table (component_view->tasks))),
 			uri);
 		if (!cal)
 			cal = e_cal_new_from_uri (uri, E_CAL_SOURCE_TYPE_TODO);
 		g_free (uri);
 		if (cal) {
 			if (e_cal_remove (cal, NULL)) {
-				if (e_source_selector_source_is_selected (E_SOURCE_SELECTOR (priv->source_selector),
+				if (e_source_selector_source_is_selected (E_SOURCE_SELECTOR (component_view->source_selector),
 									  selected_source)) {
-					e_tasks_remove_todo_source (priv->tasks, selected_source);
-					e_source_selector_unselect_source (E_SOURCE_SELECTOR (priv->source_selector),
+					e_tasks_remove_todo_source (component_view->tasks, selected_source);
+					e_source_selector_unselect_source (E_SOURCE_SELECTOR (component_view->source_selector),
 									   selected_source);
 				}
 
 				e_source_group_remove_source (e_source_peek_group (selected_source), selected_source);
-				e_source_list_sync (priv->source_list, NULL);
+				e_source_list_sync (component_view->source_list, NULL);
 			}
 		}
 	}
@@ -332,20 +329,17 @@ delete_task_list_cb (GtkWidget *widget, TasksComponent *comp)
 }
 
 static void
-new_task_list_cb (GtkWidget *widget, TasksComponent *component)
+new_task_list_cb (GtkWidget *widget, TasksComponentView *component_view)
 {
 	calendar_setup_new_task_list (GTK_WINDOW (gtk_widget_get_toplevel (widget)));
 }
 
 static void
-edit_task_list_cb (GtkWidget *widget, TasksComponent *comp)
+edit_task_list_cb (GtkWidget *widget, TasksComponentView *component_view)
 {
-	TasksComponentPrivate *priv;
 	ESource *selected_source;
 
-	priv = comp->priv;
-	
-	selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (priv->source_selector));
+	selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector));
 	if (!selected_source)
 		return;
 
@@ -353,106 +347,35 @@ edit_task_list_cb (GtkWidget *widget, TasksComponent *comp)
 }
 
 static void
-fill_popup_menu_cb (ESourceSelector *selector, GtkMenu *menu, TasksComponent *component)
+fill_popup_menu_cb (ESourceSelector *selector, GtkMenu *menu, TasksComponentView *component_view)
 {
 	gboolean sensitive;
 
-	sensitive = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (component->priv->source_selector)) ?
+	sensitive = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector)) ?
 		TRUE : FALSE;
 
 	add_popup_menu_item (menu, _("New Task List"), "stock_todo",
-			     G_CALLBACK (new_task_list_cb), component, TRUE);
+			     G_CALLBACK (new_task_list_cb), component_view, TRUE);
 	add_popup_menu_item (menu, _("Copy"), "stock_folder-copy",
-			     G_CALLBACK (copy_task_list_cb), component, sensitive);
+			     G_CALLBACK (copy_task_list_cb), component_view, sensitive);
 	add_popup_menu_item (menu, _("Delete"), "stock_delete", G_CALLBACK (delete_task_list_cb),
-			     component, sensitive);
+			     component_view, sensitive);
 	add_popup_menu_item (menu, _("Properties..."), NULL, G_CALLBACK (edit_task_list_cb),
-			     component, sensitive);
-}
-
-static void
-source_selection_changed_cb (ESourceSelector *selector, TasksComponent *component)
-{
-	update_uris_for_selection (component);
+			     component_view, sensitive);
 }
 
 static void
-primary_source_selection_changed_cb (ESourceSelector *selector, TasksComponent *component)
+source_selection_changed_cb (ESourceSelector *selector, TasksComponentView *component_view)
 {
-	TasksComponentPrivate *priv = component->priv;
-
-	if (priv->create_ecal) {
-		g_object_unref (priv->create_ecal);
-		priv->create_ecal = NULL;
-	}
-
-	update_uri_for_primary_selection (component);
-}
-
-static void
-config_selection_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	update_selection (data);
-}
-
-static void
-config_primary_selection_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	update_primary_selection (data);
+	update_uris_for_selection (component_view);
 }
 
-/* GObject methods */
-
 static void
-impl_dispose (GObject *object)
+primary_source_selection_changed_cb (ESourceSelector *selector, TasksComponentView *component_view)
 {
-	TasksComponentPrivate *priv = TASKS_COMPONENT (object)->priv;
-	GList *l;
-	
-	if (priv->source_list != NULL) {
-		g_object_unref (priv->source_list);
-		priv->source_list = NULL;
-	}
-
-	if (priv->source_selection != NULL) {
-		e_source_selector_free_selection (priv->source_selection);
-		priv->source_selection = NULL;
-	}
-
-	if (priv->gconf_client != NULL) {
-		g_object_unref (priv->gconf_client);
-		priv->gconf_client = NULL;
-	}
-
-	if (priv->create_ecal) {
-		g_object_unref (priv->create_ecal);
-		priv->create_ecal = NULL;
-	}
-
-	for (l = priv->notifications; l; l = l->next)
-		calendar_config_remove_notification (GPOINTER_TO_UINT (l->data));
-	g_list_free (priv->notifications);
-	priv->notifications = NULL;
-
-	if (priv->activity_handler != NULL) {
-		g_object_unref (priv->activity_handler);
-		priv->activity_handler = NULL;
-	}
-
-	(* G_OBJECT_CLASS (parent_class)->dispose) (object);
+	update_uri_for_primary_selection (component_view);
 }
 
-static void
-impl_finalize (GObject *object)
-{
-	TasksComponentPrivate *priv = TASKS_COMPONENT (object)->priv;
-
-	g_free (priv->base_directory);
-	g_free (priv->config_directory);
-	g_free (priv);
-
-	(* G_OBJECT_CLASS (parent_class)->finalize) (object);
-}
 
 /* Evolution::Component CORBA methods */
 
@@ -469,119 +392,16 @@ impl_upgradeFromVersion (PortableServer_Servant servant,
 }
 
 static void
-impl_createControls (PortableServer_Servant servant,
-		     Bonobo_Control *corba_sidebar_control,
-		     Bonobo_Control *corba_view_control,
-		     Bonobo_Control *corba_statusbar_control,
-		     CORBA_Environment *ev)
-{
-	TasksComponent *component = TASKS_COMPONENT (bonobo_object_from_servant (servant));
-	TasksComponentPrivate *priv;
-	GtkWidget *selector_scrolled_window, *statusbar_widget, *vbox, *info;
-	BonoboControl *sidebar_control, *statusbar_control;
-	guint not;
-	
-	priv = component->priv;
-
-	/* create sidebar selector */
-	priv->source_selector = e_source_selector_new (priv->source_list);
-	gtk_widget_show (priv->source_selector);
-
-	selector_scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-	gtk_container_add (GTK_CONTAINER (selector_scrolled_window), priv->source_selector);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (selector_scrolled_window),
-					GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (selector_scrolled_window),
-					     GTK_SHADOW_IN);
-	gtk_widget_show (selector_scrolled_window);
-
-	info = e_info_label_new("stock_task");
-	e_info_label_set_info((EInfoLabel *)info, _("Tasks"), "");
-	gtk_widget_show (info);
-
-	vbox = gtk_vbox_new(FALSE, 0);
-	gtk_box_pack_start(GTK_BOX (vbox), info, FALSE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX (vbox), selector_scrolled_window, TRUE, TRUE, 0);
-	gtk_widget_show (vbox);
-
-	sidebar_control = bonobo_control_new (vbox);
-
-	/* create the tasks view */
- 	priv->view_control = tasks_control_new ();
-	if (!priv->view_control) {
-		g_warning (G_STRLOC ": could not create the control!");
-		bonobo_exception_set (ev, ex_GNOME_Evolution_Component_Failed);
-		return;
-	}
-
-	priv->tasks = (ETasks *) bonobo_control_get_widget (priv->view_control);
-
-	/* connect after setting the initial selections, or we'll get unwanted calls
-	   to tasks_control_sensitize_commands */
-	g_signal_connect_object (priv->source_selector, "selection_changed",
-				 G_CALLBACK (source_selection_changed_cb),
-				 G_OBJECT (component), 0);
-	g_signal_connect_object (priv->source_selector, "primary_selection_changed",
-				 G_CALLBACK (primary_source_selection_changed_cb),
-				 G_OBJECT (component), 0);
-	g_signal_connect_object (priv->source_selector, "fill_popup_menu",
-				 G_CALLBACK (fill_popup_menu_cb),
-				 G_OBJECT (component), 0);
-
-	/* Load the selection from the last run */
-	update_selection (component);
-	update_primary_selection (component);
-
-	/* If it gets fiddled with update */
-	not = calendar_config_add_notification_tasks_selected (config_selection_changed_cb, 
-							       component);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-
-	not = calendar_config_add_notification_primary_tasks (config_primary_selection_changed_cb, 
-							      component);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
-
-	/* Return the controls */
-	*corba_sidebar_control = CORBA_Object_duplicate (BONOBO_OBJREF (sidebar_control), ev);
-	*corba_view_control = CORBA_Object_duplicate (BONOBO_OBJREF (priv->view_control), ev);
-
-	/* Create the task bar */
-	statusbar_widget = e_task_bar_new ();
-	e_activity_handler_attach_task_bar (priv->activity_handler, E_TASK_BAR (statusbar_widget));
-	gtk_widget_show (statusbar_widget);
-	statusbar_control = bonobo_control_new (statusbar_widget);
-	*corba_statusbar_control = CORBA_Object_duplicate (BONOBO_OBJREF (statusbar_control), ev);
-}
-
-static GNOME_Evolution_CreatableItemTypeList *
-impl__get_userCreatableItems (PortableServer_Servant servant,
-			      CORBA_Environment *ev)
+control_activate_cb (BonoboControl *control, gboolean activate, gpointer data)
 {
-	GNOME_Evolution_CreatableItemTypeList *list = GNOME_Evolution_CreatableItemTypeList__alloc ();
-
-	list->_length  = 2;
-	list->_maximum = list->_length;
-	list->_buffer  = GNOME_Evolution_CreatableItemTypeList_allocbuf (list->_length);
-
-	CORBA_sequence_set_release (list, FALSE);
-
-	list->_buffer[0].id = CREATE_TASK_ID;
-	list->_buffer[0].description = _("New task");
-	list->_buffer[0].menuDescription = _("_Task");
-	list->_buffer[0].tooltip = _("Create a new task");
-	list->_buffer[0].menuShortcut = 't';
-	list->_buffer[0].iconName = "stock_task";
-	list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT;
-
-	list->_buffer[1].id = CREATE_TASK_LIST_ID;
-	list->_buffer[1].description = _("New tasks group");
-	list->_buffer[1].menuDescription = _("_Tasks Group");
-	list->_buffer[1].tooltip = _("Create a new tasks group");
-	list->_buffer[1].menuShortcut = 'n';
-	list->_buffer[1].iconName = "stock_todo";
-	list->_buffer[1].type = GNOME_Evolution_CREATABLE_FOLDER;
+	TasksComponentView *component_view = data;
 
-	return list;
+	if (activate) {
+		BonoboUIComponent *uic;
+		uic = bonobo_control_get_ui_component (component_view->view_control);
+		
+		e_user_creatable_items_handler_activate (component_view->creatable_items_handler, uic);
+	}	
 }
 
 static void
@@ -598,8 +418,8 @@ config_create_ecal_changed_cb (GConfClient *client, guint id, GConfEntry *entry,
 	priv->notifications = g_list_remove (priv->notifications, GUINT_TO_POINTER (id));
 }
 
-static gboolean
-setup_create_ecal (TasksComponent *component) 
+static ECal *
+setup_create_ecal (TasksComponent *component, TasksComponentView *component_view) 
 {
 	TasksComponentPrivate *priv;
 	ESource *source = NULL;
@@ -608,20 +428,17 @@ setup_create_ecal (TasksComponent *component)
 	
 	priv = component->priv;
 
-	if (priv->create_ecal)
-		return TRUE; 
-
-	/* Try to use the client from the calendar first to avoid re-opening things */
-	if (priv->tasks) {
+	if (component_view) {
 		ECal *default_ecal;
-		
-		default_ecal = e_tasks_get_default_client (priv->tasks);
-		if (default_ecal) {
-			priv->create_ecal = g_object_ref (default_ecal);
-			return TRUE;
-		}
+
+		default_ecal = e_tasks_get_default_client (component_view->tasks);
+		if (default_ecal)
+			return default_ecal;
 	}
 	
+	if (priv->create_ecal)
+		return priv->create_ecal; 
+	
 	/* Get the current primary calendar, or try to set one if it doesn't already exist */		
 	uid = calendar_config_get_primary_tasks ();
 	if (uid) {
@@ -649,7 +466,7 @@ setup_create_ecal (TasksComponent *component)
 			gtk_dialog_run (GTK_DIALOG (dialog));
 			gtk_widget_destroy (dialog);
 
-			return FALSE;
+			return NULL;
 		}
 	} else {
 		GtkWidget *dialog;
@@ -660,7 +477,7 @@ setup_create_ecal (TasksComponent *component)
 		gtk_dialog_run (GTK_DIALOG (dialog));
 		gtk_widget_destroy (dialog);
 
-		return FALSE;
+		return NULL;
 	}		
 
 	/* Handle the fact it may change on us */
@@ -671,34 +488,253 @@ setup_create_ecal (TasksComponent *component)
 	/* Save the primary source for use elsewhere */
 	calendar_config_set_primary_tasks (e_source_peek_uid (source));
 
-	return TRUE;
+	return priv->create_ecal ;
 }
 
-static void
-create_new_todo (TasksComponent *task_component, CORBA_Environment *ev)
+static gboolean
+create_new_todo (TasksComponent *task_component, TasksComponentView *component_view)
 {
+	ECal *ecal;
 	TasksComponentPrivate *priv;
 	ECalComponent *comp;
 	TaskEditor *editor;
 	gboolean read_only;
 	
 	priv = task_component->priv;
+	
+	ecal = setup_create_ecal (task_component, component_view);
+	if (!ecal)
+		return FALSE;
 
-	if (!setup_create_ecal (task_component)) {
-		bonobo_exception_set (ev, ex_GNOME_Evolution_Component_Failed);
-		return;
+	if (!e_cal_is_read_only (ecal, &read_only, NULL) || read_only) {
+		GtkWidget *dialog;
+			
+		dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
+						 GTK_MESSAGE_INFO, GTK_BUTTONS_OK,
+						 _("Selected task list is read-only, events cannot be created. Please select a read-write calendar."));
+		gtk_dialog_run (GTK_DIALOG (dialog));
+		gtk_widget_destroy (dialog);
+		return TRUE;
 	}
-	
-	if (!e_cal_is_read_only (priv->create_ecal, &read_only, NULL) || read_only)
-		return;
 
-	editor = task_editor_new (priv->create_ecal);
-	comp = cal_comp_task_new_with_defaults (priv->create_ecal);
+	editor = task_editor_new (ecal);
+	comp = cal_comp_task_new_with_defaults (ecal);
 
 	comp_editor_edit_comp (COMP_EDITOR (editor), comp);
 	comp_editor_focus (COMP_EDITOR (editor));
 
 	e_comp_editor_registry_add (comp_editor_registry, COMP_EDITOR (editor), TRUE);
+
+	return TRUE;
+}
+
+static void
+create_local_item_cb (EUserCreatableItemsHandler *handler, const char *item_type_name, void *data)
+{
+	TasksComponent *tasks_component = data;
+	TasksComponentPrivate *priv;
+	TasksComponentView *component_view = NULL;
+	GList *l;
+	
+	priv = tasks_component->priv;
+	
+	for (l = priv->views; l; l = l->next) {
+		component_view = l->data;
+
+		if (component_view->creatable_items_handler == handler)
+			break;
+		
+		component_view = NULL;
+	}
+	
+	if (strcmp (item_type_name, CREATE_TASK_ID) == 0) {
+		create_new_todo (tasks_component, component_view);
+	} else if (strcmp (item_type_name, CREATE_TASK_LIST_ID) == 0) {
+		calendar_setup_new_task_list (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (component_view->tasks))));
+	}
+}
+
+static TasksComponentView *
+create_component_view (TasksComponent *tasks_component)
+{
+	TasksComponentPrivate *priv;
+	TasksComponentView *component_view;
+	GtkWidget *selector_scrolled_window, *vbox, *info;
+	GtkWidget *statusbar_widget;
+	
+	priv = tasks_component->priv;
+
+	/* Create the calendar component view */
+	component_view = g_new0 (TasksComponentView, 1);
+	
+	/* Add the source lists */
+	component_view->source_list = g_object_ref (priv->source_list);
+	
+	/* Create sidebar selector */
+	component_view->source_selector = e_source_selector_new (tasks_component->priv->source_list);
+	gtk_widget_show (component_view->source_selector);
+
+	selector_scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+	gtk_container_add (GTK_CONTAINER (selector_scrolled_window), component_view->source_selector);
+	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (selector_scrolled_window),
+					GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (selector_scrolled_window),
+					     GTK_SHADOW_IN);
+	gtk_widget_show (selector_scrolled_window);
+
+	info = e_info_label_new("stock_task");
+	e_info_label_set_info((EInfoLabel *)info, _("Tasks"), "");
+	gtk_widget_show (info);
+
+	vbox = gtk_vbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX (vbox), info, FALSE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX (vbox), selector_scrolled_window, TRUE, TRUE, 0);
+	gtk_widget_show (vbox);
+
+	component_view->sidebar_control = bonobo_control_new (vbox);
+
+	/* Create main view */
+	component_view->view_control = tasks_control_new ();
+	if (!component_view->view_control) {
+		/* FIXME free memory */
+
+		return NULL;
+	}
+
+	component_view->tasks = (ETasks *) bonobo_control_get_widget (component_view->view_control);
+
+	/* Create status bar */
+	statusbar_widget = e_task_bar_new ();
+	e_activity_handler_attach_task_bar (component_view->activity_handler, E_TASK_BAR (statusbar_widget));
+	gtk_widget_show (statusbar_widget);
+
+	component_view->statusbar_control = bonobo_control_new (statusbar_widget);
+	
+	/* connect after setting the initial selections, or we'll get unwanted calls
+	   to calendar_control_sensitize_calendar_commands */
+	g_signal_connect (component_view->source_selector, "selection_changed",
+			  G_CALLBACK (source_selection_changed_cb), component_view);
+	g_signal_connect (component_view->source_selector, "primary_selection_changed",
+			  G_CALLBACK (primary_source_selection_changed_cb), component_view);
+	g_signal_connect (component_view->source_selector, "fill_popup_menu",
+			  G_CALLBACK (fill_popup_menu_cb), component_view);
+
+	/* Set up the "new" item handler */
+	component_view->creatable_items_handler = e_user_creatable_items_handler_new ("tasks", create_local_item_cb, tasks_component);
+	g_signal_connect (component_view->view_control, "activate", G_CALLBACK (control_activate_cb), component_view);
+
+	/* Load the selection from the last run */
+	update_selection (component_view);	
+	update_primary_selection (component_view);
+
+	return component_view;
+}
+
+static void
+destroy_component_view (TasksComponentView *component_view)
+{	
+	GList *l;
+	
+	if (component_view->source_list)
+		g_object_unref (component_view->source_list);
+
+	if (component_view->source_selection)
+		e_source_selector_free_selection (component_view->source_selection);
+	
+	for (l = component_view->notifications; l; l = l->next)
+		calendar_config_remove_notification (GPOINTER_TO_UINT (l->data));
+	g_list_free (component_view->notifications);
+
+	if (component_view->creatable_items_handler)
+		g_object_unref (component_view->creatable_items_handler);
+
+	if (component_view->activity_handler)
+		g_object_unref (component_view->activity_handler);
+
+	g_free (component_view);
+}
+
+static void
+view_destroyed_cb (gpointer data, GObject *where_the_object_was)
+{
+	TasksComponent *tasks_component = data;
+	TasksComponentPrivate *priv;
+	GList *l;
+	
+	priv = tasks_component->priv;
+
+	for (l = priv->views; l; l = l->next) {
+		TasksComponentView *component_view = l->data;
+		
+		if (G_OBJECT (component_view->view_control) == where_the_object_was) {
+			priv->views = g_list_remove (priv->views, component_view);
+			destroy_component_view (component_view);
+
+			break;
+		}
+	}
+}
+
+static void
+impl_createControls (PortableServer_Servant servant,
+		     Bonobo_Control *corba_sidebar_control,
+		     Bonobo_Control *corba_view_control,
+		     Bonobo_Control *corba_statusbar_control,
+		     CORBA_Environment *ev)
+{
+	TasksComponent *component = TASKS_COMPONENT (bonobo_object_from_servant (servant));
+	TasksComponentPrivate *priv;
+	TasksComponentView *component_view;
+	
+	priv = component->priv;
+
+	/* Create the calendar component view */
+	component_view = create_component_view (component);
+	if (!component_view) {
+		/* FIXME Should we describe the problem in a control? */
+		bonobo_exception_set (ev, ex_GNOME_Evolution_Component_Failed);
+
+		return;
+	}
+
+	g_object_weak_ref (G_OBJECT (component_view->view_control), view_destroyed_cb, component);
+	priv->views = g_list_append (priv->views, component_view);
+	
+	/* Return the controls */
+	*corba_sidebar_control = CORBA_Object_duplicate (BONOBO_OBJREF (component_view->sidebar_control), ev);
+	*corba_view_control = CORBA_Object_duplicate (BONOBO_OBJREF (component_view->view_control), ev);
+	*corba_statusbar_control = CORBA_Object_duplicate (BONOBO_OBJREF (component_view->statusbar_control), ev);
+}
+
+static GNOME_Evolution_CreatableItemTypeList *
+impl__get_userCreatableItems (PortableServer_Servant servant,
+			      CORBA_Environment *ev)
+{
+	GNOME_Evolution_CreatableItemTypeList *list = GNOME_Evolution_CreatableItemTypeList__alloc ();
+
+	list->_length  = 2;
+	list->_maximum = list->_length;
+	list->_buffer  = GNOME_Evolution_CreatableItemTypeList_allocbuf (list->_length);
+
+	CORBA_sequence_set_release (list, FALSE);
+
+	list->_buffer[0].id = CREATE_TASK_ID;
+	list->_buffer[0].description = _("New task");
+	list->_buffer[0].menuDescription = _("_Task");
+	list->_buffer[0].tooltip = _("Create a new task");
+	list->_buffer[0].menuShortcut = 't';
+	list->_buffer[0].iconName = "stock_task";
+	list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT;
+
+	list->_buffer[1].id = CREATE_TASK_LIST_ID;
+	list->_buffer[1].description = _("New tasks group");
+	list->_buffer[1].menuDescription = _("_Tasks Group");
+	list->_buffer[1].tooltip = _("Create a new tasks group");
+	list->_buffer[1].menuShortcut = 'n';
+	list->_buffer[1].iconName = "stock_todo";
+	list->_buffer[1].type = GNOME_Evolution_CREATABLE_FOLDER;
+
+	return list;
 }
 
 static void
@@ -712,15 +748,74 @@ impl_requestCreateItem (PortableServer_Servant servant,
 	priv = tasks_component->priv;	
 	
 	if (strcmp (item_type_name, CREATE_TASK_ID) == 0) {
-		create_new_todo (tasks_component, ev);
+		if (!create_new_todo (tasks_component, NULL))
+			bonobo_exception_set (ev, ex_GNOME_Evolution_Component_Failed);
 	} else if (strcmp (item_type_name, CREATE_TASK_LIST_ID) == 0) {
-		calendar_setup_new_task_list (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (priv->tasks))));
+		/* FIXME Should we use the last opened window? */
+		calendar_setup_new_task_list (NULL);
 	} else {
 		bonobo_exception_set (ev, ex_GNOME_Evolution_Component_UnknownType);
 	}
 }
 
-/* Initialization */
+/* GObject methods.  */
+
+static void
+impl_dispose (GObject *object)
+{
+	TasksComponent *tasks_component = TASKS_COMPONENT (object);
+	TasksComponentPrivate *priv = tasks_component->priv;
+	GList *l;
+	
+	if (priv->source_list != NULL) {
+		g_object_unref (priv->source_list);
+		priv->source_list = NULL;
+	}
+	if (priv->source_selection != NULL) {
+		e_source_selector_free_selection (priv->source_selection);
+		priv->source_selection = NULL;
+	}
+
+	if (priv->create_ecal) {
+		g_object_unref (priv->create_ecal);
+		priv->create_ecal = NULL;
+	}
+
+	for (l = priv->views; l; l = l->next) {
+		TasksComponentView *component_view = l->data;
+	
+		g_object_weak_unref (G_OBJECT (component_view->view_control), view_destroyed_cb, tasks_component);
+	}
+	g_list_free (priv->views);
+	priv->views = NULL;
+
+	for (l = priv->notifications; l; l = l->next)
+		calendar_config_remove_notification (GPOINTER_TO_UINT (l->data));
+	g_list_free (priv->notifications);
+	priv->notifications = NULL;
+
+	(* G_OBJECT_CLASS (parent_class)->dispose) (object);
+}
+
+static void
+impl_finalize (GObject *object)
+{
+	TasksComponentPrivate *priv = TASKS_COMPONENT (object)->priv;
+	GList *l;
+	
+	for (l = priv->views; l; l = l->next) {
+		TasksComponentView *component_view = l->data;
+		
+		destroy_component_view (component_view);
+	}
+	g_list_free (priv->views);
+
+	g_free (priv->base_directory);
+	g_free (priv->config_directory);
+	g_free (priv);
+
+	(* G_OBJECT_CLASS (parent_class)->finalize) (object);
+}
 
 static void
 tasks_component_class_init (TasksComponentClass *klass)
@@ -751,12 +846,8 @@ tasks_component_init (TasksComponent *component, TasksComponentClass *klass)
 						   ".evolution", "tasks", "config",
 						   NULL);
 
-	/* load the groups from the configuration */
-	priv->gconf_client = gconf_client_get_default ();
-	priv->source_list = e_source_list_new_for_gconf (priv->gconf_client,
-							 "/apps/evolution/tasks/sources");
-
-	priv->activity_handler = e_activity_handler_new ();
+	if (!e_cal_get_sources (&priv->source_list, E_CAL_SOURCE_TYPE_TODO, NULL))
+		;
 
 	component->priv = priv;
 }
@@ -803,13 +894,15 @@ tasks_component_peek_source_list (TasksComponent *component)
 ESourceSelector *
 tasks_component_peek_source_selector (TasksComponent *component)
 {
-	return component->priv->source_selector;
+//	return component->priv->source_selector;
+	return NULL;
 }
 
 EActivityHandler *
 tasks_component_peek_activity_handler (TasksComponent *component)
 {
-	return component->priv->activity_handler;
+//	return component->priv->activity_handler;
+	return NULL;
 }
 
 BONOBO_TYPE_FUNC_FULL (TasksComponent, GNOME_Evolution_Component, PARENT_TYPE, tasks_component)