Progress update:

	- Calendar is kind of a mess at the moment.  Doesn't compile.

	- Roughed in the Mail module, including all the actions.
	  That _does_ compile.  Runs, even.


svn path=/branches/kill-bonobo/; revision=36611

34 files changed, 2982 insertions, 1529 deletions

diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index 3b619134be..c2a46fb4e5 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -68,53 +68,6 @@ typedef struct {
 	guint taskpad_focused : 1;
 } FocusData;
 
-static void
-file_open_event_cb (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	e_calendar_view_open_event (E_CALENDAR_VIEW (gnome_calendar_get_current_view_widget (gcal)));
-}
-
-
-/* Prints the calendar at its current view and time range */
-void
-calendar_command_print (GnomeCalendar *gcal, GtkPrintOperationAction action)
-{
-	if (gnome_calendar_get_view (gcal) == GNOME_CAL_LIST_VIEW) {
-		ECalListView *list_view;
-		ETable *table;
-
-		list_view = E_CAL_LIST_VIEW (gnome_calendar_get_current_view_widget (gcal));
-		table = e_table_scrolled_get_table (list_view->table_scrolled);
-		print_table (table, _("Print"), _("Calendar"), action);
-	} else {
-		time_t start;
-
-		gnome_calendar_get_current_time_range (gcal, &start, NULL);
-		print_calendar (gcal, action, start);
-	}
-}
-
-/* File/Print callback */
-static void
-file_print_cb (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal = GNOME_CALENDAR (data);
-
-	calendar_command_print (gcal, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG);
-}
-
-static void
-file_print_preview_cb (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal = GNOME_CALENDAR (data);
-
-	calendar_command_print (gcal, GTK_PRINT_OPERATION_ACTION_PREVIEW);
-}
-
 /* Sets a clock cursor for the specified calendar window */
 static void
 set_clock_cursor (GnomeCalendar *gcal)
@@ -136,58 +89,6 @@ set_normal_cursor (GnomeCalendar *gcal)
 }
 
 static void
-previous_clicked (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	set_clock_cursor (gcal);
-	gnome_calendar_previous (gcal);
-	set_normal_cursor (gcal);
-}
-
-static void
-next_clicked (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	set_clock_cursor (gcal);
-	gnome_calendar_next (gcal);
-	set_normal_cursor (gcal);
-}
-
-void
-calendar_goto_today (GnomeCalendar *gcal)
-{
-	set_clock_cursor (gcal);
-	gnome_calendar_goto_today (gcal);
-	set_normal_cursor (gcal);
-}
-
-static void
-today_clicked (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	calendar_goto_today (gcal);
-}
-
-static void
-goto_clicked (BonoboUIComponent *uic, gpointer data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	goto_dialog (gcal);
-}
-
-static void
 show_day_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path)
 {
 	GnomeCalendar *gcal;
@@ -240,65 +141,6 @@ show_list_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path)
 
 
 static void
-cut_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-	set_clock_cursor (gcal);
-	gnome_calendar_cut_clipboard (gcal);
-	set_normal_cursor (gcal);
-}
-
-static void
-copy_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	set_clock_cursor (gcal);
-	gnome_calendar_copy_clipboard (gcal);
-	set_normal_cursor (gcal);
-}
-
-static void
-paste_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	set_clock_cursor (gcal);
-	gnome_calendar_paste_clipboard (gcal);
-	set_normal_cursor (gcal);
-}
-
-static void
-delete_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	set_clock_cursor (gcal);
-	gnome_calendar_delete_selection (gcal);
-	set_normal_cursor (gcal);
-}
-
-static void
-delete_occurrence_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	set_clock_cursor (gcal);
-	gnome_calendar_delete_selected_occurrence (gcal);
-	set_normal_cursor (gcal);
-}
-
-static void
 purge_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
 {
 	GnomeCalendar *gcal;
@@ -370,69 +212,6 @@ sensitize_items(BonoboUIComponent *uic, struct _sensitize_item *items, guint32 m
 	}
 }
 
-static struct _sensitize_item calendar_sensitize_table[] = {
-	{ "EventOpen", E_CAL_MENU_SELECT_ONE },
-	{ "Cut", E_CAL_MENU_SELECT_EDITABLE },
-	{ "Copy", E_CAL_MENU_SELECT_ANY },
-	{ "Paste", E_CAL_MENU_SELECT_EDITABLE },
-	{ "Delete", E_CAL_MENU_SELECT_EDITABLE|E_CAL_MENU_SELECT_NONRECURRING },
-	{ "DeleteOccurrence", E_CAL_MENU_SELECT_EDITABLE|E_CAL_MENU_SELECT_RECURRING },
-	{ "DeleteAllOccurrences", E_CAL_MENU_SELECT_EDITABLE|E_CAL_MENU_SELECT_RECURRING },
-	{ NULL }
-};
-
-/* Sensitizes the UI Component menu/toolbar calendar commands based on the
- * number of selected events. (This will always be 0 or 1 currently.)  If enable
- * is FALSE, all will be disabled.  Otherwise, the currently-selected number of
- * events will be used.
- */
-void
-calendar_control_sensitize_calendar_commands (BonoboControl *control, GnomeCalendar *gcal, gboolean enable)
-{
-	BonoboUIComponent *uic;
-	GtkWidget *view;
-	ECalMenu *menu;
-	ECalModel *model;
-	GPtrArray *events;
-	GList *selected, *l;
-	ECalMenuTargetSelect *t;
-
-	uic = bonobo_control_get_ui_component (control);
-	g_return_if_fail (uic != NULL);
-
-	if (bonobo_ui_component_get_container (uic) == CORBA_OBJECT_NIL)
-		return;
-
-	view = gnome_calendar_get_current_view_widget (gcal);
-
-	menu = gnome_calendar_get_calendar_menu (gcal);
-	model = e_calendar_view_get_model((ECalendarView *)view);
-	events = g_ptr_array_new();
-	selected = e_calendar_view_get_selected_events((ECalendarView *)view);
-	for (l=selected;l;l=g_list_next(l)) {
-		ECalendarViewEvent *event = l->data;
-		if (event && event->comp_data)
-			g_ptr_array_add (events, e_cal_model_copy_component_data(event->comp_data));
-	}
-	g_list_free(selected);
-
-	t = e_cal_menu_target_new_select(menu, model, events);
-	if (!enable)
-		t->target.mask = ~0;
-
-	sensitize_items(uic, calendar_sensitize_table, t->target.mask);
-#if 0
-	/* retrieve read-onlyness of the default client */
-	e_cal = e_cal_model_get_default_client (gnome_calendar_get_calendar_model (gcal));
-	if (e_cal)
-		e_cal_is_read_only (e_cal, &default_read_only, NULL);
-	else
-		default_read_only = TRUE;
-#endif
-
-	e_menu_update_target((EMenu *)menu, (EMenuTarget *)t);
-}
-
 static struct _sensitize_item taskpad_sensitize_table[] = {
 	{ "Cut", E_CAL_MENU_SELECT_EDITABLE },
 	{ "Copy", E_CAL_MENU_SELECT_ANY },
@@ -555,21 +334,6 @@ gcal_taskpad_focus_change_cb (GnomeCalendar *gcal, gboolean in, gpointer data)
 
 
 static BonoboUIVerb verbs [] = {
-	BONOBO_UI_VERB ("EventOpen", file_open_event_cb),
-	BONOBO_UI_VERB ("CalendarPrint", file_print_cb),
-	BONOBO_UI_VERB ("CalendarPrintPreview", file_print_preview_cb),
-
-	BONOBO_UI_VERB ("Cut", cut_cmd),
-	BONOBO_UI_VERB ("Copy", copy_cmd),
-	BONOBO_UI_VERB ("Paste", paste_cmd),
-	BONOBO_UI_VERB ("Delete", delete_cmd),
-	BONOBO_UI_VERB ("DeleteOccurrence", delete_occurrence_cmd),
-	BONOBO_UI_VERB ("DeleteAllOccurrences", delete_cmd),
-
-	BONOBO_UI_VERB ("CalendarPrev", previous_clicked),
-	BONOBO_UI_VERB ("CalendarToday", today_clicked),
-	BONOBO_UI_VERB ("CalendarNext", next_clicked),
-	BONOBO_UI_VERB ("CalendarGoto", goto_clicked),
 
 	BONOBO_UI_VERB ("ShowDayView", show_day_view_clicked),
 	BONOBO_UI_VERB ("ShowWorkWeekView", show_work_week_view_clicked),
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index f2896a5990..d22d43e5ff 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -78,12 +78,9 @@ typedef struct
 
 	GnomeCalendar *calendar;
 
-	EInfoLabel *info_label;
 	GtkWidget *source_selector;
 
 	BonoboControl *view_control;
-	BonoboControl *sidebar_control;
-	BonoboControl *statusbar_control;
 
 	GList *notifications;
 
@@ -155,40 +152,6 @@ is_in_uids (GSList *uids, ESource *source)
 }
 
 static void
-update_selection (CalendarComponentView *component_view)
-{
-	GSList *selection, *uids_selected, *l;
-
-	/* 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 (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 (component_view->source_selector), source);
-	}
-
-	e_source_selector_free_selection (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 (component_view->source_list, uid);
-		if (source)
-			e_source_selector_select_source (E_SOURCE_SELECTOR (component_view->source_selector), source);
-
-		g_free (uid);
-	}
-	g_slist_free (uids_selected);
-}
-
-static void
 update_task_memo_selection (CalendarComponentView *component_view, ECalSourceType type)
 {
 	GSList *uids_selected, *l, *source_selection;
@@ -237,28 +200,6 @@ update_task_memo_selection (CalendarComponentView *component_view, ECalSourceTyp
 }
 
 static void
-update_primary_selection (CalendarComponentView *component_view)
-{
-	ESource *source = NULL;
-	char *uid;
-
-	uid = calendar_config_get_primary_calendar ();
-	if (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 (component_view->source_selector), source);
-	} else {
-		/* Try to create a default if there isn't one */
-		source = e_source_list_peek_source_any (component_view->source_list);
-		if (source)
-			e_source_selector_set_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector), source);
-	}
-}
-
-static void
 update_primary_task_memo_selection (CalendarComponentView *component_view, ECalSourceType type)
 {
 	ESource *source = NULL;
@@ -283,161 +224,6 @@ update_primary_task_memo_selection (CalendarComponentView *component_view, ECalS
 		gnome_calendar_set_default_source (component_view->calendar, type, source);
 }
 
-/* Callbacks.  */
-static void
-copy_calendar_cb (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	CalendarComponentView *component_view = data;
-	ESource *selected_source;
-
-	selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector));
-	if (!selected_source)
-		return;
-
-	copy_source_dialog (GTK_WINDOW (gtk_widget_get_toplevel (ep->target->widget)), selected_source, E_CAL_SOURCE_TYPE_EVENT);
-}
-
-static void
-delete_calendar_cb (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	CalendarComponentView *component_view = data;
-	ESource *selected_source;
-	ECal *cal;
-	char *uri;
-
-	selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector));
-	if (!selected_source)
-		return;
-
-	if (e_error_run((GtkWindow *)gtk_widget_get_toplevel(ep->target->widget),
-			"calendar:prompt-delete-calendar", e_source_peek_name(selected_source), NULL) != GTK_RESPONSE_YES)
-		return;
-
-	/* 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 (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 (component_view->source_selector),
-								  selected_source)) {
-				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 (component_view->source_list, NULL);
-		}
-	}
-}
-
-static void
-new_calendar_cb (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	calendar_setup_edit_calendar (GTK_WINDOW (gtk_widget_get_toplevel(ep->target->widget)), NULL, pitem->user_data);
-}
-
-static void
-edit_calendar_cb (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	CalendarComponentView *component_view = data;
-	ESource *selected_source;
-
-	selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector));
-	if (!selected_source)
-		return;
-
-	calendar_setup_edit_calendar (GTK_WINDOW (gtk_widget_get_toplevel(ep->target->widget)), selected_source, NULL);
-}
-
-static EPopupItem ecc_source_popups[] = {
-	{ E_POPUP_ITEM, "10.new", N_("_New Calendar"), new_calendar_cb, NULL, "x-office-calendar", 0, 0 },
-	{ E_POPUP_ITEM, "15.copy", N_("_Copy..."), copy_calendar_cb, NULL, "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
-
-	{ E_POPUP_BAR, "20.bar" },
-	{ E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_calendar_cb, NULL, "edit-delete", 0,E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_DELETE },
-
-	{ E_POPUP_BAR, "99.bar" },
-	{ E_POPUP_ITEM, "99.properties", N_("_Properties"), edit_calendar_cb, NULL, "document-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
-};
-
-static void
-ecc_source_popup_free(EPopup *ep, GSList *list, void *data)
-{
-	g_slist_free(list);
-}
-
-static gboolean
-popup_event_cb(ESourceSelector *selector, ESource *insource, GdkEventButton *event, CalendarComponentView *component_view)
-{
-	ECalPopup *ep;
-	ECalPopupTargetSource *t;
-	GSList *menus = NULL;
-	int i;
-	GtkMenu *menu;
-
-	/** @HookPoint-ECalPopup: Calendar Source Selector Context Menu
-	 * @Id: org.gnome.evolution.calendar.source.popup
-	 * @Class: org.gnome.evolution.calendar.popup:1.0
-	 * @Target: ECalPopupTargetSource
-	 *
-	 * The context menu on the source selector in the calendar window.
-	 */
-	ep = e_cal_popup_new("org.gnome.evolution.calendar.source.popup");
-	t = e_cal_popup_target_new_source(ep, selector);
-	t->target.widget = (GtkWidget *)component_view->calendar;
-
-	for (i=0;i<sizeof(ecc_source_popups)/sizeof(ecc_source_popups[0]);i++)
-		menus = g_slist_prepend(menus, &ecc_source_popups[i]);
-
-	e_popup_add_items((EPopup *)ep, menus, NULL, ecc_source_popup_free, component_view);
-
-	menu = e_popup_create_menu_once((EPopup *)ep, (EPopupTarget *)t, 0);
-	gtk_menu_popup(menu, NULL, NULL, NULL, NULL, event?event->button:0, event?event->time:gtk_get_current_event_time());
-
-	return TRUE;
-}
-
-static void
-source_changed_cb (ESource *source, GnomeCalendar *calendar)
-{
-	if (calendar) {
-		GtkWidget *widget = gnome_calendar_get_current_view_widget (calendar);
-
-		if (widget)
-			gtk_widget_queue_draw (widget);
-	}
-}
-
-static void
-source_added_cb (GnomeCalendar *calendar, ECalSourceType source_type, ESource *source, CalendarComponentView *component_view)
-{
-	switch (source_type) {
-	case E_CAL_SOURCE_TYPE_EVENT:
-		e_source_selector_select_source (E_SOURCE_SELECTOR (component_view->source_selector), source);
-		g_signal_connect (source, "changed", G_CALLBACK (source_changed_cb), calendar);
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-source_removed_cb (GnomeCalendar *calendar, ECalSourceType source_type, ESource *source, CalendarComponentView *component_view)
-{
-	switch (source_type) {
-	case E_CAL_SOURCE_TYPE_EVENT:
-		g_signal_handlers_disconnect_by_func (source, G_CALLBACK (source_changed_cb), calendar);
-		e_source_selector_unselect_source (E_SOURCE_SELECTOR (component_view->source_selector), source);
-		break;
-	default:
-		break;
-	}
-}
-
 static void
 config_primary_selection_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
 {
@@ -662,10 +448,8 @@ create_component_view (CalendarComponent *calendar_component)
 {
 	CalendarComponentPrivate *priv;
 	CalendarComponentView *component_view;
-	GtkWidget *selector_scrolled_window, *vbox, *vpane;
-	GtkWidget *statusbar_widget;
+	GtkWidget **vpane;
 	guint not;
-	AtkObject *a11y;
 
 	priv = calendar_component->priv;
 
@@ -682,68 +466,15 @@ create_component_view (CalendarComponent *calendar_component)
 	component_view->source_list = g_object_ref (priv->source_list);
 	component_view->task_source_list = g_object_ref (priv->task_source_list);
 	component_view->memo_source_list = g_object_ref (priv->memo_source_list);
-	component_view->vpane_pos = calendar_config_get_tag_vpane_pos ();
-
 	/* Create sidebar selector */
 	component_view->source_selector = e_source_selector_new (calendar_component->priv->source_list);
-	e_source_selector_set_select_new ((ESourceSelector *)component_view->source_selector, TRUE);
-	a11y = gtk_widget_get_accessible (GTK_WIDGET (component_view->source_selector));
-	atk_object_set_name (a11y, _("Calendar Source Selector"));
 
 	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);
-
-	vbox = gtk_vbox_new(FALSE, 0);
-	gtk_box_pack_start(GTK_BOX (vbox), GTK_WIDGET (component_view->info_label), FALSE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX (vbox), selector_scrolled_window, TRUE, TRUE, 0);
-	gtk_widget_show (vbox);
-
-	gtk_paned_pack1 (GTK_PANED (vpane), vbox, FALSE, FALSE);
-
-	component_view->sidebar_control = bonobo_control_new (vpane);
-
-	/* 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);
-
-	gtk_paned_pack2 (GTK_PANED (vpane), gnome_calendar_get_tag (component_view->calendar), FALSE, FALSE);
-
-	/* This signal is thrown if backends die - we update the selector */
-	g_signal_connect (component_view->calendar, "source_added",
-			  G_CALLBACK (source_added_cb), component_view);
-	g_signal_connect (component_view->calendar, "source_removed",
-			  G_CALLBACK (source_removed_cb), component_view);
-
-	/* Create status bar */
-	statusbar_widget = e_task_bar_new ();
-	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, "popup_event",
-			  G_CALLBACK (popup_event_cb), component_view);
-
 	/* Set up the "new" item handler */
 	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_memo_selection (component_view, E_CAL_SOURCE_TYPE_TODO);
 	update_primary_task_memo_selection (component_view, E_CAL_SOURCE_TYPE_TODO);
 	update_task_memo_selection (component_view, E_CAL_SOURCE_TYPE_JOURNAL);
diff --git a/calendar/gui/control-factory.c b/calendar/gui/control-factory.c
deleted file mode 100644
index 63014b2c4f..0000000000
--- a/calendar/gui/control-factory.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * 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/>  
- *
- *
- * Authors:
- *		Ettore Perazzoli <ettore@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#include <config.h>
-#include <string.h>
-#include <gtk/gtksignal.h>
-#include <glade/glade.h>
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-generic-factory.h>
-#include <bonobo/bonobo-persist-file.h>
-#include <bonobo/bonobo-context.h>
-#include <glade/glade.h>
-#include <libgnomeui/gnome-dialog-util.h>
-
-#include <libecal/e-cal-time-util.h>
-#include <gui/gnome-cal.h>
-#include <gui/calendar-commands.h>
-#include <gui/calendar-config.h>
-
-#include "control-factory.h"
-
-/* Are these supposed to be global or static? */
-CORBA_Environment ev;
-CORBA_ORB orb;
-
-static void
-control_activate_cb (BonoboControl *control, gboolean activate, gpointer data)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
-	if (activate)
-		calendar_control_activate (control, gcal);
-	else
-		calendar_control_deactivate (control, gcal);
-}
-
-BonoboControl *
-control_factory_new_control (void)
-{
-	BonoboControl *control;
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (gnome_calendar_new ());
-	if (!gcal)
-		return NULL;
-
-	gtk_widget_show (GTK_WIDGET (gcal));
-
-	control = bonobo_control_new (GTK_WIDGET (gcal));
-	if (!control) {
-		g_message ("control_factory_fn(): could not create the control!");
-		return NULL;
-	}
-	g_object_set_data (G_OBJECT (gcal), "control", control);
-
-	g_signal_connect (control, "activate", G_CALLBACK (control_activate_cb), gcal);
-
-	return control;
-}
diff --git a/calendar/gui/control-factory.h b/calendar/gui/control-factory.h
deleted file mode 100644
index 2103f458f1..0000000000
--- a/calendar/gui/control-factory.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *
- * 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/>  
- *
- *
- * Authors:
- *		Ettore Perazzoli <ettore@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifndef _CONTROL_FACTORY_H_
-#define _CONTROL_FACTORY_H_
-
-#include <bonobo/bonobo-control.h>
-
-BonoboControl *control_factory_new_control  (void);
-
-#endif /* _CONTROL_FACTORY_H_ */
diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c
index 5556ff8618..25ad6fb852 100644
--- a/calendar/gui/e-cal-list-view.c
+++ b/calendar/gui/e-cal-list-view.c
@@ -361,8 +361,10 @@ e_cal_list_view_show_popup_menu (ECalListView *cal_list_view, gint row, GdkEvent
 {
 	GtkMenu *menu;
 
+#if 0 /* KILL-BONOBO */
 	menu = e_calendar_view_create_popup_menu (E_CALENDAR_VIEW (cal_list_view));
 	gtk_menu_popup(menu, NULL, NULL, NULL, NULL, gdk_event?gdk_event->button.button:0, gdk_event?gdk_event->button.time:gtk_get_current_event_time());
+#endif
 }
 
 static gboolean
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index ee76bf4e66..c4cabe1f45 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -1653,69 +1653,6 @@ static EPopupItem ecv_child_items [] = {
 	{ E_POPUP_ITEM, "54.delete", N_("Delete _All Occurrences"), on_delete_appointment, NULL, GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_RECURRING, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE },
 };
 
-static void
-ecv_popup_free (EPopup *ep, GSList *list, void *data)
-{
-	g_slist_free(list);
-}
-
-GtkMenu *
-e_calendar_view_create_popup_menu (ECalendarView *cal_view)
-{
-	ECalPopup *ep;
-	GSList *menus = NULL;
-	GList *selected, *l;
-	int i;
-	ECalPopupTargetSelect *t;
-	ECalModel *model;
-	GPtrArray *events;
-
-	g_return_val_if_fail (E_IS_CALENDAR_VIEW (cal_view), NULL);
-
-	/* We could do this using a factory on the ECalPopup class,
-	 * that way we would get called implicitly whenever a popup
-	 * menu was created rather than everyone having to call us.
-	 * We could also have a different menu id for each view */
-
-	/** @HookPoint-ECalPopup: Calendar Main View Context Menu
-	 * @Id: org.gnome.evolution.calendar.view.popup
-	 * @Class: org.gnome.evolution.calendar.popup:1.0
-	 * @Target: ECalPopupTargetSelect
-	 *
-	 * The context menu on the main calendar view.  This menu
-	 * applies to all view types.
-	 */
-	ep = e_cal_popup_new("org.gnome.evolution.calendar.view.popup");
-
-	model = e_calendar_view_get_model(cal_view);
-	events = g_ptr_array_new();
-	selected = e_calendar_view_get_selected_events(cal_view);
-	for (l=selected;l;l=g_list_next(l)) {
-		ECalendarViewEvent *event = l->data;
-
-		if (event)
-			g_ptr_array_add(events, e_cal_model_copy_component_data(event->comp_data));
-	}
-	g_list_free(selected);
-
-	t = e_cal_popup_target_new_select(ep, model, events);
-	t->target.widget = (GtkWidget *)cal_view;
-
-	if (t->events->len == 0) {
-		for (i=0;i<sizeof(ecv_main_items)/sizeof(ecv_main_items[0]);i++)
-			menus = g_slist_prepend(menus, &ecv_main_items[i]);
-
-		gnome_calendar_view_popup_factory(cal_view->priv->calendar, (EPopup *)ep, "60.view");
-	} else {
-		for (i=0;i<sizeof(ecv_child_items)/sizeof(ecv_child_items[0]);i++)
-			menus = g_slist_prepend(menus, &ecv_child_items[i]);
-	}
-
-	e_popup_add_items((EPopup *)ep, menus, NULL, ecv_popup_free, cal_view);
-
-	return e_popup_create_menu_once((EPopup *)ep, (EPopupTarget *)t, 0);
-}
-
 void
 e_calendar_view_open_event (ECalendarView *cal_view)
 {
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 7607e027b8..3497dd4326 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -3340,9 +3340,11 @@ e_day_view_show_popup_menu (EDayView *day_view,
 	day_view->popup_event_day = day;
 	day_view->popup_event_num = event_num;
 
+#if 0 /* KILL-BONOBO */
 	popup = e_calendar_view_create_popup_menu (E_CALENDAR_VIEW (day_view));
 	g_object_weak_ref (G_OBJECT (popup), popup_destroyed_cb, day_view);
 	gtk_menu_popup (popup, NULL, NULL, NULL, NULL, gdk_event?gdk_event->button.button:0, gdk_event?gdk_event->button.time:gtk_get_current_event_time());
+#endif
 }
 
 static gboolean
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index ffbb32a398..2b8f303acd 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -4163,9 +4163,11 @@ e_week_view_show_popup_menu (EWeekView	     *week_view,
 
 	week_view->popup_event_num = event_num;
 
+#if 0 /* KILL-BONOBO */
 	popup = e_calendar_view_create_popup_menu (E_CALENDAR_VIEW (week_view));
 	g_object_weak_ref (G_OBJECT (popup), popup_destroyed_cb, week_view);
 	gtk_menu_popup (popup, NULL, NULL, NULL, NULL, bevent?bevent->button:0, bevent?bevent->time:gtk_get_current_event_time());
+#endif
 }
 
 static gboolean
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 0bea1e472a..f479f5ba4b 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -44,11 +44,12 @@
 #include <libedataserver/e-url.h>
 #include <libedataserverui/e-passwords.h>
 
+#include "shell/e-user-creatable-items-handler.h"
 #include <libecal/e-cal-time-util.h>
 #include <widgets/menus/gal-view-factory-etable.h>
 #include <widgets/menus/gal-view-etable.h>
-#include <widgets/menus/gal-view-instance.h>
 #include <widgets/menus/gal-define-views-dialog.h>
+#include "widgets/menus/gal-view-menus.h"
 #include "e-util/e-error.h"
 #include "e-util/e-util-private.h"
 #include "e-comp-editor-registry.h"
@@ -56,6 +57,7 @@
 #include "dialogs/event-editor.h"
 #include "dialogs/task-editor.h"
 #include "comp-util.h"
+#include "e-calendar-marshal.h"
 #include "e-cal-model-calendar.h"
 #include "e-day-view.h"
 #include "e-day-view-config.h"
@@ -67,8 +69,12 @@
 #include "e-mini-calendar-config.h"
 #include "e-calendar-table-config.h"
 #include "e-memo-table-config.h"
+#include "evolution-calendar.h"
 #include "gnome-cal.h"
-/*#include "cal-search-bar.h"*/
+#include "calendar-component.h"
+#include "memos-component.h"
+#include "cal-search-bar.h"
+#include "calendar-commands.h"
 #include "calendar-config.h"
 #include "calendar-view.h"
 #include "calendar-view-factory.h"
@@ -80,12 +86,15 @@
 #include "e-cal-menu.h"
 #include "e-cal-model-tasks.h"
 
+/* FIXME glib 2.4 and above has this */
+#ifndef G_MAXINT32
+#define G_MAXINT32	((gint32)  0x7fffffff)
+#endif
+
 #define d(x) x
 
 /* Private part of the GnomeCalendar structure */
 struct _GnomeCalendarPrivate {
-	gpointer shell_view;  /* weak pointer */
-
 	/* The clients for display */
 
 	GHashTable *clients[E_CAL_SOURCE_TYPE_LAST];
@@ -110,10 +119,8 @@ struct _GnomeCalendarPrivate {
 	ECalendar   *date_navigator;
 	EMiniCalendarConfig *date_navigator_config;
 	GtkWidget   *todo;
-	ECalendarTableConfig *todo_config;
 
 	GtkWidget   *memo;
-	EMemoTableConfig *memo_config;
 
 	GtkWidget   *day_view;
 	GtkWidget   *work_week_view;
@@ -121,6 +128,9 @@ struct _GnomeCalendarPrivate {
 	GtkWidget   *month_view;
 	GtkWidget   *list_view;
 
+	/* Activity */
+	EActivityHandler *activity_handler;
+
 	/* plugin menu managers */
 	ECalMenu    *calendar_menu;
 	ECalMenu    *taskpad_menu;
@@ -155,9 +165,6 @@ struct _GnomeCalendarPrivate {
 	/* The signal handler id for our GtkCalendar "day_selected" handler. */
 	guint	     day_selected_id;
 
-	/* View instance and menus for the control */
-	GalViewInstance *view_instance;
-
 	/* Our current week start */
 	int week_start;
 
@@ -180,10 +187,7 @@ struct _GnomeCalendarPrivate {
 	ECal *user_created_cal;
 };
 
-enum {
-	PROP_0,
-	PROP_SHELL_VIEW
-};
+/* Signal IDs */
 
 enum {
 	DATES_SHOWN_CHANGED,
@@ -200,14 +204,6 @@ enum {
 	LAST_SIGNAL
 };
 
-/* Used to indicate who has the focus within the calendar view */
-typedef enum {
-	FOCUS_CALENDAR,
-	FOCUS_TASKPAD,
-	FOCUS_MEMOPAD,
-	FOCUS_OTHER
-} FocusLocation;
-
 static guint gnome_calendar_signals[LAST_SIGNAL];
 
 
@@ -277,77 +273,14 @@ message_push (Message *msg)
 
 G_DEFINE_TYPE (GnomeCalendar, gnome_calendar, GTK_TYPE_VBOX)
 
-static void
-calendar_set_shell_view (GnomeCalendar *calendar,
-                         EShellView *shell_view)
-{
-	g_return_if_fail (calendar->priv->shell_view == NULL);
-
-	calendar->priv->shell_view = shell_view;
-
-	g_object_add_weak_pointer (
-		G_OBJECT (shell_view),
-		&calendar->priv->shell_view);
-}
-
-static void
-calendar_set_property (GObject *object,
-                       guint property_id,
-                       const GValue *value,
-                       GParamSpec *pspec)
-{
-	switch (property_id) {
-		case PROP_SHELL_VIEW:
-			calendar_set_shell_view (
-				GNOME_CALENDAR (object),
-				g_value_get_object (value));
-			return;
-	}
-
-	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-}
-
-static void
-calendar_get_property (GObject *object,
-                       guint property_id,
-                       GValue *value,
-                       GParamSpec *pspec)
-{
-	switch (property_id) {
-		case PROP_SHELL_VIEW:
-			g_value_set_object (
-				value, gnome_calendar_get_shell_view (
-				GNOME_CALENDAR (object)));
-			return;
-	}
-
-	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-}
-
 /* Class initialization function for the gnome calendar */
 static void
 gnome_calendar_class_init (GnomeCalendarClass *class)
 {
-	GObjectClass *object_class;
-	GtkObjectClass *gtk_object_class;
+	GtkObjectClass *object_class;
 	GtkBindingSet *binding_set;
 
-	object_class = G_OBJECT_CLASS (class);
-	object_class->set_property = calendar_set_property;
-	object_class->get_property = calendar_get_property;
-
-	gtk_object_class = (GtkObjectClass *) class;
-
-	g_object_class_install_property (
-		object_class,
-		PROP_SHELL_VIEW,
-		g_param_spec_object (
-			"shell-view",
-			_("Shell View"),
-			NULL,
-			E_TYPE_SHELL_VIEW,
-			G_PARAM_READWRITE |
-			G_PARAM_CONSTRUCT_ONLY));
+	object_class = (GtkObjectClass *) class;
 
 	gnome_calendar_signals[DATES_SHOWN_CHANGED] =
 		g_signal_new ("dates_shown_changed",
@@ -422,7 +355,7 @@ gnome_calendar_class_init (GnomeCalendarClass *class)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (GnomeCalendarClass, source_added),
 			      NULL, NULL,
-			      e_marshal_VOID__INT_OBJECT,
+			      e_calendar_marshal_VOID__INT_OBJECT,
 			      G_TYPE_NONE,
 			      2,
 			      G_TYPE_INT, G_TYPE_OBJECT);
@@ -433,7 +366,7 @@ gnome_calendar_class_init (GnomeCalendarClass *class)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (GnomeCalendarClass, source_removed),
 			      NULL, NULL,
-			      e_marshal_VOID__INT_OBJECT,
+			      e_calendar_marshal_VOID__INT_OBJECT,
 			      G_TYPE_NONE,
 			      2,
 			      G_TYPE_INT, G_TYPE_OBJECT);
@@ -460,7 +393,7 @@ gnome_calendar_class_init (GnomeCalendarClass *class)
 			      1,
 			      G_TYPE_INT);
 
-	gtk_object_class->destroy = gnome_calendar_destroy;
+	object_class->destroy = gnome_calendar_destroy;
 
 	class->dates_shown_changed = NULL;
 	class->calendar_selection_changed = NULL;
@@ -775,69 +708,6 @@ get_times_for_views (GnomeCalendar *gcal, GnomeCalendarViewType view_type, time_
 	}
 }
 
-/* Gets the focus location based on who is the focused widget within the
- * calendar view.
- */
-static FocusLocation
-get_focus_location (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	ETable *etable, *m_etable;
-
-	priv = gcal->priv;
-
-	etable = e_calendar_table_get_table (E_CALENDAR_TABLE (priv->todo));
-	m_etable = e_memo_table_get_table (E_MEMO_TABLE (priv->memo));
-
-	if (GTK_WIDGET_HAS_FOCUS (etable->table_canvas))
-		return FOCUS_TASKPAD;
-	else if (GTK_WIDGET_HAS_FOCUS (m_etable->table_canvas))
-		return FOCUS_MEMOPAD;
-	else {
-		GtkWidget *widget;
-		EDayView *dv;
-		EWeekView *wv;
-		ECalListView *lv;
-
-		widget = gnome_calendar_get_current_view_widget (gcal);
-
-		switch (priv->current_view_type) {
-		case GNOME_CAL_DAY_VIEW:
-		case GNOME_CAL_WORK_WEEK_VIEW:
-			dv = E_DAY_VIEW (widget);
-
-			if (GTK_WIDGET_HAS_FOCUS (dv->top_canvas)
-			    || GNOME_CANVAS (dv->top_canvas)->focused_item != NULL
-			    || GTK_WIDGET_HAS_FOCUS (dv->main_canvas)
-			    || GNOME_CANVAS (dv->main_canvas)->focused_item != NULL)
-				return FOCUS_CALENDAR;
-			else
-				return FOCUS_OTHER;
-
-		case GNOME_CAL_WEEK_VIEW:
-		case GNOME_CAL_MONTH_VIEW:
-			wv = E_WEEK_VIEW (widget);
-
-			if (GTK_WIDGET_HAS_FOCUS (wv->main_canvas)
-			    || GNOME_CANVAS (wv->main_canvas)->focused_item != NULL)
-				return FOCUS_CALENDAR;
-			else
-				return FOCUS_OTHER;
-
-		case GNOME_CAL_LIST_VIEW:
-			lv = E_CAL_LIST_VIEW (widget);
-
-			if (GTK_WIDGET_HAS_FOCUS (e_table_scrolled_get_table (lv->table_scrolled)))
-				return FOCUS_CALENDAR;
-			else
-				return FOCUS_OTHER;
-
-		default:
-			g_return_val_if_reached (FOCUS_OTHER);
-		}
-	}
-}
-
 /* Computes the range of time that the date navigator is showing */
 static void
 get_date_navigator_range (GnomeCalendar *gcal, time_t *start_time, time_t *end_time)
@@ -1006,7 +876,6 @@ update_query (GnomeCalendar *gcal)
 static void
 set_search_query (GnomeCalendar *gcal, const char *sexp)
 {
-#if 0  /* KILL-BONOBO */
 	GnomeCalendarPrivate *priv;
 	int i;
 	time_t start, end;
@@ -1049,7 +918,6 @@ set_search_query (GnomeCalendar *gcal, const char *sexp)
 
 	/* Set the query on the task pad */
 	update_todo_view (gcal);
-#endif
 }
 
 /* Returns the current time, for the ECalendarItem. */
@@ -1072,7 +940,6 @@ get_current_time (ECalendarItem *calitem, gpointer data)
 	return tmp_tm;
 }
 
-#if 0  /* KILL-BONOBO */
 /* Callback used when the sexp changes in the calendar search bar */
 static void
 search_bar_sexp_changed_cb (CalSearchBar *cal_search, const char *sexp, gpointer data)
@@ -1115,7 +982,6 @@ search_bar_category_changed_cb (CalSearchBar *cal_search, const char *category,
 	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->todo));
 	e_cal_model_set_default_category (model, category);
 }
-#endif
 
 static void
 view_selection_changed_cb (GtkWidget *view, GnomeCalendar *gcal)
@@ -1123,6 +989,7 @@ view_selection_changed_cb (GtkWidget *view, GnomeCalendar *gcal)
 	g_signal_emit (gcal, gnome_calendar_signals[CALENDAR_SELECTION_CHANGED], 0);
 }
 
+
 /**
  * gnome_calendar_emit_user_created_signal
  * Emits "user_created" signal on a gcal and use calendar as a store where was event created.
@@ -1319,6 +1186,37 @@ working_days_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpoin
 }
 
 static void
+set_timezone (GnomeCalendar *calendar)
+{
+	GnomeCalendarPrivate *priv;
+	int i;
+
+	priv = calendar->priv;
+
+	priv->zone = calendar_config_get_icaltimezone ();
+
+	for (i = 0; i < E_CAL_SOURCE_TYPE_LAST; i++) {
+		GList *l;
+
+		for (l = priv->clients_list[i]; l != NULL; l = l->next) {
+			ECal *client = l->data;
+
+			if (e_cal_get_load_state (client) == E_CAL_LOAD_LOADED)
+				/* FIXME Error checking */
+				e_cal_set_default_timezone (client, priv->zone, NULL);
+		}
+
+		if (priv->default_client[i]
+		    && e_cal_get_load_state (priv->default_client[i]) == E_CAL_LOAD_LOADED)
+			/* FIXME Error checking */
+			e_cal_set_default_timezone (priv->default_client[i], priv->zone, NULL);
+	}
+
+	if (priv->views [priv->current_view_type])
+		e_calendar_view_set_timezone (priv->views [priv->current_view_type], priv->zone);
+}
+
+static void
 timezone_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
 {
 	GnomeCalendar *calendar = data;
@@ -1550,9 +1448,7 @@ categories_changed_cb (gpointer object, gpointer user_data)
 		cat_list = g_list_remove (cat_list, cat_list->data);
 	}
 
-#if 0  /* KILL-BONOBO */
 	cal_search_bar_set_categories ((CalSearchBar *)priv->search_bar, cat_array);
-#endif
 
 	g_ptr_array_free (cat_array, TRUE);
 }
@@ -1561,7 +1457,6 @@ categories_changed_cb (gpointer object, gpointer user_data)
 static void
 view_progress_cb (ECalModel *model, const char *message, int percent, ECalSourceType type, GnomeCalendar *gcal)
 {
-#if 0  /* KILL-BONOBO */
 	if (type == E_CAL_SOURCE_TYPE_EVENT) {
 		e_calendar_view_set_status_message (E_CALENDAR_VIEW (gcal->priv->week_view), message, percent);
 	} else if (type == E_CAL_SOURCE_TYPE_TODO) {
@@ -1569,13 +1464,11 @@ view_progress_cb (ECalModel *model, const char *message, int percent, ECalSource
 	} else if (type == E_CAL_SOURCE_TYPE_JOURNAL) {
 		e_memo_table_set_status_message (E_MEMO_TABLE (gcal->priv->memo), message);
 	}
-#endif
 }
 
 static void
 view_done_cb (ECalModel *model, ECalendarStatus status, ECalSourceType type, GnomeCalendar *gcal)
 {
-#if 0  /* KILL-BONOBO */
 	if (type == E_CAL_SOURCE_TYPE_EVENT) {
 		e_calendar_view_set_status_message (E_CALENDAR_VIEW (gcal->priv->week_view), NULL, -1);
 	} else if (type == E_CAL_SOURCE_TYPE_TODO) {
@@ -1583,7 +1476,7 @@ view_done_cb (ECalModel *model, ECalendarStatus status, ECalSourceType type, Gno
 	} else if (type == E_CAL_SOURCE_TYPE_JOURNAL) {
 		e_memo_table_set_status_message (E_MEMO_TABLE (gcal->priv->memo), NULL);
 	}
-#endif
+
 }
 
 GtkWidget *
@@ -1609,14 +1502,12 @@ setup_widgets (GnomeCalendar *gcal)
 
 	priv = gcal->priv;
 
-#if 0  /* KILL-BONOBO */
 	priv->search_bar = cal_search_bar_new (CAL_SEARCH_CALENDAR_DEFAULT);
 	g_signal_connect (priv->search_bar, "sexp_changed",
 			  G_CALLBACK (search_bar_sexp_changed_cb), gcal);
 	g_signal_connect (priv->search_bar, "category_changed",
 			  G_CALLBACK (search_bar_category_changed_cb), gcal);
 	categories_changed_cb (NULL, gcal);
-#endif
 
 	gtk_widget_show (priv->search_bar);
 	gtk_box_pack_start (GTK_BOX (gcal), priv->search_bar, FALSE, FALSE, 6);
@@ -1676,26 +1567,11 @@ setup_widgets (GnomeCalendar *gcal)
 	g_free (tmp);
 	gtk_box_pack_start ((GtkBox *)vbox, label, FALSE, TRUE, 0);
 
-#if 0  /* KILL-BONOBO */
-	priv->todo = e_calendar_table_new ();
-	priv->todo_config = e_calendar_table_config_new (E_CALENDAR_TABLE (priv->todo));
-	gtk_paned_pack1 (GTK_PANED (priv->vpane), vbox, FALSE, TRUE);
-	gtk_box_pack_end ((GtkBox *)vbox, priv->todo, TRUE, TRUE, 0);
-#endif
-
-	gtk_widget_show (priv->todo);
 	gtk_widget_show (label);
 	gtk_widget_show (vbox);
 	gtk_widget_show (sep);
 
-#if 0  /* KILL-BONOBO */
-	filename = g_build_filename (calendar_component_peek_config_directory (calendar_component_peek ()),
-				     "TaskPad", NULL);
-	e_calendar_table_load_state (E_CALENDAR_TABLE (priv->todo), filename);
-
 	update_todo_view (gcal);
-	g_free (filename);
-#endif
 
 	etable = e_calendar_table_get_table (E_CALENDAR_TABLE (priv->todo));
 	g_signal_connect (etable->table_canvas, "focus_in_event",
@@ -1804,7 +1680,6 @@ setup_widgets (GnomeCalendar *gcal)
 		gtk_widget_show (GTK_WIDGET (priv->views[i]));
 	}
 
-#if 0  /* KILL-BONOBO */
 	/* Memo view */
 	vbox = gtk_vbox_new (FALSE, 0);
 	label = gtk_label_new (NULL);
@@ -1812,24 +1687,10 @@ setup_widgets (GnomeCalendar *gcal)
 	gtk_label_set_markup ((GtkLabel *)label, tmp);
 	g_free (tmp);
 	gtk_box_pack_start ((GtkBox *)vbox, label, FALSE, TRUE, 0);
-	priv->memo = e_memo_table_new ();
-	priv->memo_config = e_memo_table_config_new (E_MEMO_TABLE (priv->memo));
-	gtk_paned_pack2 (GTK_PANED (priv->vpane), vbox, TRUE, TRUE);
-	gtk_box_pack_end ((GtkBox *)vbox, priv->memo, TRUE, TRUE, 0);
-#endif
-
-	gtk_widget_show (priv->memo);
 	gtk_widget_show (label);
 	gtk_widget_show (vbox);
 
-#if 0  /* KILL-BONOBO */
-	filename = g_build_filename (memos_component_peek_config_directory (memos_component_peek ()),
-				     "MemoPad", NULL);
-	e_memo_table_load_state (E_MEMO_TABLE (priv->memo), filename);
-#endif
-
 	update_memo_view (gcal);
-	g_free (filename);
 
 	etable = e_memo_table_get_table (E_MEMO_TABLE (priv->memo));
 	g_signal_connect (etable->table_canvas, "focus_in_event",
@@ -1871,7 +1732,6 @@ gnome_calendar_init (GnomeCalendar *gcal)
 
 	priv->calendar_menu = e_cal_menu_new("org.gnome.evolution.calendar.view");
 	priv->taskpad_menu = e_cal_menu_new("org.gnome.evolution.calendar.taskpad");
-	priv->memopad_menu = e_cal_menu_new ("org.gnome.evolution.calendar.memopad");
 
 	priv->dn_queries = NULL;
 	priv->sexp = g_strdup ("#t"); /* Match all */
@@ -1933,29 +1793,23 @@ gnome_calendar_destroy (GtkObject *object)
 			priv->configs[i] = NULL;
 		}
 		g_object_unref (priv->date_navigator_config);
-		g_object_unref (priv->todo_config);
-		g_object_unref (priv->memo_config);
 
 		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 0  /* KILL-BONOBO */
 		/* Save the TaskPad layout. */
 		filename = g_build_filename (calendar_component_peek_config_directory (calendar_component_peek ()),
 					     "TaskPad", NULL);
 		e_calendar_table_save_state (E_CALENDAR_TABLE (priv->todo), filename);
 		g_free (filename);
-#endif
 
-#if 0  /* KILL-BONOBO */
 		/* Save the MemoPad layout. */
 		filename = g_build_filename (memos_component_peek_config_directory (memos_component_peek ()),
 					     "MemoPad", NULL);
 		e_memo_table_save_state (E_MEMO_TABLE (priv->memo), filename);
 		g_free (filename);
-#endif
 
 		if (priv->dn_queries) {
 			for (l = priv->dn_queries; l != NULL; l = l->next) {
@@ -1978,21 +1832,11 @@ gnome_calendar_destroy (GtkObject *object)
 			priv->todo_sexp = NULL;
 		}
 
-		if (priv->memo_sexp) {
-			g_free (priv->memo_sexp);
-			priv->memo_sexp = NULL;
-		}
-
 		if (priv->update_timeout) {
 			g_source_remove (priv->update_timeout);
 			priv->update_timeout = 0;
 		}
 
-		if (priv->view_instance) {
-			g_object_unref (priv->view_instance);
-			priv->view_instance = NULL;
-		}
-
 		if (priv->update_marcus_bains_line_timeout) {
 			g_source_remove (priv->update_marcus_bains_line_timeout);
 			priv->update_marcus_bains_line_timeout = 0;
@@ -2452,233 +2296,6 @@ display_view_cb (GalViewInstance *view_instance, GalView *view, gpointer data)
 
 }
 
-#if 0  /* KILL-BONOBO */
-/**
- * gnome_calendar_setup_view_menus:
- * @gcal: A calendar.
- * @uic: UI controller to use for the menus.
- *
- * Sets up the #GalView menus for a calendar.  This function should be called
- * from the Bonobo control activation callback for this calendar.  Also, the
- * menus should be discarded using gnome_calendar_discard_view_menus().
- **/
-void
-gnome_calendar_setup_view_menus (GnomeCalendar *gcal, BonoboUIComponent *uic)
-{
-	GnomeCalendarPrivate *priv;
-	char *path0, *path1, *etspecfile;
-	CalendarViewFactory *factory;
-	GalViewFactory *gal_factory;
-	static GalViewCollection *collection = NULL;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-	g_return_if_fail (uic != NULL);
-	g_return_if_fail (BONOBO_IS_UI_COMPONENT (uic));
-
-	priv = gcal->priv;
-
-	g_return_if_fail (priv->view_instance == NULL);
-	g_return_if_fail (priv->view_menus == NULL);
-
-	/* Create the view instance */
-	if (collection == NULL) {
-		ETableSpecification *spec;
-
-		collection = gal_view_collection_new ();
-
-		gal_view_collection_set_title (collection, _("Calendar"));
-
-		path0 = g_build_filename (EVOLUTION_GALVIEWSDIR,
-					  "calendar",
-					  NULL);
-		path1 = g_build_filename (calendar_component_peek_base_directory (calendar_component_peek ()),
-					 "views", NULL);
-		gal_view_collection_set_storage_directories (collection,
-							     path0,
-							     path1);
-		g_free (path1);
-		g_free (path0);
-
-		/* Create the views */
-
-		factory = calendar_view_factory_new (GNOME_CAL_DAY_VIEW);
-		gal_view_collection_add_factory (collection, GAL_VIEW_FACTORY (factory));
-		g_object_unref (factory);
-
-		factory = calendar_view_factory_new (GNOME_CAL_WORK_WEEK_VIEW);
-		gal_view_collection_add_factory (collection, GAL_VIEW_FACTORY (factory));
-		g_object_unref (factory);
-
-		factory = calendar_view_factory_new (GNOME_CAL_WEEK_VIEW);
-		gal_view_collection_add_factory (collection, GAL_VIEW_FACTORY (factory));
-		g_object_unref (factory);
-
-		factory = calendar_view_factory_new (GNOME_CAL_MONTH_VIEW);
-		gal_view_collection_add_factory (collection, GAL_VIEW_FACTORY (factory));
-		g_object_unref (factory);
-
-		spec = e_table_specification_new ();
-		etspecfile = g_build_filename (EVOLUTION_ETSPECDIR,
-					       "e-cal-list-view.etspec",
-					       NULL);
-		if (!e_table_specification_load_from_file (spec, etspecfile))
-			g_error ("Unable to load ETable specification file "
-				 "for calendar");
-		g_free (etspecfile);
-		gal_factory = gal_view_factory_etable_new (spec);
-		g_object_unref (spec);
-		gal_view_collection_add_factory (collection, GAL_VIEW_FACTORY (gal_factory));
-		g_object_unref (gal_factory);
-
-		/* Load the collection and create the menus */
-
-		gal_view_collection_load (collection);
-
-	}
-
-	priv->view_instance = gal_view_instance_new (collection, NULL);
-	priv->view_menus = gal_view_menus_new (priv->view_instance);
-	gal_view_menus_apply (priv->view_menus, uic, NULL);
-
-	g_signal_connect (priv->view_instance, "display_view", G_CALLBACK (display_view_cb), gcal);
-	display_view_cb (priv->view_instance, gal_view_instance_get_current_view (priv->view_instance), gcal);
-}
-#endif
-
-/* This is copied/moved from gal-view-instance, only the calendar uses this for a popup menu */
-static void
-gc_set_view(EPopup *ep, EPopupItem *pitem, void *data)
-{
-	GnomeCalendar *gcal = data;
-
-	if (pitem->type & E_POPUP_ACTIVE)
-		gal_view_instance_set_current_view_id(gcal->priv->view_instance, (char *)pitem->user_data);
-}
-
-static void
-gc_save_custom_view(EPopup *ep, EPopupItem *pitem, void *data)
-{
-	GnomeCalendar *gcal = data;
-
-	gal_view_instance_save_as(gcal->priv->view_instance);
-}
-
-static void
-gc_define_views_response(GtkWidget *d, int id, GnomeCalendar *gcal)
-{
-	if (id == GTK_RESPONSE_OK)
-		gal_view_collection_save(gcal->priv->view_instance->collection);
-
-	gtk_widget_destroy(d);
-}
-
-static void
-gc_define_views(EPopup *ep, EPopupItem *pitem, void *data)
-{
-	GnomeCalendar *gcal = data;
-	GtkWidget *dialog = gal_define_views_dialog_new(gcal->priv->view_instance->collection);
-
-	g_signal_connect(dialog, "response", G_CALLBACK(gc_define_views_response), data);
-	gtk_widget_show(dialog);
-}
-
-static EPopupItem gc_popups[] = {
-	/* Code generates the path to fit */
-	{ E_POPUP_BAR, NULL },
-	{ E_POPUP_RADIO|E_POPUP_ACTIVE, NULL, N_("_Custom View"), },
-	{ E_POPUP_ITEM, NULL, N_("_Save Custom View"), gc_save_custom_view },
-
-	/* index == 3, when we have non-custom view */
-
-	{ E_POPUP_BAR, NULL },
-	{ E_POPUP_ITEM, NULL, N_("_Define Views..."), gc_define_views },
-};
-
-static void
-gc_popup_free (EPopup *ep, GSList *list, void *data)
-{
-	while (list) {
-		GSList *n = list->next;
-		EPopupItem *pitem = list->data;
-
-		g_free(pitem->path);
-		g_free(pitem->label);
-		g_free(pitem->user_data);
-		g_free(pitem);
-		g_slist_free_1(list);
-		list = n;
-	}
-}
-
-static void
-gc_popup_free_static (EPopup *ep, GSList *list, void *data)
-{
-	while (list) {
-		GSList *n = list->next;
-		EPopupItem *pitem = list->data;
-
-		g_free(pitem->path);
-		g_free(pitem);
-		g_slist_free_1(list);
-		list = n;
-	}
-}
-
-void
-gnome_calendar_view_popup_factory (GnomeCalendar *gcal, EPopup *ep, const char *prefix)
-{
-	GnomeCalendarPrivate *priv;
-	int length;
-	int i;
-	gboolean found = FALSE;
-	char *id;
-	GSList *menus = NULL;
-	EPopupItem *pitem;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-	g_return_if_fail (prefix != NULL);
-
-	priv = gcal->priv;
-
-	g_return_if_fail (priv->view_instance != NULL);
-
-	length = gal_view_collection_get_count(priv->view_instance->collection);
-	id = gal_view_instance_get_current_view_id (priv->view_instance);
-
-	for (i = 0; i < length; i++) {
-		GalViewCollectionItem *item = gal_view_collection_get_view_item(priv->view_instance->collection, i);
-
-		pitem = g_malloc0(sizeof(*pitem));
-		pitem->type = E_POPUP_RADIO;
-		pitem->path = g_strdup_printf("%s/%02d.item", prefix, i);
-		pitem->label = g_strdup(item->title);
-		pitem->activate = gc_set_view;
-		pitem->user_data = g_strdup(item->id);
-
-		if (!found && id && !strcmp (id, item->id)) {
-			found = TRUE;
-			pitem->type |= E_POPUP_ACTIVE;
-		}
-
-		menus = g_slist_prepend(menus, pitem);
-	}
-
-	if (menus)
-		e_popup_add_items(ep, menus, NULL, gc_popup_free, gcal);
-
-	menus = NULL;
-	for (i = found?3:0; i<sizeof(gc_popups)/sizeof(gc_popups[0]);i++) {
-		pitem = g_malloc0(sizeof(*pitem));
-		memcpy(pitem, &gc_popups[i], sizeof(*pitem));
-		pitem->path = g_strdup_printf("%s/%02d.item", prefix, i+length);
-		menus = g_slist_prepend(menus, pitem);
-	}
-
-	e_popup_add_items(ep, menus, NULL, gc_popup_free_static, gcal);
-}
-
 static void
 gnome_calendar_set_pane_positions	(GnomeCalendar	*gcal)
 {
@@ -2740,7 +2357,6 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal)
 	source = e_cal_get_source (ecal);
 	state = e_cal_get_load_state (ecal);
 
-#if 0  /* KILL-BONOBO */
 	switch (source_type) {
 	case E_CAL_SOURCE_TYPE_EVENT:
 		e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), NULL, -1);
@@ -2753,7 +2369,6 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal)
 	default:
 		break;
 	}
-#endif
 
 	if (status == E_CALENDAR_STATUS_AUTHENTICATION_FAILED && source_type == E_CAL_SOURCE_TYPE_EVENT)
 		auth_cal_forget_password (ecal);
@@ -2801,7 +2416,6 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal)
 
 	g_signal_handlers_disconnect_matched (ecal, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, client_cal_opened_cb, NULL);
 
-#if 0  /* KILL-BONOBO */
 	switch (source_type) {
 	case E_CAL_SOURCE_TYPE_EVENT :
 		msg = g_strdup_printf (_("Loading appointments at %s"), e_cal_get_uri (ecal));
@@ -2837,7 +2451,6 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal)
 	default:
 		g_return_if_reached ();
 	}
-#endif
 }
 
 static void
@@ -2854,7 +2467,6 @@ default_client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar
 	source = e_cal_get_source (ecal);
 	state = e_cal_get_load_state (ecal);
 
-#if 0  /* KILL-BONOBO */
 	switch (source_type) {
 	case E_CAL_SOURCE_TYPE_EVENT:
 		e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), NULL, -1);
@@ -2868,7 +2480,6 @@ default_client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar
 	default:
 		break;
 	}
-#endif
 
 	switch (status) {
 	case E_CALENDAR_STATUS_OK:
@@ -2936,7 +2547,6 @@ open_ecal (GnomeCalendar *gcal, ECal *cal, gboolean only_if_exists, open_func of
 	zone = calendar_config_get_icaltimezone ();
 	e_cal_set_default_timezone (cal, zone, NULL);
 
-#if 0  /* KILL-BONOBO */
 	msg = g_strdup_printf (_("Opening %s"), e_cal_get_uri (cal));
 	switch (e_cal_get_source_type (cal)) {
 	case E_CAL_SOURCE_TYPE_EVENT :
@@ -2954,7 +2564,6 @@ open_ecal (GnomeCalendar *gcal, ECal *cal, gboolean only_if_exists, open_func of
 	}
 
 	g_free (msg);
-#endif
 
 	g_signal_connect (G_OBJECT (cal), "cal_opened", G_CALLBACK (of), gcal);
 	e_cal_open_async (cal, only_if_exists);
@@ -2962,6 +2571,31 @@ open_ecal (GnomeCalendar *gcal, ECal *cal, gboolean only_if_exists, open_func of
 	return TRUE;
 }
 
+/* Callback when we get an error message from the backend */
+static void
+backend_error_cb (ECal *client, const char *message, gpointer data)
+{
+	GnomeCalendar *gcal;
+	GtkDialog *dialog;
+	char *uristr;
+
+	gcal = GNOME_CALENDAR (data);
+
+	uristr = get_uri_without_password (e_cal_get_uri (client));
+
+	dialog = GTK_DIALOG (gtk_message_dialog_new (
+		GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))),
+		GTK_DIALOG_DESTROY_WITH_PARENT,
+		GTK_MESSAGE_ERROR,
+		GTK_BUTTONS_OK,
+		_("Error on %s:\n %s"),
+		uristr, message));
+	gtk_dialog_run (GTK_DIALOG (dialog));
+	gtk_widget_destroy (GTK_WIDGET (dialog));
+
+	g_free (uristr);
+}
+
 /* Callback when the backend dies */
 static void
 backend_died_cb (ECal *ecal, gpointer data)
@@ -2984,7 +2618,6 @@ backend_died_cb (ECal *ecal, gpointer data)
 	priv->clients_list[source_type] = g_list_remove (priv->clients_list[source_type], ecal);
 	g_hash_table_remove (priv->clients[source_type], e_source_peek_uid (source));
 
-#if 0  /* KILL-BONOBO */
 	switch (source_type) {
 	case E_CAL_SOURCE_TYPE_EVENT:
 		id = "calendar:calendar-crashed";
@@ -3012,7 +2645,6 @@ backend_died_cb (ECal *ecal, gpointer data)
 	default:
 		g_return_if_reached ();
 	}
-#endif
 
 	g_object_unref (source);
 
@@ -3033,15 +2665,11 @@ gnome_calendar_construct (GnomeCalendar *gcal)
 }
 
 GtkWidget *
-gnome_calendar_new (EShellView *shell_view)
+gnome_calendar_new (void)
 {
 	GnomeCalendar *gcal;
 
-	g_return_val_if_fail (E_IS_SHELL_VIEW (shell_view), NULL);
-
-	gcal = g_object_new (
-		GNOME_TYPE_CALENDAR,
-		"shell-view", shell_view, NULL);
+	gcal = g_object_new (gnome_calendar_get_type (), NULL);
 
 	if (!gnome_calendar_construct (gcal)) {
 		g_message (G_STRLOC ": Could not construct the calendar GUI");
@@ -3052,14 +2680,6 @@ gnome_calendar_new (EShellView *shell_view)
 	return GTK_WIDGET (gcal);
 }
 
-EShellView *
-gnome_calendar_get_shell_view (GnomeCalendar *calendar)
-{
-	g_return_val_if_fail (GNOME_IS_CALENDAR (calendar), NULL);
-
-	return calendar->priv->shell_view;
-}
-
 /**
  * gnome_calendar_get_calendar_model:
  * @gcal: A calendar view.
@@ -3362,10 +2982,8 @@ gnome_calendar_new_task		(GnomeCalendar *gcal, time_t *dtstart, time_t *dtend)
 	comp = e_cal_component_new ();
 	e_cal_component_set_icalcomponent (comp, icalcomp);
 
-#if 0  /* KILL-BONOBO */
 	category = cal_search_bar_get_category (CAL_SEARCH_BAR (priv->search_bar));
 	e_cal_component_set_categories (comp, category);
-#endif
 
 	dt.value = &itt;
 	dt.tzid = icaltimezone_get_tzid (e_cal_model_get_timezone (model));
@@ -3649,55 +3267,34 @@ gnome_calendar_vpane_resized (GtkWidget *w, GdkEventButton *e, GnomeCalendar *gc
 void
 gnome_calendar_cut_clipboard (GnomeCalendar *gcal)
 {
-	GnomeCalendarPrivate *priv;
-	FocusLocation location;
+	GtkWidget *widget;
 
-	priv = gcal->priv;
-
-	location = get_focus_location (gcal);
+	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
 
-	if (location == FOCUS_CALENDAR) {
-		e_calendar_view_cut_clipboard (E_CALENDAR_VIEW (gnome_calendar_get_current_view_widget (gcal)));
-	} else if (location == FOCUS_TASKPAD)
-		e_calendar_table_cut_clipboard (E_CALENDAR_TABLE (priv->todo));
-	else if (location == FOCUS_MEMOPAD)
-		e_memo_table_cut_clipboard (E_MEMO_TABLE (priv->memo));
+	widget = gnome_calendar_get_current_view_widget (gcal);
+	e_calendar_view_cut_clipboard (E_CALENDAR_VIEW (widget));
 }
 
 void
 gnome_calendar_copy_clipboard (GnomeCalendar *gcal)
 {
-	GnomeCalendarPrivate *priv;
-	FocusLocation location;
+	GtkWidget *widget;
 
-	priv = gcal->priv;
-
-	location = get_focus_location (gcal);
+	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
 
-	if (location == FOCUS_CALENDAR) {
-		e_calendar_view_copy_clipboard (E_CALENDAR_VIEW (gnome_calendar_get_current_view_widget (gcal)));
-	} else if (location == FOCUS_TASKPAD)
-		e_calendar_table_copy_clipboard (E_CALENDAR_TABLE (priv->todo));
-	else if (location == FOCUS_MEMOPAD)
-		e_memo_table_copy_clipboard (E_MEMO_TABLE (priv->memo));
+	widget = gnome_calendar_get_current_view_widget (gcal);
+	e_calendar_view_copy_clipboard (E_CALENDAR_VIEW (widget));
 }
 
 void
 gnome_calendar_paste_clipboard (GnomeCalendar *gcal)
 {
-	GnomeCalendarPrivate *priv;
-	FocusLocation location;
+	GtkWidget *widget;
 
-	priv = gcal->priv;
-
-	location = get_focus_location (gcal);
+	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
 
-	if (location == FOCUS_CALENDAR) {
-		e_calendar_view_paste_clipboard (E_CALENDAR_VIEW (gnome_calendar_get_current_view_widget (gcal)));
-	} else if (location == FOCUS_TASKPAD)
-		e_calendar_table_paste_clipboard (E_CALENDAR_TABLE (priv->todo));
-	else if (location == FOCUS_MEMOPAD)
-		e_memo_table_paste_clipboard (E_MEMO_TABLE (priv->memo));
+	widget = gnome_calendar_get_current_view_widget (gcal);
+	e_calendar_view_paste_clipboard (E_CALENDAR_VIEW (widget));
 }
 
 
@@ -3759,69 +3356,26 @@ gnome_calendar_get_num_events_selected (GnomeCalendar *gcal)
 	return retval;
 }
 
-/**
- * gnome_calendar_get_num_tasks_selected:
- * @gcal: A calendar view.
- *
- * Queries the number of tasks that are currently selected in the task pad of a
- * calendar view.
- *
- * Return value: Number of selected tasks.
- **/
-gint
-gnome_calendar_get_num_tasks_selected (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	ETable *etable;
-
-	g_return_val_if_fail (gcal != NULL, -1);
-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), -1);
-
-	priv = gcal->priv;
-
-	etable = e_calendar_table_get_table (E_CALENDAR_TABLE (priv->todo));
-	return e_table_selected_count (etable);
-}
-
-
 void
-gnome_calendar_delete_selection		(GnomeCalendar  *gcal)
+gnome_calendar_delete_selection (GnomeCalendar *gcal)
 {
-	GnomeCalendarPrivate *priv;
-	FocusLocation location;
-	GtkWidget *view;
+	GtkWidget *widget;
 
 	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
 
-	priv = gcal->priv;
-
-	location = get_focus_location (gcal);
-
-	if (location == FOCUS_CALENDAR) {
-		view = gnome_calendar_get_current_view_widget (gcal);
-
-		e_calendar_view_delete_selected_events (E_CALENDAR_VIEW (view));
-	} else if (location == FOCUS_TASKPAD)
-		e_calendar_table_delete_selected (E_CALENDAR_TABLE (priv->todo));
-	else if (location == FOCUS_MEMOPAD)
-		e_memo_table_delete_selected (E_MEMO_TABLE (priv->memo));
+	widget = gnome_calendar_get_current_view_widget (gcal);
+	e_calendar_view_delete_selected_events (E_CALENDAR_VIEW (widget));
 }
 
 void
 gnome_calendar_delete_selected_occurrence (GnomeCalendar *gcal)
 {
-	FocusLocation location;
-	GtkWidget *view;
+	GtkWidget *widget;
 
 	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
 
-	location = get_focus_location (gcal);
-
-	if (location == FOCUS_CALENDAR) {
-
-		view = gnome_calendar_get_current_view_widget (gcal);
-		e_calendar_view_delete_selected_occurrence (E_CALENDAR_VIEW (view));
-	}
+	widget = gnome_calendar_get_current_view_widget (gcal);
+	e_calendar_view_delete_selected_occurrence (E_CALENDAR_VIEW (widget));
 }
 
 static gboolean
@@ -3854,9 +3408,7 @@ gnome_calendar_purge (GnomeCalendar *gcal, time_t older_than)
 				"                      (make-time \"%s\"))",
 				start, end);
 
-#if 0  /* KILL-BONOBO */
 	e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), _("Purging"), -1);
-#endif
 
 	/* FIXME Confirm expunge */
 	for (l = priv->clients_list[E_CAL_SOURCE_TYPE_EVENT]; l != NULL; l = l->next) {
@@ -3914,9 +3466,7 @@ gnome_calendar_purge (GnomeCalendar *gcal, time_t older_than)
 		g_list_free (objects);
 	}
 
-#if 0 /* KILL-BONOBO */
 	e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), NULL, -1);
-#endif
 
 	g_free (sexp);
 	g_free (start);
diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h
index 6d06f2666b..29865d98fa 100644
--- a/calendar/gui/gnome-cal.h
+++ b/calendar/gui/gnome-cal.h
@@ -27,7 +27,6 @@
 
 #include <time.h>
 #include <gtk/gtk.h>
-#include <shell/e-shell-view.h>
 #include <bonobo/bonobo-ui-component.h>
 #include <misc/e-calendar.h>
 #include <libecal/e-cal.h>
@@ -106,10 +105,7 @@ struct _GnomeCalendarClass {
 GType      gnome_calendar_get_type         	(void);
 GtkWidget *gnome_calendar_construct		(GnomeCalendar *gcal);
 
-GtkWidget *gnome_calendar_new			(EShellView *shell_view);
-EShellView *	gnome_calendar_get_shell_view	(GnomeCalendar *calendar);
-
-void gnome_calendar_set_ui_component (GnomeCalendar *cal, BonoboUIComponent *ui_component);
+GtkWidget *gnome_calendar_new			(void);
 
 ECalendarTable *gnome_calendar_get_task_pad	(GnomeCalendar *gcal);
 
@@ -145,11 +141,6 @@ struct _ECalMenu *gnome_calendar_get_taskpad_menu (GnomeCalendar *gcal);
 struct _ECalMenu *gnome_calendar_get_calendar_menu (GnomeCalendar *gcal);
 struct _ECalMenu *gnome_calendar_get_memopad_menu (GnomeCalendar *gcal);
 
-void gnome_calendar_setup_view_menus (GnomeCalendar *gcal, BonoboUIComponent *uic);
-void gnome_calendar_discard_view_menus (GnomeCalendar *gcal);
-
-void gnome_calendar_view_popup_factory (GnomeCalendar *gcal, struct _EPopup *ep, const char *prefix);
-
 void	   gnome_calendar_set_selected_time_range (GnomeCalendar *gcal,
 						   time_t	  start_time,
 						   time_t	  end_time);
@@ -175,9 +166,6 @@ gboolean   gnome_calendar_get_visible_time_range (GnomeCalendar *gcal,
 /* Returns the number of selected events (0 or 1 at present). */
 gint	   gnome_calendar_get_num_events_selected (GnomeCalendar *gcal);
 
-/* Returns the number of selected tasks */
-gint       gnome_calendar_get_num_tasks_selected (GnomeCalendar *gcal);
-
 /* Get the current timezone. */
 icaltimezone *gnome_calendar_get_timezone	(GnomeCalendar	*gcal);
 
diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c
index 51afab099f..45974af517 100644
--- a/calendar/gui/memos-component.c
+++ b/calendar/gui/memos-component.c
@@ -482,9 +482,7 @@ create_component_view (MemosComponent *memos_component)
 {
 	MemosComponentPrivate *priv;
 	MemosComponentView *component_view;
-	GtkWidget *selector_scrolled_window, *vbox;
 	GtkWidget *statusbar_widget;
-	AtkObject *a11y;
 
 	priv = memos_component->priv;
 
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index 3800f01f0f..7c70192c90 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -74,18 +74,12 @@ typedef struct
 	ETable *table;
 	ETableModel *model;
 
-	EInfoLabel *info_label;
 	GtkWidget *source_selector;
 
 	BonoboControl *view_control;
-	BonoboControl *sidebar_control;
-	BonoboControl *statusbar_control;
 
 	GList *notifications;
 
-	EUserCreatableItemsHandler *creatable_items_handler;
-
-	EActivityHandler *activity_handler;
 } TasksComponentView;
 
 struct _TasksComponentPrivate {
@@ -184,62 +178,6 @@ update_uri_for_primary_selection (TasksComponentView *component_view)
 	calendar_config_set_primary_tasks (e_source_peek_uid (source));
 }
 
-static void
-update_selection (TasksComponentView *component_view)
-{
-	GSList *selection, *uids_selected, *l;
-
-	/* 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 (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 (component_view->source_selector), source);
-	}
-
-	e_source_selector_free_selection (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 (component_view->source_list, uid);
-		if (source)
-			e_source_selector_select_source (E_SOURCE_SELECTOR (component_view->source_selector), source);
-
-		g_free (uid);
-	}
-	g_slist_free (uids_selected);
-}
-
-static void
-update_primary_selection (TasksComponentView *component_view)
-{
-	ESource *source = NULL;
-	char *uid;
-
-	uid = calendar_config_get_primary_tasks ();
-	if (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 (component_view->source_selector), source);
-	} else {
-		/* Try to create a default if there isn't one */
-		source = e_source_list_peek_source_any (component_view->source_list);
-		if (source)
-			e_source_selector_set_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector), source);
-	}
-}
-
 /* Callbacks.  */
 static void
 copy_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
@@ -378,31 +316,6 @@ source_removed_cb (ETasks *tasks, ESource *source, TasksComponentView *component
 	e_source_selector_unselect_source (E_SOURCE_SELECTOR (component_view->source_selector), source);
 }
 
-/* Evolution::Component CORBA methods */
-
-static void
-impl_upgradeFromVersion (PortableServer_Servant servant,
-			 CORBA_short major,
-			 CORBA_short minor,
-			 CORBA_short revision,
-			 CORBA_Environment *ev)
-{
-	GError *err = NULL;
-	TasksComponent *component = TASKS_COMPONENT (bonobo_object_from_servant (servant));
-
-	if (!migrate_tasks(component, major, minor, revision, &err)) {
-		GNOME_Evolution_Component_UpgradeFailed *failedex;
-
-		failedex = GNOME_Evolution_Component_UpgradeFailed__alloc();
-		failedex->what = CORBA_string_dup(_("Failed upgrading tasks."));
-		failedex->why = CORBA_string_dup(err->message);
-		CORBA_exception_set(ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Component_UpgradeFailed, failedex);
-	}
-
-	if (err)
-		g_error_free(err);
-}
-
 static gboolean
 update_single_object (ECal *client, icalcomponent *icalcomp)
 {
@@ -721,42 +634,11 @@ create_new_todo (TasksComponent *task_component, gboolean is_assigned, TasksComp
 	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, FALSE, component_view);
-	} else if (strcmp (item_type_name, CREATE_TASK_ASSIGNED_ID) == 0) {
-		create_new_todo (tasks_component, TRUE, 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;
-	GtkWidget *statusbar_widget;
-	AtkObject *a11y;
 
 	priv = tasks_component->priv;
 
@@ -768,38 +650,10 @@ create_component_view (TasksComponent *tasks_component)
 
 	/* Create sidebar selector */
 	component_view->source_selector = e_source_selector_new (tasks_component->priv->source_list);
-	e_source_selector_set_select_new ((ESourceSelector *)component_view->source_selector, TRUE);
-	a11y = gtk_widget_get_accessible (GTK_WIDGET (component_view->source_selector));
-	atk_object_set_name (a11y, _("Task Source Selector"));
 
 	g_signal_connect (component_view->source_selector, "drag-data-received",
 			  G_CALLBACK (selector_tree_drag_data_received), tasks_component);
 
-	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);
-
-	vbox = gtk_vbox_new(FALSE, 0);
-	gtk_box_pack_start(GTK_BOX (vbox), GTK_WIDGET (component_view->info_label), 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);
 	component_view->table = e_calendar_table_get_table (e_tasks_get_calendar_table (component_view->tasks));
 	component_view->model = E_TABLE_MODEL (e_calendar_table_get_model (e_tasks_get_calendar_table (component_view->tasks)));
@@ -808,16 +662,6 @@ create_component_view (TasksComponent *tasks_component)
 	g_signal_connect (component_view->tasks, "source_removed",
 			  G_CALLBACK (source_removed_cb), component_view);
 
-	/* Create status bar */
-	statusbar_widget = e_task_bar_new ();
-	component_view->activity_handler = e_activity_handler_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);
-
-	e_calendar_table_set_activity_handler (e_tasks_get_calendar_table (component_view->tasks), component_view->activity_handler);
-
 	/* 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",
@@ -827,10 +671,6 @@ create_component_view (TasksComponent *tasks_component)
 	g_signal_connect (component_view->source_selector, "popup_event",
 			  G_CALLBACK (popup_event_cb), component_view);
 
-	/* Load the selection from the last run */
-	update_selection (component_view);
-	update_primary_selection (component_view);
-
 	return component_view;
 }
 
@@ -852,12 +692,6 @@ destroy_component_view (TasksComponentView *component_view)
 		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);
 }
 
@@ -882,38 +716,6 @@ view_destroyed_cb (gpointer data, GObject *where_the_object_was)
 	}
 }
 
-static GNOME_Evolution_ComponentView
-impl_createView (PortableServer_Servant servant,
-		 GNOME_Evolution_ShellView parent,
-		 CORBA_boolean select_item,
-		 CORBA_Environment *ev)
-{
-	TasksComponent *component = TASKS_COMPONENT (bonobo_object_from_servant (servant));
-	TasksComponentPrivate *priv;
-	TasksComponentView *component_view;
-	EComponentView *ecv;
-
-	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 CORBA_OBJECT_NIL;
-	}
-
-	g_object_weak_ref (G_OBJECT (component_view->view_control), view_destroyed_cb, component);
-	priv->views = g_list_append (priv->views, component_view);
-
-	/* TODO: Make TasksComponentView just subclass EComponentView */
-	ecv = e_component_view_new_controls (parent, "tasks", component_view->sidebar_control,
-					     component_view->view_control, component_view->statusbar_control);
-
-	return BONOBO_OBJREF(ecv);
-}
-
 static void
 impl_handleURI (PortableServer_Servant servant, const char *uri, CORBA_Environment *ev)
 {
@@ -1073,8 +875,6 @@ tasks_component_class_init (TasksComponentClass *klass)
 
 	parent_class = g_type_class_peek_parent (klass);
 
-	epv->upgradeFromVersion      = impl_upgradeFromVersion;
-	epv->createView		     = impl_createView;
 	epv->requestCreateItem       = impl_requestCreateItem;
 	epv->handleURI               = impl_handleURI;
 
@@ -1091,5 +891,3 @@ tasks_component_init (TasksComponent *component, TasksComponentClass *klass)
 
 	component->priv = priv;
 }
-
-BONOBO_TYPE_FUNC_FULL (TasksComponent, GNOME_Evolution_Component, PARENT_TYPE, tasks_component)
diff --git a/calendar/modules/e-cal-shell-content.c b/calendar/modules/e-cal-shell-content.c
index 7529893026..8300c657ca 100644
--- a/calendar/modules/e-cal-shell-content.c
+++ b/calendar/modules/e-cal-shell-content.c
@@ -34,20 +34,128 @@
 	((obj), E_TYPE_CAL_SHELL_CONTENT, ECalShellContentPrivate))
 
 struct _ECalShellContentPrivate {
-	gint dummy;
+	GtkWidget *hpaned;
+	GtkWidget *notebook;
+	GtkWidget *vpaned;
+
+	GtkWidget *day_view;
+	GtkWidget *work_week_view;
+	GtkWidget *week_view;
+	GtkWidget *month_view;
+	GtkWidget *list_view;
+	GtkWidget *task_table;
+	GtkWidget *memo_table;
+
+	EDayViewConfig *day_view_config;
+	EDayViewConfig *work_week_view_config;
+	EWeekViewConfig *week_view_config;
+	EWeekViewConfig *month_view_config;
+	ECalListViewConfig *list_view_config;
+	ECalendarTableConfig *task_table_config;
+	EMemoTableConfig *memo_table_config;
+
+	GalViewInstance *view_instance;
 };
 
 enum {
 	PROP_0
 };
 
+/* Used to indicate who has the focus within the calendar view. */
+typedef enum {
+	FOCUS_CALENDAR,
+	FOCUS_MEMO_TABLE,
+	FOCUS_TASK_TABLE,
+	FOCUS_OTHER
+} FocusLocation;
+
 static gpointer parent_class;
 
 static void
+cal_shell_content_changed_cb (ECalShellContent *cal_shell_content,
+                              GalViewInstance *view_instance)
+{
+	EShellView *shell_view;
+	EShellContent *shell_content;
+	gchar *view_id;
+
+	shell_content = E_SHELL_CONTENT (cal_shell_content);
+	shell_view = e_shell_content_get_shell_view (shell_content);
+	view_id = gal_view_instance_get_current_view_id (view_instance);
+	e_shell_view_set_view_id (shell_view, view_id);
+	g_free (view_id);
+}
+
+static void
+cal_shell_content_display_view_cb (ECalShellContent *cal_shell_content,
+                                   GalView *gal_view)
+{
+}
+
+static FocusLocation
+cal_shell_content_get_focus_location (ECalShellContent *cal_shell_content)
+{
+	GtkWidget *widget;
+	GnomeCalendar *calendar;
+	ECalendarTable *task_table;
+	EMemoTable *memo_table;
+	ETable *table;
+	ECalendarView *calendar_view;
+
+	calendar = GNOME_CALENDAR (cal_shell_content->priv->calendar);
+	widget = gnome_calendar_get_current_view_widget (calendar);
+
+	memo_table = E_MEMO_TABLE (cal_shell_content->priv->memo_table);
+	task_table = E_CALENDAR_TABLE (cal_shell_content->priv->task_table);
+
+	table = e_memo_table_get_table (memo_table);
+	if (GTK_WIDGET_HAS_FOCUS (table->table_canvas))
+		return FOCUS_MEMO_TABLE;
+
+	table = e_calendar_table_get_table (task_table);
+	if (GTK_WIDGET_HAS_FOCUS (table->table_canvas))
+		return FOCUS_TASK_TABLE;
+
+	if (E_IS_DAY_VIEW (widget)) {
+		EDayView *view = E_DAY_VIEW (widget);
+
+		if (GTK_WIDGET_HAS_FOCUS (view->top_canvas))
+			return FOCUS_CALENDAR;
+
+		if (GNOME_CANVAS (view->top_canvas)->focused_item != NULL)
+			return FOCUS_CALENDAR;
+
+		if (GTK_WIDGET_HAS_FOCUS (view->main_canvas))
+			return FOCUS_CALENDAR;
+
+		if (GNOME_CANVAS (view->main_canvas)->focused_item != NULL)
+			return FOCUS_CALENDAR;
+
+	} else if (E_IS_WEEK_VIEW (widget)) {
+		EWeekView *view = E_WEEK_VIEW (widget);
+
+		if (GTK_WIDGET_HAS_FOCUS (view->main_canvas))
+			return FOCUS_CALENDAR;
+
+		if (GNOME_CANVAS (view->main_canvas)->focused_item != NULL)
+			return FOCUS_CALENDAR;
+
+	} else if (E_IS_CAL_LIST_VIEW (widget)) {
+		ECalListView *view = E_CAL_LIST_VIEW (widget);
+
+		table = e_table_scrolled_get_table (view->table_scrolled);
+		if (GTK_WIDGET_HAS_FOCUS (table))
+			return FOCUS_CALENDAR;
+	}
+
+	return FOCUS_OTHER;
+}
+
+static void
 cal_shell_content_set_property (GObject *object,
-                                 guint property_id,
-                                 const GValue *value,
-                                 GParamSpec *pspec)
+                                guint property_id,
+                                const GValue *value,
+                                GParamSpec *pspec)
 {
 	switch (property_id) {
 	}
@@ -57,9 +165,9 @@ cal_shell_content_set_property (GObject *object,
 
 static void
 cal_shell_content_get_property (GObject *object,
-                                 guint property_id,
-                                 GValue *value,
-                                 GParamSpec *pspec)
+                                guint property_id,
+                                GValue *value,
+                                GParamSpec *pspec)
 {
 	switch (property_id) {
 	}
@@ -74,6 +182,96 @@ cal_shell_content_dispose (GObject *object)
 
 	priv = E_CAL_SHELL_CONTENT_GET_PRIVATE (object);
 
+	if (priv->hpaned != NULL) {
+		g_object_unref (priv->hpaned);
+		priv->hpaned = NULL;
+	}
+
+	if (priv->notebook != NULL) {
+		g_object_unref (priv->notebook);
+		priv->notebook = NULL;
+	}
+
+	if (priv->vpaned != NULL) {
+		g_object_unref (priv->vpaned);
+		priv->vpaned = NULL;
+	}
+
+	if (priv->day_view != NULL) {
+		g_object_unref (priv->day_view);
+		priv->day_view = NULL;
+	}
+
+	if (priv->work_week_view != NULL) {
+		g_object_unref (priv->work_week_view);
+		priv->work_week_view = NULL;
+	}
+
+	if (priv->week_view != NULL) {
+		g_object_unref (priv->week_view);
+		priv->week_view = NULL;
+	}
+
+	if (priv->month_view != NULL) {
+		g_object_unref (priv->month_view);
+		priv->month_view = NULL;
+	}
+
+	if (priv->list_view != NULL) {
+		g_object_unref (priv->list_view);
+		priv->list_view = NULL;
+	}
+
+	if (priv->task_table != NULL) {
+		g_object_unref (priv->task_table);
+		priv->task_table = NULL;
+	}
+
+	if (priv->memo_table != NULL) {
+		g_object_unref (priv->memo_table);
+		priv->memo_table = NULL;
+	}
+
+	if (priv->day_view_config != NULL) {
+		g_object_unref (priv->day_view_config);
+		priv->day_view_config = NULL;
+	}
+
+	if (priv->work_week_view_config != NULL) {
+		g_object_unref (priv->work_week_view_config);
+		priv->work_week_view_config = NULL;
+	}
+
+	if (priv->week_view_config != NULL) {
+		g_object_unref (priv->week_view_config);
+		priv->week_view_config = NULL;
+	}
+
+	if (priv->month_view_config != NULL) {
+		g_object_unref (priv->month_view_config);
+		priv->month_view_config = NULL;
+	}
+
+	if (priv->list_view_config != NULL) {
+		g_object_unref (priv->list_view_config);
+		priv->list_view_config = NULL;
+	}
+
+	if (priv->task_table_config != NULL) {
+		g_object_unref (priv->task_table_config);
+		priv->task_table_config = NULL;
+	}
+
+	if (priv->memo_table_config != NULL) {
+		g_object_unref (priv->memo_table_config);
+		priv->memo_table_config = NULL;
+	}
+
+	if (priv->view_instance != NULL) {
+		g_object_unref (priv->view_instance);
+		priv->view_instance = NULL;
+	}
+
 	/* Chain up to parent's dispose() method. */
 	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
@@ -93,12 +291,217 @@ static void
 cal_shell_content_constructed (GObject *object)
 {
 	ECalShellContentPrivate *priv;
+	ECalModelCalendar *cal_model;
+	EShellContent *shell-content;
+	EShellModule *shell_module;
+	EShellView *shell_view;
+	EShellViewClass *shell_view_class;
+	GalViewCollection *view_collection;
+	GalViewInstnace *view_instance;
+	GtkWidget *container;
+	GtkWidget *widget;
+	const gchar *config_dir;
+	gchar *filename;
+	gchar *markup;
+	gint page_num;
 
 	priv = E_CAL_SHELL_CONTENT_GET_PRIVATE (object);
 
 	/* Chain up to parent's constructed() method. */
 	G_OBJECT_CLASS (parent_class)->constructed (object);
 
+	shell_content = E_SHELL_CONTENT (object);
+	shell_view = e_shell_content_get_shell_view (shell_content);
+	shell_view_class = E_SHELL_VIEW_GET_CLASS (shell_view);
+	view_collection = shell_view_class->view_collection;
+
+	shell_module = e_shell_view_get_shell_module (shell_view);
+	config_dir = e_shell_module_get_config_dir (shell_module);
+
+	/* Calendar model for the views. */
+	cal_model = e_cal_model_calendar_new ();
+	e_cal_model_set_flags (
+		E_CAL_MODEL (cal_model),
+		E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES);
+
+	/* Build content widgets. */
+
+	container = GTK_WIDGET (object);
+
+	/* FIXME Need to deal with saving and restoring the position.
+	 *       Month view has its own position. */
+	widget = gtk_hpaned_new ();
+	gtk_container_add (GTK_CONTAINER (container), widget);
+	priv->hpaned = g_object_ref (widget);
+	gtk_widget_show (widget);
+
+	container = priv->hpaned;
+
+	widget = gtk_notebook_new ();
+	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (widget), FALSE);
+	gtk_notebook_set_show_border (GTK_NOTEBOOK (widget), FALSE);
+	gtk_paned_pack1 (GTK_PANED (container), widget, FALSE, TRUE);
+	priv->notebook = g_object_ref (widget);
+	gtk_widget_show (widget);
+
+	/* FIXME Need to deal with saving and restoring the position.
+	 *       Month view has its own position. */
+	widget = gtk_vpaned_new ();
+	gtk_paned_pack2 (GTK_PANED (container), widget, TRUE, TRUE);
+	priv->vpaned = g_object_ref ();
+	gtk_widget_show (widget);
+
+	container = priv->notebook;
+
+	/* Add views in the order defined by GnomeCalendarViewType, such
+	 * that the notebook page number corresponds to the view type.
+	 * The assertions below ensure that stays true. */
+
+	/* FIXME Need to establish a calendar and timezone first. */
+	widget = e_day_view_new (E_CAL_MODEL (cal_model));
+	e_calendar_view_set_calendar (
+		E_CALENDAR_VIEW (widget), GNOME_CALENDAR (priv->calendar));
+	e_calendar_view_set_timezone (
+		E_CALENDAR_VIEW (widget), priv->timezone);
+	page_num = gtk_notebook_get_n_pages (GTK_NOTEBOOK (widget));
+	gtk_notebook_append_page (GTK_NOTEBOOK (container), widget, NULL);
+	g_return_if_fail (page_num == GNOME_CAL_DAY_VIEW);
+	priv->day_view = g_object_ref (widget);
+	gtk_widget_show (widget);
+
+	/* FIXME Need to establish a calendar and timezone first. */
+	widget = e_day_view_new (E_CAL_MODEL (cal_model));
+	e_day_view_set_work_week_view (E_DAY_VIEW (widget), TRUE);
+	e_day_view_set_days_shown (E_DAY_VIEW (widget), 5);
+	e_calendar_view_set_calendar (
+		E_CALENDAR_VIEW (widget), GNOME_CALENDAR (priv->calendar));
+	e_calendar_view_set_timezone (
+		E_CALENDAR_VIEW (widget), priv->timezone);
+	page_num = gtk_notebook_get_n_pages (GTK_NOTEBOOK (widget));
+	gtk_notebook_append_page (GTK_NOTEBOOK (container), widget, NULL);
+	g_return_if_fail (page_num == GNOME_CAL_WORK_WEEK_VIEW);
+	priv->work_week_view = g_object_ref (widget);
+	gtk_widget_show (widget);
+
+	/* FIXME Need to establish a calendar and timezone first. */
+	widget = e_week_view_new (E_CAL_MODEL (cal_model));
+	e_calendar_view_set_calendar (
+		E_CALENDAR_VIEW (widget), GNOME_CALENDAR (priv->calendar));
+	e_calendar_view_set_timezone (
+		E_CALENDAR_VIEW (widget), priv->timezone);
+	page_num = gtk_notebook_get_n_pages (GTK_NOTEBOOK (widget));
+	gtk_notebook_append_page (GTK_NOTEBOOK (container), widget, NULL);
+	g_return_if_fail (page_num == GNOME_CAL_WEEK_VIEW);
+	priv->week_view = g_object_ref (widget);
+	gtk_widget_show (widget);
+
+	/* FIXME Need to establish a calendar and timezone first. */
+	widget = e_week_view_new (E_CAL_MODEL (cal_model));
+	e_week_view_set_multi_week_view (E_WEEK_VIEW (widget), TRUE);
+	e_week_view_set_weeks_shown (E_WEEK_VIEW (widget), 6);
+	e_calendar_view_set_calendar (
+		E_CALENDAR_VIEW (widget), GNOME_CALENDAR (priv->calendar));
+	e_calendar_view_set_timezone (
+		E_CALENDAR_VIEW (widget), priv->timezone);
+	page_num = gtk_notebook_get_n_pages (GTK_NOTEBOOK (widget));
+	gtk_notebook_append_page (GTK_NOTEBOOK (container), widget, NULL);
+	g_return_if_fail (page_num == GNOME_CAL_MONTH_VIEW);
+	priv->month_view = g_object_ref (widget);
+	gtk_widget_show (widget);
+
+	/* FIXME Need to establish a calendar and timezone first. */
+	widget = e_cal_list_view_new (E_CAL_MODEL (cal_model));
+	e_calendar_view_set_calendar (
+		E_CALENDAR_VIEW (widget), GNOME_CALENDAR (priv->calendar));
+	e_calendar_view_set_timezone (
+		E_CALENDAR_VIEW (widget), priv->timezone);
+	page_num = gtk_notebook_get_n_pages (GTK_NOTEBOOK (widget));
+	gtk_notebook_append_page (GTK_NOTEBOOK (container), widget, NULL);
+	g_return_if_fail (page_num == GNOME_CAL_LIST_VIEW);
+	priv->list_view = g_object_ref (widget);
+	gtk_widget_show (widget);
+
+	container = priv->vpaned;
+
+	widget = gtk_vbox_new (FALSE, 0);
+	gtk_paned_pack1 (GTK_PANED (container), widget, TRUE, TRUE);
+	gtk_widget_show (widget);
+
+	container = widget;
+
+	widget = gtk_hseparator_new ();
+	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
+	gtk_widget_show (widget);
+
+	widget = gtk_label_new (NULL);
+	markup = g_strdup_printf ("<b>%s</b>", _("Tasks"));
+	gtk_label_set_markup (GTK_LABEL (widget), markup);
+	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
+	gtk_widget_show (widget);
+	g_free (markup);
+
+	widget = e_calendar_table_new ();
+	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
+	priv->task_table = g_object_ref ();
+	gtk_widget_show (widget);
+
+	filename = g_build_filename (config_dir, "TaskPad", NULL);
+	e_calendar_table_load_state (E_CALENDAR_TABLE (widget), filename);
+	g_free (filename);
+
+	container = priv->vpaned;
+
+	widget = gtk_vbox_new (FALSE, 0);
+	gtk_paned_pack2 (GTK_PANED (container), widget, TRUE, TRUE);
+	gtk_widget_show (widget);
+
+	container = widget;
+
+	widget = gtk_label_new (NULL);
+	markup = g_strdup_printf ("<b>%s</b>", _("Memos"));
+	gtk_label_set_markup (GTK_LABEL (widget), markup);
+	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
+	gtk_widget_show (widget);
+	g_free (markup);
+
+	widget = e_memo_table_new ();
+	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
+	priv->memo_table = g_object_ref ();
+	gtk_widget_show (widget);
+
+	filename = g_build_filename (config_dir, "MemoPad", NULL);
+	e_memo_table_load_state (E_MEMO_TABLE (widget), filename);
+	g_free (filename);
+
+	/* Configuration managers for views and tables. */
+	priv->day_view_config = e_day_view_config_new (
+		E_DAY_VIEW (priv->day_view));
+	priv->work_week_view_config = e_day_view_config_new (
+		E_DAY_VIEW (priv->work_week_view));
+	priv->week_view_config = e_week_view_config_new (
+		E_WEEK_VIEW (priv->week_view));
+	priv->month_view_config = e_week_view_config_new (
+		E_WEEK_VIEW (priv->month_view));
+	priv->list_view_config = e_cal_list_view_config_new (
+		E_CAL_LIST_VIEW (priv->list_view));
+	priv->task_table_config = e_calendar_table_config_new (
+		E_CALENDAR_TABLE (priv->task_table));
+	priv->memo_table_config = e_memo_table_config_new (
+		E_MEMO_TABLE (priv->memo_table));
+
+	/* Load the view instance. */
+
+	view_instance = gal_view_instance_new (view_collection, NULL);
+	g_signal_connect_swapped (
+		view_instance, "changed",
+		G_CALLBACK (cal_shell_content_changed_cb),
+		object);
+	g_signal_connect_swapped (
+		view_instance, "display-view",
+		G_CALLBACK (cal_shell_content_display_view_cb),
+		object);
+	gal_view_instance_load (view_instance);
+	priv->view_instance = view_instance;
 }
 
 static void
@@ -162,3 +565,187 @@ e_cal_shell_content_new (EShellView *shell_view)
 		E_TYPE_CAL_SHELL_CONTENT,
 		"shell-view", shell_view, NULL);
 }
+
+GnomeCalendar *
+e_cal_shell_content_get_calendar (ECalShellContent *cal_shell_content)
+{
+	g_return_val_if_fail (
+		E_IS_CAL_SHELL_CONTENT (cal_shell_content), NULL);
+
+	return GNOME_CALENDAR (cal_shell_content->priv->calendar);
+}
+
+EMemoTable *
+e_cal_shell_content_get_memo_table (ECalShellContent *cal_shell_content)
+{
+	g_return_val_if_fail (
+		E_IS_CAL_SHELL_CONTENT (cal_shell_content), NULL);
+
+	return E_MEMO_TABLE (cal_shell_content->priv->memo_table);
+}
+
+ECalendarTable *
+e_cal_shell_content_get_task_table (ECalShellContent *cal_shell_content)
+{
+	g_return_val_if_fail (
+		E_IS_CAL_SHELL_CONTENT (cal_shell_content), NULL);
+
+	return E_CALENDAR_TABLE (cal_shell_content->priv->task_table);
+}
+
+icaltimezone *
+e_cal_shell_content_get_timezone (ECalShellContent *cal_shell_content)
+{
+	g_return_val_if_fail (
+		E_IS_CAL_SHELL_CONTENT (cal_shell_content), NULL);
+
+	return cal_shell_content->priv->timezone;
+}
+
+GalViewInstance *
+e_cal_shell_content_get_view_instance (ECalShellContent *cal_shell_content)
+{
+	g_return_val_if_fail (
+		E_IS_CAL_SHELL_CONTENT (cal_shell_content), NULL);
+
+	return cal_shell_content->priv->view_instance;
+}
+
+void
+e_cal_shell_content_copy_clipboard (ECalShellContent *cal_shell_content)
+{
+	GnomeCalendar *calendar;
+	EMemoTable *memo_table;
+	ECalendarTable *task_table;
+
+	g_return_if_fail (E_IS_CAL_SHELL_CONTENT (cal_shell_content));
+
+	calendar = e_cal_shell_content_get_calendar (cal_shell_content);
+	memo_table = e_cal_shell_content_get_memo_table (cal_shell_content);
+	task_table = e_cal_shell_content_get_task_table (cal_shell_content);
+
+	switch (cal_shell_content_get_focus_location (cal_shell_content)) {
+		case FOCUS_CALENDAR:
+			gnome_calendar_copy_clipboard (calendar);
+			break;
+
+		case FOCUS_MEMO_TABLE:
+			e_memo_table_copy_clipboard (memo_table);
+			break;
+
+		case FOCUS_TASK_TABLE:
+			e_calendar_table_copy_clipboard (task_table);
+			break;
+
+		default:
+			g_return_if_reached ();
+	}
+}
+
+void
+e_cal_shell_content_cut_clipboard (ECalShellContent *cal_shell_content)
+{
+	GnomeCalendar *calendar;
+	EMemoTable *memo_table;
+	ECalendarTable *task_table;
+
+	g_return_if_fail (E_IS_CAL_SHELL_CONTENT (cal_shell_content));
+
+	calendar = e_cal_shell_content_get_calendar (cal_shell_content);
+	memo_table = e_cal_shell_content_get_memo_table (cal_shell_content);
+	task_table = e_cal_shell_content_get_task_table (cal_shell_content);
+
+	switch (cal_shell_content_get_focus_location (cal_shell_content)) {
+		case FOCUS_CALENDAR:
+			gnome_calendar_cut_clipboard (calendar);
+			break;
+
+		case FOCUS_MEMO_TABLE:
+			e_memo_table_copy_clipboard (memo_table);
+			break;
+
+		case FOCUS_TASK_TABLE:
+			e_calendar_table_copy_clipboard (task_table);
+			break;
+
+		default:
+			g_return_if_reached ();
+	}
+}
+
+void
+e_cal_shell_content_paste_clipboard (ECalShellContent *cal_shell_content)
+{
+	GnomeCalendar *calendar;
+	EMemoTable *memo_table;
+	ECalendarTable *task_table;
+
+	g_return_if_fail (E_IS_CAL_SHELL_CONTENT (cal_shell_content));
+
+	calendar = e_cal_shell_content_get_calendar (cal_shell_content);
+	memo_table = e_cal_shell_content_get_memo_table (cal_shell_content);
+	task_table = e_cal_shell_content_get_task_table (cal_shell_content);
+
+	switch (cal_shell_content_get_focus_location (cal_shell_content)) {
+		case FOCUS_CALENDAR:
+			gnome_calendar_paste_clipboard (calendar);
+			break;
+
+		case FOCUS_MEMO_TABLE:
+			e_memo_table_copy_clipboard (memo_table);
+			break;
+
+		case FOCUS_TASK_TABLE:
+			e_calendar_table_copy_clipboard (task_table);
+			break;
+
+		default:
+			g_return_if_reached ();
+	}
+}
+
+void
+e_cal_shell_content_delete_selection (ECalShellContent *cal_shell_content)
+{
+	GnomeCalendar *calendar;
+	EMemoTable *memo_table;
+	ECalendarTable *task_table;
+
+	g_return_if_fail (E_IS_CAL_SHELL_CONTENT (cal_shell_content));
+
+	calendar = e_cal_shell_content_get_calendar (cal_shell_content);
+	memo_table = e_cal_shell_content_get_memo_table (cal_shell_content);
+	task_table = e_cal_shell_content_get_task_table (cal_shell_content);
+
+	switch (cal_shell_content_get_focus_location (cal_shell_content)) {
+		case FOCUS_CALENDAR:
+			gnome_calendar_delete_selection (calendar);
+			break;
+
+		case FOCUS_MEMO_TABLE:
+			e_memo_table_delete_selected (memo_table);
+			break;
+
+		case FOCUS_TASK_TABLE:
+			e_calendar_table_delete_selected (task_table);
+			break;
+
+		default:
+			g_return_if_reached ();
+	}
+}
+
+void
+e_cal_shell_content_delete_selected_occurrence (ECalShellContent *cal_shell_content)
+{
+	GnomeCalendar *calendar;
+	FocusLocation focus;
+
+	g_return_if_fail (E_IS_CAL_SHELL_CONTENT (cal_shell_content));
+
+	focus = cal_shell_content_get_focus_location (cal_shell_content);
+	calendar = e_cal_shell_content_get_calendar (cal_shell_content);
+
+	if (focus == FOCUS_CALENDAR)
+		gnome_calendar_delete_selected_occurrence (calendar);
+}
diff --git a/calendar/modules/e-cal-shell-content.h b/calendar/modules/e-cal-shell-content.h
index c7b78c52a4..5d8a56a185 100644
--- a/calendar/modules/e-cal-shell-content.h
+++ b/calendar/modules/e-cal-shell-content.h
@@ -25,6 +25,8 @@
 #include <shell/e-shell-content.h>
 #include <shell/e-shell-view.h>
 
+#include <calendar/gui/e-memo-table.h>
+#include <calendar/gui/gnome-cal.h>
 #include <widgets/menus/gal-view-instance.h>
 
 /* Standard GObject macros */
@@ -63,9 +65,25 @@ struct _ECalShellContentClass {
 
 GType		e_cal_shell_content_get_type	(void);
 GtkWidget *	e_cal_shell_content_new	(EShellView *shell_view);
+GnomeCalendar *	e_cal_shell_content_get_calendar(ECalShellContent *cal_shell_content);
+EMemoTable *	e_cal_shell_content_get_memo_table
+						(ECalShellContent *cal_shell_content);
+ECalendarTable *e_cal_shell_content_get_task_table
+						(ECalShellContent *cal_shell_content);
+icaltimezone *	e_cal_shell_content_get_timezone(ECalShellContent *cal_shell_content);
 GalViewInstance *
 		e_cal_shell_content_get_view_instance
 						(ECalShellContent *cal_shell_content);
+void		e_cal_shell_content_copy_clipboard
+						(ECalShellContent *cal_shell_content);
+void		e_cal_shell_content_cut_clipboard
+						(ECalShellContent *cal_shell_content);
+void		e_cal_shell_content_paste_clipboard
+						(ECalShellContent *cal_shell_content);
+void		e_cal_shell_content_delete_selection
+						(ECalShellContent *cal_shell_content);
+void		e_cal_shell_content_delete_selected_occurrence
+						(ECalShellContent *cal_shell_content);
 
 G_END_DECLS
 
diff --git a/calendar/modules/e-cal-shell-module.c b/calendar/modules/e-cal-shell-module.c
index 17c4b2152b..88f743f1ee 100644
--- a/calendar/modules/e-cal-shell-module.c
+++ b/calendar/modules/e-cal-shell-module.c
@@ -307,10 +307,10 @@ cal_module_cal_opened_cb (ECal *cal,
 
 	flags |= COMP_EDITOR_NEW_ITEM;
 	flags |= COMP_EDITOR_USER_ORG;
-	if (strcmp (action_name, "meeting-new") == 0)
+	if (strcmp (action_name, "event-meeting-new") == 0)
 		flags |= COMP_EDITOR_MEETING;
 
-	all_day = (strcmp (action_name, "appointment-all-day-new") == 0);
+	all_day = (strcmp (action_name, "event-all-day-new") == 0);
 
 	editor = event_editor_new (cal, flags);
 	comp = cal_comp_event_new_with_current_time (cal, all_day);
@@ -372,21 +372,21 @@ action_calendar_new_cb (GtkAction *action,
 
 static GtkActionEntry item_entries[] = {
 
-	{ "appointment-new",
+	{ "event-new",
 	  "appointment-new",
 	  N_("_Appointment"),  /* XXX Need C_() here */
 	  "<Control>a",
 	  N_("Create a new appointment"),
 	  G_CALLBACK (action_event_new_cb) },
 
-	{ "appointment-all-day-new",
+	{ "event-all-day-new",
 	  "stock_new-24h-appointment",
 	  N_("All Day A_ppointment"),
 	  NULL,
 	  N_("Create a new all-day appointment"),
 	  G_CALLBACK (action_event_new_cb) },
 
-	{ "meeting-new",
+	{ "event-meeting-new",
 	  "stock_new-meeting",
 	  N_("M_eeting"),
 	  "<Control>e",
@@ -450,10 +450,9 @@ e_shell_module_init (GTypeModule *type_module)
 	shell_module = E_SHELL_MODULE (type_module);
 	shell = e_shell_module_get_shell (shell_module);
 
-	/* Register the GType for ECalShellView. */
-	e_cal_shell_view_get_type (type_module);
-
-	e_shell_module_set_info (shell_module, &module_info);
+	e_shell_module_set_info (
+		shell_module, &module_info,
+		e_cal_shell_view_get_type (type_module));
 
 	cal_module_ensure_sources (shell_module);
 
diff --git a/calendar/modules/e-cal-shell-sidebar.c b/calendar/modules/e-cal-shell-sidebar.c
index bbe0c15caf..707770df81 100644
--- a/calendar/modules/e-cal-shell-sidebar.c
+++ b/calendar/modules/e-cal-shell-sidebar.c
@@ -28,6 +28,7 @@
 #include "calendar/common/authentication.h"
 #include "calendar/gui/calendar-config.h"
 #include "calendar/gui/e-calendar-selector.h"
+#include "calendar/gui/e-mini-calendar-config.h"
 #include "calendar/gui/misc.h"
 
 #include "e-cal-shell-view.h"
@@ -37,14 +38,19 @@
 	((obj), E_TYPE_CAL_SHELL_SIDEBAR, ECalShellSidebarPrivate))
 
 struct _ECalShellSidebarPrivate {
+	GtkWidget *paned;
 	GtkWidget *selector;
+	GtkWidget *mini_calendar;
 
 	/* UID -> Client */
 	GHashTable *client_table;
+
+	EMiniCalendarConfig *mini_calendar_config;
 };
 
 enum {
 	PROP_0,
+	PROP_MINI_CALENDAR,
 	PROP_SELECTOR
 };
 
@@ -86,33 +92,6 @@ cal_shell_sidebar_emit_status_message (ECalShellSidebar *cal_shell_sidebar,
 }
 
 static void
-cal_shell_sidebar_update_timezone (ECalShellSidebar *cal_shell_sidebar)
-{
-	GHashTable *client_table;
-	icaltimezone *zone;
-	GList *values;
-
-	zone = calendar_config_get_icaltimezone ();
-	client_table = cal_shell_sidebar->priv->client_table;
-	values = g_hash_table_get_values (client_table);
-
-	while (values != NULL) {
-		ECal *client = values->data;
-
-		if (e_cal_get_load_state (client) == E_CAL_LOAD_LOADED)
-			e_cal_set_default_timezone (client, zone, NULL);
-
-		values = g_list_delete_link (values, values);
-	}
-
-	/* XXX Need to call e_calendar_view_set_timezone() here but the
-	 *     sidebar is not really supposed to access content stuff.
-	 *     I guess we could emit an "update-timezone" signal here,
-	 *     but that feels wrong.  Maybe this whole thing should be
-	 *     in ECalShellView instead. */
-}
-
-static void
 cal_shell_sidebar_backend_died_cb (ECalShellSidebar *cal_shell_sidebar,
                                    ECal *client)
 {
@@ -305,6 +284,12 @@ cal_shell_sidebar_get_property (GObject *object,
                                 GParamSpec *pspec)
 {
 	switch (property_id) {
+		case PROP_MINI_CALENDAR:
+			g_value_set_object (
+				value, e_cal_shell_sidebar_get_mini_calendar (
+				E_CAL_SHELL_SIDEBAR (object)));
+			return;
+
 		case PROP_SELECTOR:
 			g_value_set_object (
 				value, e_cal_shell_sidebar_get_selector (
@@ -322,13 +307,28 @@ cal_shell_sidebar_dispose (GObject *object)
 
 	priv = E_CAL_SHELL_SIDEBAR_GET_PRIVATE (object);
 
+	if (priv->paned != NULL) {
+		g_object_unref (priv->paned);
+		priv->paned = NULL;
+	}
+
 	if (priv->selector != NULL) {
 		g_object_unref (priv->selector);
 		priv->selector = NULL;
 	}
 
+	if (priv->mini_calendar != NULL) {
+		g_object_unref (priv->mini_calendar);
+		priv->mini_calendar = NULL;
+	}
+
 	g_hash_table_remove_all (priv->client_table);
 
+	if (priv->mini_calendar_config != NULL) {
+		g_object_unref (priv->mini_calendar_config);
+		priv->mini_calendar = NULL;
+	}
+
 	/* Chain up to parent's dispose() method. */
 	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
@@ -356,9 +356,11 @@ cal_shell_sidebar_constructed (GObject *object)
 	ESourceSelector *selector;
 	ESourceList *source_list;
 	ESource *source;
-	GtkContainer *container;
+	ECalendarItem *calitem;
 	GtkTreeModel *model;
+	GtkWidget *container;
 	GtkWidget *widget;
+	AtkObject *a11y;
 	GSList *list, *iter;
 	gchar *uid;
 
@@ -372,7 +374,14 @@ cal_shell_sidebar_constructed (GObject *object)
 	cal_shell_view = E_CAL_SHELL_VIEW (shell_view);
 	source_list = e_cal_shell_view_get_source_list (cal_shell_view);
 
-	container = GTK_CONTAINER (shell_sidebar);
+	container = GTK_WIDGET (shell_sidebar);
+
+	widget = gtk_vpaned_new ();
+	gtk_container_add (GTK_CONTAINER (container), widget);
+	priv->paned = g_object_ref (widget);
+	gtk_widget_show (widget);
+
+	container = widget;
 
 	widget = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_policy (
@@ -380,17 +389,33 @@ cal_shell_sidebar_constructed (GObject *object)
 		GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	gtk_scrolled_window_set_shadow_type (
 		GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN);
-	gtk_container_add (container, widget);
+	gtk_paned_add1 (GTK_PANED (container), widget);
 	gtk_widget_show (widget);
 
-	container = GTK_CONTAINER (widget);
+	container = widget;
 
 	widget = e_calendar_selector_new (source_list);
 	e_source_selector_set_select_new (E_SOURCE_SELECTOR (widget), TRUE);
-	gtk_container_add (container, widget);
+	gtk_container_add (GTK_CONTAINER (container), widget);
+	a11y = gtk_widget_get_accessible (widget);
+	atk_object_set_name (a11y, _("Calendar Selector"));
 	priv->selector = g_object_ref (widget);
 	gtk_widget_show (widget);
 
+	container = priv->paned;
+
+	widget = e_calendar_new ();
+	calitem = E_CALENDAR (widget)->calitem;
+	e_calendar_item_set_days_start_week_sel (calitem, 9);
+	e_calendar_item_set_max_days_sel (calitem, 42);
+	widget = gnome_calendar_new (shell_view);
+	gtk_paned_add2 (GTK_PANED (container), widget);
+	priv->mini_calendar = g_object_ref (widget);
+	gtk_widget_show (widget);
+
+	priv->mini_calendar_config =
+		e_mini_calendar_config_new (E_CALENDAR (widget));
+
 	/* Restore the selector state from the last session. */
 
 	selector = E_SOURCE_SELECTOR (priv->selector);
@@ -488,6 +513,16 @@ cal_shell_sidebar_class_init (ECalShellSidebarClass *class)
 
 	g_object_class_install_property (
 		object_class,
+		PROP_MINI_CALENDAR,
+		g_param_spec_object (
+			"mini-calendar",
+			_("Mini-Calendar Widget"),
+			_("This widget displays a miniature calendar"),
+			E_TYPE_CALENDAR,
+			G_PARAM_READABLE));
+
+	g_object_class_install_property (
+		object_class,
 		PROP_SELECTOR,
 		g_param_spec_object (
 			"selector",
@@ -582,6 +617,15 @@ e_cal_shell_sidebar_new (EShellView *shell_view)
 		"shell-view", shell_view, NULL);
 }
 
+ECalendar *
+e_cal_shell_sidebar_get_mini_calendar (ECalShellSidebar *cal_shell_sidebar)
+{
+	g_return_val_if_fail (
+		E_IS_CAL_SHELL_SIDEBAR (cal_shell_sidebar), NULL);
+
+	return E_CALENDAR (cal_shell_sidebar->priv->mini_calendar);
+}
+
 ESourceSelector *
 e_cal_shell_sidebar_get_selector (ECalShellSidebar *cal_shell_sidebar)
 {
@@ -666,3 +710,26 @@ e_cal_shell_sidebar_remove_source (ECalShellSidebar *cal_shell_sidebar,
 
 	cal_shell_sidebar_emit_client_removed (cal_shell_sidebar, client);
 }
+
+void
+e_cal_shell_sidebar_update_timezone (ECalShellSidebar *cal_shell_sidebar)
+{
+	GHashTable *client_table;
+	icaltimezone *timezone;
+	GList *values;
+
+	g_return_if_fail (E_CAL_SHELL_SIDEBAR (cal_shell_sidebar));
+
+	timezone = calendar_config_get_icaltimezone ();
+	client_table = cal_shell_sidebar->priv->client_table;
+	values = g_hash_table_get_values (client_table);
+
+	while (values != NULL) {
+		ECal *client = values->data;
+
+		if (e_cal_get_load_state (client) == E_CAL_LOAD_LOADED)
+			e_cal_set_default_timezone (client, timezone, NULL);
+
+		values = g_list_delete_link (values, values);
+	}
+}
diff --git a/calendar/modules/e-cal-shell-sidebar.h b/calendar/modules/e-cal-shell-sidebar.h
index 49b89c556e..eecb6a0365 100644
--- a/calendar/modules/e-cal-shell-sidebar.h
+++ b/calendar/modules/e-cal-shell-sidebar.h
@@ -27,6 +27,7 @@
 
 #include <shell/e-shell-sidebar.h>
 #include <shell/e-shell-view.h>
+#include <widgets/misc/e-calendar.h>
 
 /* Standard GObject macros */
 #define E_TYPE_CAL_SHELL_SIDEBAR \
@@ -72,6 +73,8 @@ struct _ECalShellSidebarClass {
 
 GType		e_cal_shell_sidebar_get_type	(void);
 GtkWidget *	e_cal_shell_sidebar_new		(EShellView *shell_view);
+ECalendar *	e_cal_shell_sidebar_get_mini_calendar
+						(ECalShellSidebar *cal_shell_sidebar);
 ESourceSelector *
 		e_cal_shell_sidebar_get_selector(ECalShellSidebar *cal_shell_sidebar);
 void		e_cal_shell_sidebar_add_source	(ECalShellSidebar *cal_shell_sidebar,
@@ -79,6 +82,8 @@ void		e_cal_shell_sidebar_add_source	(ECalShellSidebar *cal_shell_sidebar,
 void		e_cal_shell_sidebar_remove_source
 						(ECalShellSidebar *cal_shell_sidebar,
 						 ESource *source);
+void		e_cal_shell_sidebar_update_timezone
+						(ECalShellSidebar *cal_shell_sidebar);
 
 G_END_DECLS
 
diff --git a/calendar/modules/e-cal-shell-view-actions.c b/calendar/modules/e-cal-shell-view-actions.c
index 18c740d28b..4e077b273f 100644
--- a/calendar/modules/e-cal-shell-view-actions.c
+++ b/calendar/modules/e-cal-shell-view-actions.c
@@ -25,48 +25,187 @@ static void
 action_calendar_copy_cb (GtkAction *action,
                          ECalShellView *cal_shell_view)
 {
+	ECalShellSidebar *cal_shell_sidebar;
+	EShellWindow *shell_window;
+	EShellView *shell_view;
+	ESourceSelector *selector;
+	ESource *source;
+
+	shell_view = E_SHELL_VIEW (cal_shell_view);
+	shell_window = e_shell_view_get_shell_window (shell_view);
+
+	cal_shell_sidebar = cal_shell_view->priv->cal_shell_sidebar;
+	selector = e_cal_shell_sidebar_get_selector (cal_shell_sidebar);
+	source = e_source_selector_peek_primary_selection (selector);
+	g_return_if_fail (E_IS_SOURCE (source));
+
+	copy_source_dialog (
+		GTK_WINDOW (shell_window),
+		source, E_CAL_SOURCE_TYPE_EVENT);
 }
 
 static void
 action_calendar_delete_cb (GtkAction *action,
                            ECalShellView *cal_shell_view)
 {
+	ECalShellContent *cal_shell_content;
+	ECalShellSidebar *cal_shell_sidebar;
+	EShellWindow *shell_window;
+	EShellView *shell_view;
+	ECalendarView *calendar_view;
+	GnomeCalendarViewType view_type;
+	ECalModel *model;
+	ESourceSelector *selector;
+	ESourceGroup *source_group;
+	ESourceList *source_list;
+	ESource *source;
+	gint response;
+	gchar *uri;
+	GError *error = NULL;
+
+	shell_view = E_SHELL_VIEW (cal_shell_view);
+	shell_window = e_shell_view_get_shell_window (shell_view);
+
+	cal_shell_content = cal_shell_content->priv->cal_shell_content;
+	view_type = e_cal_shell_content_get_current_view (cal_shell_content);
+	calendar_view = e_cal_shell_content_get_calendar_view (
+		cal_shell_content, view_type);
+	model = e_calendar_view_get_model (calendar_view);
+
+	cal_shell_sidebar = cal_shell_sidebar->priv->cal_shell_sidebar;
+	selector = e_cal_shell_sidebar_get_selector (cal_shell_sidebar);
+	source = e_source_selector_peek_primary_selection (selector);
+	g_return_if_fail (E_IS_SOURCE (source));
+
+	/* Ask for confirmation. */
+	response = e_error_run (
+		GTK_WINDOW (shell_window),
+		"calendar:prompt-delete-calendar",
+		e_source_peek_name (source));
+	if (response != GTK_RESPONSE_YES)
+		return;
+
+	uri = e_source_get_uri (source);
+	client = e_cal_model_get_client_for_uri (model, uri);
+	if (client == NULL)
+		client = e_cal_new_from_uri (uri, E_CAL_SOURCE_TYPE_EVENT);
+	g_free (uri);
+
+	g_return_if_fail (client != NULL);
+
+	if (!e_cal_remove (client, &error)) {
+		g_warning ("%s", error->message);
+		g_error_free (error);
+		return;
+	}
+
+	if (e_source_selector_source_is_selected (selector, source)) {
+		e_cal_shell_sidebar_remove_source (
+			cal_shell_sidebar, source);
+		e_source_selector_unselect_source (selector, source);
+	}
+
+	source_group = e_source_peek_group (source);
+	e_source_group_remove_source (source_group, source);
+
+	source_list = cal_shell_view->priv->source_list;
+	if (!e_source_list_sync (source_list, &error)) {
+		g_warning ("%s", error->message);
+		g_error_free (error);
+	}
 }
 
 static void
 action_calendar_go_back_cb (GtkAction *action,
                             ECalShellView *cal_shell_view)
 {
+	ECalShellContent *cal_shell_content;
+	GnomeCalendar *calendar;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	calendar = e_shell_content_get_calendar (cal_shell_content);
+
+	gnome_claendar_previous (calendar);
 }
 
 static void
 action_calendar_go_forward_cb (GtkAction *action,
                                ECalShellView *cal_shell_view)
 {
+	ECalShellContent *cal_shell_content;
+	GnomeCalendar *calendar;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	calendar = e_shell_content_get_calendar (cal_shell_content);
+
+	gnome_calendar_next (calendar);
 }
 
 static void
 action_calendar_go_today_cb (GtkAction *action,
                              ECalShellView *cal_shell_view)
 {
+	ECalShellContent *cal_shell_content;
+	GnomeCalendar *calendar;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	calendar = e_cal_shell_content_get_calendar (cal_shell_content);
+
+	gnome_calendar_goto_today (calendar);
 }
 
 static void
 action_calendar_jump_to_cb (GtkAction *action,
                             ECalShellView *cal_shell_view)
 {
+	ECalShellContent *cal_shell_content;
+	GnomeCalendar *calendar;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	calendar = e_cal_shell_content_get_calendar (cal_shell_content);
+
+	goto_dialog (calendar);
 }
 
 static void
 action_calendar_new_cb (GtkAction *action,
                         ECalShellView *cal_shell_view)
 {
+	EShellView *shell_view;
+	EShellWindow *shell_window;
+
+	shell_view = E_SHELL_VIEW (cal_shell_view);
+	shell_window = e_shell_view_get_shell_window (shell_view);
+	calendar_setup_new_calendar (GTK_WINDOW (shell_window));
 }
 
 static void
 action_calendar_print_cb (GtkAction *action,
                           ECalShellView *cal_shell_view)
 {
+	ECalShellContent *cal_shell_content;
+	GnomeCalendar *calendar;
+	GtkPrintOperationAction print_action;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	calendar = e_cal_shell_content_get_calendar (cal_shell_content);
+	print_action = GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG;
+
+	if (gnome_calendar_get_view (calendar) == GNOME_CAL_LIST_VIEW) {
+		ECalListView *list_view;
+		GtkWidget *widget;
+		ETable *table;
+
+		widget = gnome_calendar_get_current_view_widget (calendar);
+		list_view = E_CAL_LIST_VIEW (widget);
+		table = e_table_scrolled_get_table (list_view->table_scrolled);
+		print_table (table, _("Print"), _("Calendar"), action);
+	} else {
+		time_t start;
+
+		gnome_calendar_get_current_time_range (calendar, &start, NULL);
+		print_calendar (calendar, action, start);
+	}
 }
 
 static void
@@ -74,17 +213,56 @@ action_calendar_print_preview_cb (GtkAction *action,
                                   ECalShellView *cal_shell_view)
 {
 }
+	ECalShellContent *cal_shell_content;
+	GnomeCalendar *calendar;
+	GtkPrintOperationAction print_action;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	calendar = e_cal_shell_content_get_calendar (cal_shell_content);
+	print_action = GTK_PRINT_OPERATION_ACTION_PREVIEW;
+
+	if (gnome_calendar_get_view (calendar) == GNOME_CAL_LIST_VIEW) {
+		ECalListView *list_view;
+		GtkWidget *widget;
+		ETable *table;
+
+		widget = gnome_calendar_get_current_view_widget (calendar);
+		list_view = E_CAL_LIST_VIEW (widget);
+		table = e_table_scrolled_get_table (list_view->table_scrolled);
+		print_table (table, _("Print"), _("Calendar"), action);
+	} else {
+		time_t start;
+
+		gnome_calendar_get_current_time_range (calendar, &start, NULL);
+		print_calendar (calendar, action, start);
+	}
 
 static void
 action_calendar_properties_cb (GtkAction *action,
                                ECalShellView *cal_shell_view)
 {
+	ECalShellSidebar *cal_shell_sidebar;
+	EShellView *shell_view;
+	EShellWindow *shell_window;
+	ESource *source;
+	ESourceSelector *selector;
+
+	shell_view = E_SHELL_VIEW (cal_shell_view);
+	shell_window = e_shell_view_get_shell_window (shell_view);
+
+	cal_shell_sidebar = cal_shell_view->priv->cal_shell_sidebar;
+	selector = e_cal_shell_sidebar_get_selector (cal_shell_sidebar);
+	source = e_source_selector_peek_primary_selection (selector);
+	g_return_if_fail (E_IS_SOURCE (source));
+
+	calendar_setup_edit_calendar (GTK_WINDOW (shell_window), source);
 }
 
 static void
 action_calendar_purge_cb (GtkAction *action,
                           ECalShellView *cal_shell_view)
 {
+	/* FIXME */
 }
 
 static void
@@ -92,48 +270,230 @@ action_calendar_view_cb (GtkRadioAction *action,
                          GtkRadioAction *current,
                          ECalShellView *cal_shell_view)
 {
+	EShellView *shell_view;
+	GnomeCalendarViewType view_type;
+	const gchar *view_id;
+
+	shell_view = E_SHELL_VIEW (cal_shell_view);
+	view_type = gtk_radio_action_get_current_value (action);
+
+	switch (view_type) {
+		case GNOME_CAL_DAY_VIEW:
+			view_id = "Day_View";
+			break;
+
+		case GNOME_CAL_WORK_WEEK_VIEW:
+			view_id = "Work_Week_View";
+			break;
+
+		case GNOME_CAL_WEEK_VIEW:
+			view_id = "Week_View";
+			break;
+
+		case GNOME_CAL_MONTH_VIEW:
+			view_id = "Month_View";
+			break;
+
+		case GNOME_CAL_LIST_VIEW:
+			view_id = "List_View";
+			break;
+
+		default:
+			g_return_if_reached ();
+	}
+
+	e_shell_view_set_view_id (shell_view, view_id);
 }
 
 static void
 action_event_clipboard_copy_cb (GtkAction *action,
                                 ECalShellView *cal_shell_view)
 {
+	ECalShellContent *cal_shell_content;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	e_cal_shell_content_copy_clipboard (cal_shell_content);
 }
 
 static void
 action_event_clipboard_cut_cb (GtkAction *action,
                                ECalShellView *cal_shell_view)
 {
+	ECalShellContent *cal_shell_content;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	e_cal_shell_content_cut_clipboard (cal_shell_content);
 }
 
 static void
 action_event_clipboard_paste_cb (GtkAction *action,
                                  ECalShellView *cal_shell_view)
 {
+	ECalShellContent *cal_shell_content;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	e_cal_shell_content_paste_clipboard (cal_shell_content);
+}
+
+static void
+action_event_copy_cb (GtkAction *action,
+                      ECalShellView *cal_shell_view)
+{
+	/* FIXME */
+}
+
+static void
+action_event_delegate_cb (GtkAction *action,
+                          ECalShellView *cal_shell_view)
+{
+	/* FIXME */
 }
 
 static void
 action_event_delete_cb (GtkAction *action,
                         ECalShellView *cal_shell_view)
 {
+	ECalShellContent *cal_shell_content;
+
+	cal_shell_content = cal_shell-view->priv->cal_shell_content;
+	e_cal_shell_content_delete_selection (cal_shell_content);
 }
 
 static void
 action_event_delete_occurrence_cb (GtkAction *action,
                                    ECalShellView *cal_shell_view)
 {
+	ECalShellContent *cal_shell_content;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	e_cal_shell_content_delete_selected_occurrence (cal_shell_content);
 }
 
 static void
 action_event_delete_occurrence_all_cb (GtkAction *action,
                                        ECalShellView *cal_shell_view)
 {
+	ECalShellContent *cal_shell_content;
+	GnomeCalendar *calendar;
+
+	/* XXX Same as "event-delete". */
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	e_cal_shell_content_delete_selection (cal_shell_content);
+}
+
+static void
+action_event_forward_cb (GtkAction *action,
+                         ECalShellView *cal_shell_view)
+{
+	/* FIXME */
+}
+
+static void
+action_event_move_cb (GtkAction *action,
+                      ECalShellView *cal_shell_view)
+{
+	/* FIXME */
+}
+
+static void
+action_event_occurrence_movable_cb (GtkAction *action,
+                                    ECalShellView *cal_shell_view)
+{
+	/* FIXME */
 }
 
 static void
 action_event_open_cb (GtkAction *action,
                       ECalShellView *cal_shell_view)
 {
+	ECalShellContent *cal_shell_content;
+	GnomeCalendar *calendar;
+	GtkWidget *widget;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	calendar = e_cal_shell_content_get_calendar (cal_shell_content);
+	widget = gnome_calendar_get_current_view_widget (calendar);
+
+	e_calendar_view_open_event (E_CALENDAR_VIEW (widget));
+}
+
+static void
+action_event_print_cb (GtkAction *action,
+                       ECalShellView *cal_shell_view)
+{
+	/* FIXME */
+}
+
+static void
+action_event_reply_cb (GtkAction *action,
+                       ECalShellView *cal_shell_view)
+{
+	/* FIXME */
+}
+
+static void
+action_event_reply_all_cb (GtkAction *action,
+                           ECalShellView *cal_shell_view)
+{
+	/* FIXME */
+}
+
+static void
+action_event_save_as_cb (GtkAction *action,
+                         ECalShellView *cal_shell_view)
+{
+	/* FIXME */
+}
+
+static void
+action_event_schedule_cb (GtkAction *action,
+                          ECalShellView *cal_shell_view)
+{
+	/* FIXME */
+}
+
+static void
+action_gal_save_custom_view_cb (GtkAction *action,
+                                ECalShellView *cal_shell_view)
+{
+	ECalShellContent *cal_shell_content;
+	EShellView *shell_view;
+	GalViewInstance *view_instance;
+
+	/* All shell views respond to the activation of this action,
+	 * which is defined by EShellWindow.  But only the currently
+	 * active shell view proceeds with saving the custom view. */
+	shell_view = E_SHELL_VIEW (cal_shell_view);
+	if (!e_shell_view_is_active (shell_view))
+		return;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	view_instance = e_cal_shell_content_get_view_instance (cal_shell_content);
+	gal_view_instance_save_as (view_instance);
+}
+
+static void
+action_search_execute_cb (GtkAction *action,
+                          ECalShellView *cal_shell_view)
+{
+	EShellView *shell_view;
+
+	/* All shell views respond to the activation of this action,
+	 * which is defined by EShellWindow.  But only the currently
+	 * active shell view proceeds with executing the search. */
+	shell_view = E_SHELL_VIEW (cal_shell_view);
+	if (!e_shell_view_is_active (shell_view))
+		return;
+
+	e_cal_shell_view_execute_search (cal_shell_view);
+}
+
+static void
+action_search_filter_cb (GtkRadioAction *action,
+                         GtkRadioAction *current,
+                         ECalShellView *cal_shell_view)
+{
+	e_cal_shell_view_execute_search (cal_shell_view);
 }
 
 static GtkActionEntry calendar_entries[] = {
@@ -236,6 +596,20 @@ static GtkActionEntry calendar_entries[] = {
 	  N_("Paste the clipboard"),
 	  G_CALLBACK (action_event_clipboard_paste_cb) },
 
+	{ "event-copy",
+	  NULL,
+	  N_("Cop_y to Calendar..."),
+	  NULL,
+	  NULL,  /* XXX Add a tooltip! */
+	  G_CALLBACK (action_event_copy_cb) },
+
+	{ "event-delegate",
+	  NULL,
+	  N_("_Delegate Meeting..."),
+	  NULL,
+	  NULL,  /* XXX Add a tooltip! */
+	  G_CALLBACK (action_event_delegate_cb) },
+
 	{ "event-delete",
 	  GTK_STOCK_DELETE,
 	  NULL,
@@ -257,12 +631,89 @@ static GtkActionEntry calendar_entries[] = {
 	  N_("Delete all occurrences"),
 	  G_CALLBACK (action_event_delete_occurrence_all_cb) },
 
+	{ "event-all-day-new",
+	  NULL,
+	  N_("New All Day _Event..."),
+	  NULL,
+	  N_("Create a new all day event"),
+	  G_CALLBACK (action_event_all_day_new_cb) },
+
+	{ "event-forward",
+	  "mail-forward",
+	  N_("_Forward as iCalendar..."),
+	  NULL,
+	  NULL,  /* XXX Add a tooltip! */
+	  G_CALLBACK (action_event_forward_new_cb) },
+
+	{ "event-meeting-new",
+	  NULL,
+	  N_("New _Meeting..."),
+	  NULL,
+	  N_("Create a new meeting"),
+	  G_CALLBACK (action_event_meeting_new_cb) },
+
+	{ "event-move",
+	  NULL,
+	  N_("Mo_ve to Calendar..."),
+	  NULL,
+	  NULL,  /* XXX Add a tooltip! */
+	  G_CALLBACK (action_event_move_cb) },
+
+	{ "event-new",
+	  NULL,
+	  N_("New _Appointment..."),
+	  NULL,
+	  N_("Create a new appointment"),
+	  G_CALLBACK (action_event_new_cb) },
+
+	{ "event-occurrence-movable",
+	  NULL,
+	  N_("Make this Occurrence _Movable"),
+	  NULL,
+	  NULL,  /* XXX Add a tooltip! */
+	  G_CALLBACK (action_event_occurrence_movable_cb) },
+
 	{ "event-open",
 	  NULL,
 	  N_("_Open Appointment"),
 	  "<Control>o",
 	  N_("View the current appointment"),
-	  G_CALLBACK (action_event_open_cb) }
+	  G_CALLBACK (action_event_open_cb) },
+
+	{ "event-print",
+	  GTK_STOCK_PRINT,
+	  NULL,
+	  NULL,
+	  NULL,  /* XXX Add a tooltip! */
+	  G_CALLBACK (action_event_print_cb) },
+
+	{ "event-reply",
+	  "mail-reply-sender",
+	  N_("_Reply"),
+	  NULL,
+	  NULL,  /* XXX Add a tooltip! */
+	  G_CALLBACK (action_event_reply_cb) },
+
+	{ "event-reply-all",
+	  "mail-reply-all",
+	  N_("Reply to _All"),
+	  NULL,
+	  NULL,  /* XXX Add a tooltip! */
+	  G_CALLBACK (action_event_reply_all_cb) },
+
+	{ "event-save-as",
+	  GTK_STOCK_SAVE_AS,
+	  NULL,
+	  NULL,
+	  NULL,  /* XXX Add a tooltip! */
+	  G_CALLBACK (action_event_save_as_cb) },
+
+	{ "event-schedule",
+	  NULL,
+	  N_("_Schedule Meeting..."),
+	  NULL,
+	  NULL,  /* XXX Add a tooltip! */
+	  G_CALLBACK (action_event_schedule_cb) }
 };
 
 static GtkRadioActionEntry calendar_view_entries[] = {
@@ -303,22 +754,76 @@ static GtkRadioActionEntry calendar_view_entries[] = {
 	  GNOME_CAL_WORK_WEEK_VIEW }
 };
 
+static GtkRadioActionEntry calendar_filter_entries[] = {
+
+	{ "calendar-filter-active-appointments",
+	  NULL,
+	  N_("Active Appointements"),
+	  NULL,
+	  NULL,  /* XXX Add a tooltip! */
+	  CALENDAR_FILTER_ACTIVE_APPOINTMENTS },
+
+	{ "calendar-filter-any-category",
+	  NULL,
+	  N_("Any Category"),
+	  NULL,
+	  NULL,  /* XXX Add a tooltip! */
+	  CALENDAR_FILTER_ANY_CATEGORY },
+
+	{ "calendar-filter-next-7-days-appointments",
+	  NULL,
+	  N_("Next 7 Days' Appointments"),
+	  NULL,
+	  NULL,  /* XXX Add a tooltip! */
+	  CALENDAR_FILTER_NEXT_7_DAYS_APPOINTMENTS },
+
+	{ "calendar-filter-unmatched",
+	  NULL,
+	  N_("Unmatched"),
+	  NULL,
+	  NULL,  /* XXX Add a tooltip! */
+	  CALENDAR_FILTER_UNMATCHED }
+};
+
+static GtkRadioActionEntry calendar_search_entries[] = {
+
+	{ "calendar-search-any-field-contains",
+	  NULL,
+	  N_("Any field contains"),
+	  NULL,
+	  NULL,  /* XXX Add a tooltip! */
+	  CALENDAR_SEARCH_ANY_FIELD_CONTAINS },
+
+	{ "calendar-search-description-contains",
+	  NULL,
+	  N_("Description contains"),
+	  NULL,
+	  NULL,  /* XXX Add a tooltip! */
+	  CALENDAR_SEARCH_DESCRIPTION_CONTAINS },
+
+	{ "calendar-search-summary-contains",
+	  NULL,
+	  N_("Summary contains"),
+	  NULL,
+	  NULL,  /* XXX Add a tooltip! */
+	  CALENDAR_SEARCH_SUMMARY_CONTAINS }
+};
+
 void
 e_cal_shell_view_actions_init (ECalShellView *cal_shell_view)
 {
 	EShellView *shell_view;
 	EShellWindow *shell_window;
 	GtkActionGroup *action_group;
-	GtkUIManager *manager;
+	GtkUIManager *ui_manager;
+	GtkAction *action;
 	const gchar *domain;
 
 	shell_view = E_SHELL_VIEW (cal_shell_view);
 	shell_window = e_shell_view_get_shell_window (shell_view);
-	manager = e_shell_window_get_ui_manager (shell_window);
+	ui_manager = e_shell_window_get_ui_manager (shell_window);
 	domain = GETTEXT_PACKAGE;
 
-	e_load_ui_definition (manager, "evolution-calendars.ui");
-
 	action_group = cal_shell_view->priv->calendar_actions;
 	gtk_action_group_set_translation_domain (action_group, domain);
 	gtk_action_group_add_actions (
@@ -328,5 +833,92 @@ e_cal_shell_view_actions_init (ECalShellView *cal_shell_view)
 		action_group, calendar_view_entries,
 		G_N_ELEMENTS (calendar_view_entries), GNOME_CAL_DAY_VIEW,
 		G_CALLBACK (action_calendar_view_cb), cal_shell_view);
-	gtk_ui_manager_insert_action_group (manager, action_group, 0);
+	gtk_action_group_add_radio_actions (
+		action_group, calendar_search_entries,
+		G_N_ELEMENTS (calendar_search_entries),
+		CALENDAR_SEARCH_SUMMARY_CONTAINS,
+		NULL, NULL);
+	gtk_ui_manager_insert_action_group (ui_manager, action_group, 0);
+
+	/* Fine tuning. */
+
+	action = ACTION (EVENT_DELETE);
+	g_object_set (action, "short-label", _("Delete"), NULL);
+
+	g_signal_connect (
+		ACTION (GAL_SAVE_CUSTOM_VIEW), "activate",
+		G_CALLBACK (action_gal_save_custom_view_cb), cal_shell_view);
+
+	g_signal_connect (
+		ACTION (SEARCH_EXECUTE), "activate",
+		G_CALLBACK (action_search_execute_cb), cal_shell_view);
+
+	/* Initialize the memo and task pad actions. */
+	e_cal_shell_view_memopad_actions_init (cal_shell_view);
+	e_cal_shell_view_taskpad_actions_init (cal_shell_view);
+}
+
+void
+e_cal_shell_view_update_search_filter (ECalShellView *cal_shell_view)
+{
+	EShellContent *shell_content;
+	EShellView *shell_view;
+	GtkActionGroup *action_group;
+	GtkRadioAction *radio_action;
+	GList *list, *iter;
+	GSList *group;
+	gint ii;
+
+	shell_view = E_SHELL_VIEW (cal_shell_view);
+	shell_content = e_shell_view_get_shell_content (shell_view);
+	action_group = cal_shell_view->priv->filter_actions;
+
+	e_action_group_remove_all_actions (action_group);
+
+	/* Add the standard filter actions. */
+	gtk_action_group_add_radio_actions (
+		action_group, calendar_filter_entries,
+		G_N_ELEMENTS (calendar_filter_entries),
+		CALENDAR_FILTER_ANY_CATEGORY,
+		G_CALLBACK (action_search_filter_cb),
+		cal_shell_view);
+
+	/* Retrieve the radio group from an action we just added. */
+	list = gtk_action_group_list_actions (action_group);
+	radio_action = GTK_RADIO_ACTION (list->data);
+	group = gtk_radio_action_get_group (radio_action);
+	g_list_free (list);
+
+	/* Build the category actions. */
+
+	list = e_categories_get_list ();
+	for (iter = list, ii = 0; iter != NULL; iter = iter->next, ii++) {
+		const gchar *category_name = iter->data;
+		GtkAction *action;
+		gchar *action_name;
+
+		action_name = g_strdup_printf (
+			"calendar-filter-category-%d", ii);
+		radio_action = gtk_radio_action_new (
+			action_name, category_name, NULL, NULL, ii);
+		g_free (action_name);
+
+		gtk_radio_action_set_group (radio_action, group);
+		group = gtk_radio_action_get_group (radio_action);
+
+		/* The action group takes ownership of the action. */
+		action = GTK_ACTION (radio_action);
+		gtk_action_group_add_action (action_group, action);
+		g_object_unref (radio_action);
+	}
+	g_list_free (list);
+
+	/* Use any action in the group; doesn't matter which. */
+	e_shell_content_set_filter_action (shell_content, radio_action);
+
+	ii = CALENDAR_FILTER_UNMATCHED;
+	e_shell_content_add_filter_separator_after (shell_content, ii);
+
+	ii = CALENDAR_FILTER_NEXT_7_DAYS_APPOINTMENTS;
+	e_shell_content_add_filter_separator_after (shell_content, ii);
 }
diff --git a/calendar/modules/e-cal-shell-view-actions.h b/calendar/modules/e-cal-shell-view-actions.h
index 6436a26b97..c682b22190 100644
--- a/calendar/modules/e-cal-shell-view-actions.h
+++ b/calendar/modules/e-cal-shell-view-actions.h
@@ -74,6 +74,72 @@
 #define E_SHELL_WINDOW_ACTION_EVENT_OPEN(window) \
 	E_SHELL_WINDOW_ACTION ((window), "event-open")
 
+/* Memo Pad Actions */
+#define E_SHELL_WINDOW_ACTION_CALENDAR_MEMOPAD_CLIPBOARD_COPY(window) \
+        E_SHELL_WINDOW_ACTION ((window), "calendar-memopad-clipboard-copy")
+#define E_SHELL_WINDOW_ACTION_CALENDAR_MEMOPAD_CLIPBOARD_CUT(window) \
+        E_SHELL_WINDOW_ACTION ((window), "calendar-memopad-clipboard-cut")
+#define E_SHELL_WINDOW_ACTION_CALENDAR_MEMOPAD_CLIPBOARD_PASTE(window) \
+        E_SHELL_WINDOW_ACTION ((window), "calendar-memopad-clipboard-paste")
+#define E_SHELL_WINDOW_ACTION_CALENDAR_MEMOPAD_DELETE(window) \
+        E_SHELL_WINDOW_ACTION ((window), "calendar-memopad-delete")
+#define E_SHELL_WINDOW_ACTION_CALENDAR_MEMOPAD_FORWARD(window) \
+        E_SHELL_WINDOW_ACTION ((window), "calendar-memopad-forward")
+#define E_SHELL_WINDOW_ACTION_CALENDAR_MEMOPAD_NEW(window) \
+        E_SHELL_WINDOW_ACTION ((window), "calendar-memopad-new")
+#define E_SHELL_WINDOW_ACTION_CALENDAR_MEMOPAD_OPEN(window) \
+        E_SHELL_WINDOW_ACTION ((window), "calendar-memopad-open")
+#define E_SHELL_WINDOW_ACTION_CALENDAR_MEMOPAD_OPEN_URL(window) \
+        E_SHELL_WINDOW_ACTION ((window), "calendar-memopad-open-url")
+#define E_SHELL_WINDOW_ACTION_CALENDAR_MEMOPAD_PRINT(window) \
+        E_SHELL_WINDOW_ACTION ((window), "calendar-memopad-print")
+#define E_SHELL_WINDOW_ACTION_CALENDAR_MEMOPAD_SAVE_AS(window) \
+        E_SHELL_WINDOW_ACTION ((window), "calendar-memopad-save-as")
+
+/* Task Pad Actions */
+#define E_SHELL_WINDOW_ACTION_CALENDAR_TASKPAD_ASSIGN(window) \
+	E_SHELL_WINDOW_ACTION ((window), "calendar-taskpad-assign")
+#define E_SHELL_WINDOW_ACTION_CALENDAR_TASKPAD_CLIPBOARD_COPY(window) \
+        E_SHELL_WINDOW_ACTION ((window), "calendar-taskpad-clipboard-copy")
+#define E_SHELL_WINDOW_ACTION_CALENDAR_TASKPAD_CLIPBOARD_CUT(window) \
+        E_SHELL_WINDOW_ACTION ((window), "calendar-taskpad-clipboard-cut")
+#define E_SHELL_WINDOW_ACTION_CALENDAR_TASKPAD_CLIPBOARD_PASTE(window) \
+        E_SHELL_WINDOW_ACTION ((window), "calendar-taskpad-clipboard-paste")
+#define E_SHELL_WINDOW_ACTION_CALENDAR_TASKPAD_DELETE(window) \
+        E_SHELL_WINDOW_ACTION ((window), "calendar-taskpad-delete")
+#define E_SHELL_WINDOW_ACTION_CALENDAR_TASKPAD_FORWARD(window) \
+        E_SHELL_WINDOW_ACTION ((window), "calendar-taskpad-forward")
+#define E_SHELL_WINDOW_ACTION_CALENDAR_TASKPAD_MARK_COMPLETE(window) \
+	E_SHELL_WINDOW_ACTION ((window), "calendar-taskpad-mark-complete")
+#define E_SHELL_WINDOW_ACTION_CALENDAR_TASKPAD_MARK_INCOMPLETE(window) \
+	E_SHELL_WINDOW_ACTION ((window), "calendar-taskpad-mark-incomplete")
+#define E_SHELL_WINDOW_ACTION_CALENDAR_TASKPAD_NEW(window) \
+        E_SHELL_WINDOW_ACTION ((window), "calendar-taskpad-new")
+#define E_SHELL_WINDOW_ACTION_CALENDAR_TASKPAD_OPEN(window) \
+        E_SHELL_WINDOW_ACTION ((window), "calendar-taskpad-open")
+#define E_SHELL_WINDOW_ACTION_CALENDAR_TASKPAD_OPEN_URL(window) \
+        E_SHELL_WINDOW_ACTION ((window), "calendar-taskpad-open-url")
+#define E_SHELL_WINDOW_ACTION_CALENDAR_TASKPAD_PRINT(window) \
+        E_SHELL_WINDOW_ACTION ((window), "calendar-taskpad-print")
+#define E_SHELL_WINDOW_ACTION_CALENDAR_TASKPAD_SAVE_AS(window) \
+        E_SHELL_WINDOW_ACTION ((window), "calendar-taskpad-save-as")
+
+/* Calendar Query Actions */
+#define E_SHELL_WINDOW_ACTION_CALENDAR_FILTER_ACTIVE_APPOINTMENTS(window) \
+	E_SHELL_WINDOW_ACTION ((window), "calendar-filter-active-appointments")
+#define E_SHELL_WINDOW_ACTION_CALENDAR_FILTER_ANY_CATEGORY(window) \
+	E_SHELL_WINDOW_ACTION ((window), "calendar-filter-any-category")
+#define E_SHELL_WINDOW_ACTION_CALENDAR_FILTER_NEXT_7_DAYS_APPOINTMENTS(window) \
+	E_SHELL_WINDOW_ACTION ((window), "calendar-filter-next-7-days-appointments")
+#define E_SHELL_WINDOW_ACTION_CALENDAR_FILTER_UNMATCHED(window) \
+	E_SHELL_WINDOW_ACTION ((window), "calendar-filter-unmatched")
+#define E_SHELL_WINDOW_ACTION_CALENDAR_SEARCH_ANY_FIELD_CONTAINS(window) \
+	E_SHELL_WINDOW_ACTION ((window), "calendar-search-any-field-contains")
+#define E_SHELL_WINDOW_ACTION_CALENDAR_SEARCH_DESCRIPTION_CONTAINS(window) \
+	E_SHELL_WINDOW_ACTION ((window), "calendar-search-description-contains")
+#define E_SHELL_WINDOW_ACTION_CALENDAR_SEARCH_SUMMARY_CONTAINS(window) \
+	E_SHELL_WINDOW_ACTION ((window), "calendar-search-summary-contains")
+
 /* Action Groups */
 #define E_SHELL_WINDOW_ACTION_GROUP_CALS(window) \
 	E_SHELL_WINDOW_ACTION_GROUP ((window), "calendars")
diff --git a/calendar/modules/e-cal-shell-view-memopad.c b/calendar/modules/e-cal-shell-view-memopad.c
new file mode 100644
index 0000000000..ff9c235062
--- /dev/null
+++ b/calendar/modules/e-cal-shell-view-memopad.c
@@ -0,0 +1,472 @@
+/*
+ * e-cal-shell-view-memopad.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-shell-view-private.h"
+
+/* Much of this file is based on e-memo-shell-view-actions.c. */
+
+static void
+action_calendar_memopad_clipboard_copy_cb (GtkAction *action,
+                                           ECalShellView *cal_shell_view)
+{
+	ECalShellContent *cal_shell_content;
+	EMemoTable *memo_table;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	memo_table = e_cal_shell_content_get_memo_table (cal_shell_content);
+
+	e_memo_table_copy_clipboard (memo_table);
+}
+
+static void
+action_calendar_memopad_clipboard_cut_cb (GtkAction *action,
+                                          ECalShellView *cal_shell_view)
+{
+	ECalShellContent *cal_shell_content;
+	EMemoTable *memo_table;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	memo_table = e_cal_shell_content_get_memo_table (cal_shell_content);
+
+	e_memo_table_cut_clipboard (memo_table);
+}
+
+static void
+action_calendar_memopad_clipboard_paste_cb (GtkAction *action,
+                                            ECalShellView *cal_shell_view)
+{
+	ECalShellContent *cal_shell_content;
+	EMemoTable *memo_table;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	memo_table = e_cal_shell_content_get_memo_table (cal_shell_content);
+
+	e_memo_table_paste_clipboard (memo_table);
+}
+
+static void
+action_calendar_memopad_delete_cb (GtkAction *action,
+                                   ECalShellView *cal_shell_view)
+{
+	ECalShellContent *cal_shell_content;
+	EMemoTable *memo_table;
+	const gchar *status_message;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	memo_table = e_cal_shell_content_get_memo_table (cal_shell_content);
+
+	status_message = _("Deleting selected memos...");
+	e_cal_shell_view_set_status_message (cal_shell_view, status_message);
+	e_memo_table_delete_selected (memo_table);
+	e_cal_shell_view_set_status_message (cal_shell_view, NULL);
+}
+
+static void
+action_calendar_memopad_forward_cb (GtkAction *action,
+                                    ECalShellView *cal_shell_view)
+{
+	ECalShellContent *cal_shell_content;
+	EMemoTable *memo_table;
+	ECalModelComponent *comp_data;
+	ECalComponent *comp;
+	icalcomponent *clone;
+	ECalComponentItipMethod method;
+	GSList *list;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	memo_table = e_cal_shell_content_get_memo_table (cal_shell_content);
+
+	list = e_memo_table_get_selected (memo_table);
+	g_return_if_fail (list != NULL);
+	comp_data = list->data;
+	g_slist_free (list);
+
+	/* XXX We only forward the first selected memo. */
+	comp = e_cal_component_new ();
+	clone = icalcomponent_new_clone (comp_data->icalcomp);
+	method = E_CAL_COMPONENT_METHOD_PUBLISH;
+	e_cal_component_set_icalcomponent (comp, clone);
+	itip_send_comp (method, comp, comp_data->client, NULL, NULL, NULL);
+	g_object_unref (comp);
+}
+
+static void
+action_calendar_memopad_new_cb (GtkAction *action,
+                                ECalShellView *cal_shell_view)
+{
+	ECalShellContent *cal_shell_content;
+	EMemoTable *memo_table;
+	ECalModelComponent *comp_data;
+	ECal *client;
+	ECalComponent *comp;
+	CompEditor *editor;
+	GSList *list;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	memo_table = e_cal_shell_content_get_memo_table (cal_shell_content);
+
+	list = e_memo_table_get_selected (memo_table);
+	g_return_if_fail (list != NULL);
+	comp_data = list->data;
+	g_slist_free (list);
+
+	client = comp_data->client;
+	editor = memo_editor_new (client, COMP_EDITOR_NEW_ITEM);
+	comp = cal_comp_memo_new_with_defaults (client);
+	comp_editor_edit_comp (editor, comp);
+
+	gtk_window_present (GTK_WINDOW (editor));
+
+	g_object_unref (comp);
+	g_object_unref (client);
+}
+
+static void
+action_calendar_memopad_open_cb (GtkAction *action,
+                                 ECalShellView *cal_shell_view)
+{
+	ECalShellContent *cal_shell_content;
+	EMemoTable *memo_table;
+	ECalModelComponent *comp_data;
+	GSList *list;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	memo_table = e_cal_shell_content_get_memo_table (cal_shell_content);
+
+	list = e_memo_table_get_selected (memo_table);
+	g_return_if_fail (list != NULL);
+	comp_data = list->data;
+	g_slist_free (list);
+
+	/* XXX We only open the first selected memo. */
+	e_cal_shell_view_memopad_open_memo (cal_shell_view, comp_data);
+}
+
+static void
+action_calendar_memopad_open_url_cb (GtkAction *action,
+                                     ECalShellView *cal_shell_view)
+{
+	ECalShellContent *cal_shell_content;
+	EMemoTable *memo_table;
+	ECalModelComponent *comp_data;
+	icalproperty *prop;
+	GdkScreen *screen;
+	const gchar *uri;
+	GSList *list;
+	GError *error = NULL;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	memo_table = e_cal_shell_content_get_memo_table (cal_shell_content);
+
+	list = e_memo_table_get_selected (memo_table);
+	g_return_if_fail (list != NULL);
+	comp_data = list->data;
+	g_slist_free (list);
+
+	/* XXX We only open the URI of the first selected memo. */
+	prop = icalcomponent_get_first_property (
+		comp_data->icalcomp, ICAL_URL_PROPERTY);
+	g_return_if_fail (prop == NULL);
+
+	screen = gtk_widget_get_screen (GTK_WIDGET (cal_shell_view));
+	uri = icalproperty_get_url (prop);
+	gtk_show_uri (screen, uri, GDK_CURRENT_TIME, &error);
+
+	if (error != NULL) {
+		g_warning ("%s", error->message);
+		g_error_free (error);
+	}
+}
+
+static void
+action_calendar_memopad_print_cb (GtkAction *action,
+                                  ECalShellView *cal_shell_view)
+{
+	ECalShellContent *cal_shell_content;
+	EMemoTable *memo_table;
+	ECalModelComponent *comp_data;
+	ECalComponent *comp;
+	icalcomponent *clone;
+	GtkPrintOperationAction print_action;
+	GSList *list;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	memo_table = e_cal_shell_content_get_memo_table (cal_shell_content);
+
+	list = e_memo_table_get_selected (memo_table);
+	g_return_if_fail (list != NULL);
+	comp_data = list->data;
+	g_slist_free (list);
+
+	/* XXX We only print the first selected memo. */
+	comp = e_cal_component_new ();
+	clone = icalcomponent_new_clone (comp_data->icalcomp);
+	print_action = GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG;
+	e_cal_component_set_icalcomponent (comp, clone);
+	print_comp (comp, comp_data->client, print_action);
+	g_object_unref (comp);
+}
+
+static void
+action_calendar_memopad_save_as_cb (GtkAction *action,
+                                    ECalShellView *cal_shell_view)
+{
+	ECalShellContent *cal_shell_content;
+	EMemoTable *memo_table;
+	ECalModelComponent *comp_data;
+	GSList *list;
+	gchar *filename;
+	gchar *string;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	memo_table = e_cal_shell_content_get_memo_table (cal_shell_content);
+
+	list = e_memo_table_get_selected (memo_table);
+	g_return_if_fail (list != NULL);
+	comp_data = list->data;
+	g_slist_free (list);
+
+	filename = e_file_dialog_save (_("Save as..."), NULL);
+	if (filename == NULL)
+		return;
+
+	/* XXX We only save the first selected memo. */
+	string = e_cal_get_component_as_string (
+		comp_data->client, comp_data->icalcomp);
+	if (string == NULL) {
+		g_warning ("Could not convert memo to a string.");
+		return;
+	}
+
+	e_write_file_uri (filename, string);
+
+	g_free (filename);
+	g_free (string);
+}
+
+static GtkActionEntry calendar_memopad_entries[] = {
+
+	{ "calendar-memopad-clipboard-copy",
+	  GTK_STOCK_COPY,
+	  NULL,
+	  NULL,
+	  N_("Copy selected memo"),
+	  G_CALLBACK (action_calendar_memopad_clipboard_copy_cb) },
+
+	{ "calendar-memopad-clipboard-cut",
+	  GTK_STOCK_CUT,
+	  NULL,
+	  NULL,
+	  N_("Cut selected memo"),
+	  G_CALLBACK (action_calendar_memopad_clipboard_cut_cb) },
+
+	{ "calendar-memopad-clipboard-paste",
+	  GTK_STOCK_PASTE,
+	  NULL,
+	  NULL,
+	  N_("Paste memo from the clipboard"),
+	  G_CALLBACK (action_calendar_memopad_clipboard_paste_cb) },
+
+	{ "calendar-memopad-delete",
+	  GTK_STOCK_DELETE,
+	  N_("_Delete Memo"),
+	  NULL,
+	  N_("Delete selected memos"),
+	  G_CALLBACK (action_calendar_memopad_delete_cb) },
+
+	{ "calendar-memopad-forward",
+	  "mail-forward",
+	  N_("_Forward as iCalendar..."),
+	  NULL,
+	  NULL,  /* XXX Add a tooltip! */
+	  G_CALLBACK (action_calendar_memopad_forward_cb) },
+
+	{ "calendar-memopad-new",
+	  "stock_insert-note",
+	  N_("New _Memo"),
+	  NULL,
+	  N_("Create a new memo"),
+	  G_CALLBACK (action_calendar_memopad_new_cb) },
+
+	{ "calendar-memopad-open",
+	  GTK_STOCK_OPEN,
+	  N_("_Open Memo"),
+	  NULL,
+	  N_("View the selected memo"),
+	  G_CALLBACK (action_calendar_memopad_open_cb) },
+
+	{ "calendar-memopad-open-url",
+	  "applications-internet",
+	  N_("Open _Web Page"),
+	  NULL,
+	  NULL,  /* XXX Add a tooltip! */
+	  G_CALLBACK (action_calendar_memopad_open_url_cb) },
+
+	{ "calendar-memopad-print",
+	  GTK_STOCK_PRINT,
+	  NULL,
+	  NULL,
+	  N_("Print the selected memo"),
+	  G_CALLBACK (action_calendar_memopad_print_cb) },
+
+	{ "calendar-memopad-save-as",
+	  GTK_STOCK_SAVE_AS,
+	  NULL,
+	  NULL,
+	  NULL,  /* XXX Add a tooltip! */
+	  G_CALLBACK (action_calendar_memopad_save_as_cb) }
+};
+
+void
+e_cal_shell_view_memopad_actions_init (ECalShellView *cal_shell_view)
+{
+	EShellView *shell_view;
+	EShellWindow *shell_window;
+	GtkActionGroup *action_group;
+	GtkUIManager *ui_manager;
+
+	shell_view = E_SHELL_VIEW (cal_shell_view);
+	shell_window = e_shell_view_get_shell_window (shell_view);
+	ui_manager = e_shell_window_get_ui_manager (shell_window);
+
+	action_group = cal_shell_view->priv->calendar_actions;
+	gtk_action_group_add_actions (
+		action_group, calendar_memopad_entries,
+		G_N_ELEMENTS (calendar_memopad_entries), cal_shell_view);
+	gtk_ui_manager_insert_action_group (ui_manager, action_group, 0);
+}
+
+void
+e_cal_shell_view_memopad_actions_update (ECalShellView *cal_shell_view)
+{
+	ECalShellContent *cal_shell_content;
+	EShellWindow *shell_window;
+	EShellView *shell_view;
+	EMemoTable *memo_table;
+	ETable *table;
+	GtkAction *action;
+	GSList *list, *iter;
+	const gchar *label;
+	gboolean editable = TRUE;
+	gboolean has_url = FALSE;
+	gboolean sensitive;
+	gint n_selected;
+
+	shell_view = E_SHELL_VIEW (cal_shell_view);
+	shell_window = e_shell_view_get_shell_window (shell_view);
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	memo_table = e_cal_shell_content_get_memo_table (cal_shell_content);
+
+	table = e_memo_table_get_table (memo_table);
+	n_selected = e_table_selected_count (table);
+
+	list = e_memo_table_get_selected (memo_table);
+	for (iter = list; iter != NULL; iter = iter->next) {
+		ECalModelComponent *comp_data = iter->data;
+		icalproperty *prop;
+		gboolean read_only;
+
+		e_cal_is_read_only (comp_data->client, &read_only, NULL);
+		editable &= !read_only;
+
+		prop = icalcomponent_get_first_property (
+			comp_data->icalcomp, ICAL_URL_PROPERTY);
+		has_url |= (prop != NULL);
+	}
+	g_slist_free (list);
+
+	action = ACTION (CALENDAR_MEMOPAD_CLIPBOARD_COPY);
+	sensitive = (n_selected > 0);
+	gtk_action_set_sensitive (action, sensitive);
+
+	action = ACTION (CALENDAR_MEMOPAD_CLIPBOARD_CUT);
+	sensitive = (n_selected > 0) && editable;
+	gtk_action_set_sensitive (action, sensitive);
+
+	action = ACTION (CALENDAR_MEMOPAD_CLIPBOARD_PASTE);
+	sensitive = editable;
+	gtk_action_set_sensitive (action, sensitive);
+
+	action = ACTION (CALENDAR_MEMOPAD_DELETE);
+	sensitive = (n_selected > 0) && editable;
+	gtk_action_set_sensitive (action, sensitive);
+	label = ngettext ("Delete Memo", "Delete Memos", n_selected);
+	g_object_set (action, "label", label, NULL);
+
+	action = ACTION (CALENDAR_MEMOPAD_FORWARD);
+	sensitive = (n_selected == 1);
+	gtk_action_set_sensitive (action, sensitive);
+
+	action = ACTION (CALENDAR_MEMOPAD_OPEN);
+	sensitive = (n_selected == 1);
+	gtk_action_set_sensitive (action, sensitive);
+
+	action = ACTION (CALENDAR_MEMOPAD_OPEN_URL);
+	sensitive = (n_selected == 1) && has_url;
+	gtk_action_set_sensitive (action, sensitive);
+
+	action = ACTION (CALENDAR_MEMOPAD_PRINT);
+	sensitive = (n_selected == 1);
+	gtk_action_set_sensitive (action, sensitive);
+
+	action = ACTION (CALENDAR_MEMOPAD_SAVE_AS);
+	sensitive = (n_selected == 1);
+	gtk_action_set_sensitive (action, sensitive);
+}
+
+void
+e_cal_shell_view_memopad_open_memo (ECalShellView *cal_shell_view,
+                                    ECalModelComponent *comp_data)
+{
+	CompEditor *editor;
+	CompEditorFlags flags = 0;
+	ECalComponent *comp;
+	icalcomponent *clone;
+	const gchar *uid;
+
+	g_return_if_fail (E_IS_CAL_SHELL_VIEW (cal_shell_view));
+	g_return_if_fail (E_IS_CAL_MODEL_COMPONENT (comp_data));
+
+	uid = icalcomponent_get_uid (comp_data->icalcomp);
+	editor = comp_editor_find_instance (uid);
+
+	if (editor != NULL)
+		goto exit;
+
+	comp = e_cal_component_new ();
+	clone = icalcomponent_new_clone (comp_data->icalcomp);
+	e_cal_component_set_icalcomponent (comp, clone);
+
+	if (e_cal_component_has_organizer (comp))
+		flags |= COMP_EDITOR_IS_SHARED;
+
+	if (itip_organizer_is_user (comp, comp_data->client))
+		flags |= COMP_EDITOR_USER_ORG;
+
+	editor = memo_editor_new (comp_data->client, flags);
+	comp_editor_edit_comp (editor, comp);
+
+	g_object_unref (comp);
+
+exit:
+	gtk_window_present (GTK_WINDOW (editor));
+}
diff --git a/calendar/modules/e-cal-shell-view-private.c b/calendar/modules/e-cal-shell-view-private.c
index 9107aee1fa..65be70ae93 100644
--- a/calendar/modules/e-cal-shell-view-private.c
+++ b/calendar/modules/e-cal-shell-view-private.c
@@ -25,6 +25,104 @@
 #include "widgets/menus/gal-view-factory-etable.h"
 
 static void
+cal_shell_view_update_timezone (ECalShellView *cal_shell_view)
+{
+	ECalShellContent *cal_shell_content;
+	ECalShellSidebar *cal_shell_sidebar;
+	GnomeCalendarViewType view_type;
+	ECalendarView *calendar_view;
+	icaltimezone *timezone;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	cal_shell_sidebar = cal_shell_view->priv->cal_shell_sidebar;
+
+	e_cal_shell_sidebar_update_timezone (cal_shell_sidebar);
+
+	view_type = e_cal_shell_content_get_current_view (cal_shell_content);
+	calendar_view = e_cal_shell_content_get_calendar_view (
+		cal_shell_content, view_type);
+
+	timezone = calendar_config_get_icaltimezone ();
+	e_calendar_view_get_icaltimezone (calendar_view, timezone);
+}
+
+static void
+cal_shell_view_timezone_changed_cb (GConfClient *client,
+                                    guint id,
+                                    GConfEntry *entry,
+                                    gpointer user_data)
+{
+	ECalShellView *cal_shell_view = user_data;
+
+	cal_shell_view_update_timezone (cal_shell_view);
+}
+
+static struct tm
+cal_shell_view_get_current_time (ECalendarItem *calitem,
+                                 ECalShellView *cal_shell_view)
+{
+	ECalShellContent *cal_shell_content;
+	struct icaltimetype tt;
+	icaltimezone *timezone;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	timezone = e_cal_shell_content_get_timezone (cal_shell_content);
+
+	tt = icaltime_from_timet_with_zone (time (NULL), FALSE, timezone);
+
+	return icaltimetype_to_tm (&tt);
+}
+
+static void
+cal_shell_view_mini_calendar_date_range_changed_cb (ECalShellView *cal_shell_view,
+                                                    ECalendarItem *calitem)
+{
+	/* FIXME gnome-calendar.c calls update_query() here. */
+}
+                                                    
+static void
+cal_shell_view_mini_calendar_selection_changed_cb (ECalShellView *cal_shell_view,
+                                                   ECalendarItem *calitem)
+{
+	/* FIXME */
+}
+
+static void
+cal_shell_view_mini_calendar_scroll_event_cb (ECalShellView *cal_shell_view,
+                                              GdkEventScroll *event,
+                                              ECalendar *mini_calendar)
+{
+	ECalendarItem *calitem;
+	GDate start_date, end_date;
+
+	calitem = mini_calendar->calitem;
+	if (!e_calendar_item_get_selection (calitem, &start_date, &end_date))
+		return;
+
+	switch (event->direction) {
+		case GDK_SCROLL_UP:
+			g_date_subtract_months (&start_date, 1);
+			g_date_subtract_months (&end_date, 1);
+			break;
+
+		case GDK_SCROLL_DOWN:
+			g_date_add_months (&start_date, 1);
+			g_date_add_months (&end_date, 1);
+			break;
+
+		default:
+			g_return_if_reached ();
+	}
+
+	/* XXX Does ECalendarItem emit a signal for this?  If so, maybe
+	 *     we could move this handler into ECalShellSidebar. */
+	e_calendar_item_set_selection (calitem, &start_date, &end_date);
+
+	cal_shell_view_mini_calendar_date_range_changed_cb (
+		cal_shell_view, calitem);
+}
+
+static void
 cal_shell_view_load_view_collection (EShellViewClass *shell_view_class)
 {
 	GalViewCollection *collection;
@@ -104,6 +202,7 @@ e_cal_shell_view_private_init (ECalShellView *cal_shell_view,
 
 	priv->source_list = g_object_ref (source_list);
 	priv->calendar_actions = gtk_action_group_new ("calendars");
+	priv->filter_actions = gtk_action_group_new ("calendars-filter");
 
 	if (!gal_view_collection_loaded (shell_view_class->view_collection))
 		cal_shell_view_load_view_collection (shell_view_class);
@@ -117,10 +216,14 @@ void
 e_cal_shell_view_private_constructed (ECalShellView *cal_shell_view)
 {
 	ECalShellViewPrivate *priv = cal_shell_view->priv;
+	ECalShellContent *cal_shell_content;
+	ECalShellSidebar *cal_shell_sidebar;
 	EShellContent *shell_content;
 	EShellSidebar *shell_sidebar;
 	EShellView *shell_view;
 	GnomeCalendar *calendar;
+	ECalendar *mini_calendar;
+	guint notification;
 
 	shell_view = E_SHELL_VIEW (cal_shell_view);
 	shell_content = e_shell_view_get_shell_content (shell_view);
@@ -130,13 +233,44 @@ e_cal_shell_view_private_constructed (ECalShellView *cal_shell_view)
 	priv->cal_shell_content = g_object_ref (shell_content);
 	priv->cal_shell_sidebar = g_object_ref (shell_sidebar);
 
-	calendar = e_cal_shell_view_get_calendar (cal_shell_view);
+	cal_shell_content = E_CAL_SHELL_CONTENT (shell_content);
+	calendar = e_cal_shell_content_get_calendar (cal_shell_content);
+
+	cal_shell_sidebar = E_CAL_SHELL_SIDEBAR (shell_sidebar);
+	mini_calendar = e_cal_shell_sidebar_get_mini_calendar (cal_shell_sidebar);
+
+	e_calendar_item_set_get_time_callback (
+		mini_calendar->calitem, (ECalendarItemGetTimeCallback)
+		cal_shell_view_get_current_time, cal_shell_view, NULL);
 
 	g_signal_connect_swapped (
 		calendar, "dates-shown-changed",
 		G_CALLBACK (e_cal_shell_view_update_sidebar),
 		cal_shell_view);
 
+	g_signal_connect_swapped (
+		mini_calendar, "scroll-event",
+		G_CALLBACK (cal_shell_view_mini_calendar_scroll_event_cb),
+		cal_shell_view);
+
+	g_signal_connect_swapped (
+		mini_calendar->calitem, "date-range-changed",
+		G_CALLBACK (cal_shell_view_mini_calendar_date_range_changed_cb),
+		cal_shell_view);
+
+	g_signal_connect_swapped (
+		mini_calendar->calitem, "selection-changed",
+		G_CALLBACK (cal_shell_view_mini_calendar_selection_changed_cb),
+		cal_shell_view);
+
+	/* Listen for configuration changes. */
+
+	notification = calendar_config_add_notification_timezone (
+		cal_shell_view_timezone_changed_cb, cal_shell_view);
+	priv->notifications = g_list_prepend (
+		priv->notifications, GUINT_TO_POINTER (notification));
+	cal_shell_view_update_timezone (cal_shell_view);
+
 	e_shell_view_update_actions (shell_view);
 	e_cal_shell_view_update_sidebar (cal_shell_view);
 }
@@ -149,6 +283,7 @@ e_cal_shell_view_private_dispose (ECalShellView *cal_shell_view)
 	DISPOSE (priv->source_list);
 
 	DISPOSE (priv->calendar_actions);
+	DISPOSE (priv->filter_actions);
 
 	DISPOSE (priv->cal_shell_content);
 	DISPOSE (priv->cal_shell_sidebar);
@@ -168,6 +303,53 @@ e_cal_shell_view_private_finalize (ECalShellView *cal_shell_view)
 }
 
 void
+e_cal_shell_view_open_event (ECalShellView *cal_shell_view,
+                             ECalModelComponent *comp_data)
+{
+	CompEditor *editor;
+	CompEditorFlags flags = 0;
+	ECalComponent *comp;
+	icalcomponent *clone;
+	icalproperty *prop;
+	const gchar *uid;
+
+	g_return_if_fail (E_IS_CAL_SHELL_VIEW (cal_shell_view));
+	g_return_if_fail (E_IS_CAL_MODEL_COMPONENT (comp_data));
+
+	uid = icalcomponent_get_uid (comp_data->icalcomp);
+	editor = comp_editor_find_instance (uid);
+
+	if (editor != NULL)
+		goto exit;
+
+	comp = e_cal_component_new ();
+	clone = icalcomponent_new_clone (comp_data->icalcomp);
+	e_cal_component_set_icalcomponent (comp, clone);
+
+	prop = icalcomponent_get_first_property (
+		comp_data->icalcomp, ICAL_ATTENDEE_PROPERTY);
+	if (prop != NULL)
+		flags |= COMP_EDITOR_MEETING;
+
+	if (itip_organizer_is_user (comp, comp_data->client))
+		flags |= COMP_EDITOR_USER_ORG;
+
+	if (itip_sentby_is_user (comp))
+		flags |= COMP_EDITOR_USER_ORG;
+
+	if (!e_cal_component_has_attendees (comp))
+		flags |= COMP_EDITOR_USER_ORG;
+
+	editor = event_editor_new (comp_data->client, flags);
+	comp_editor_edit_comp (editor, comp);
+
+	g_object_ref (comp);
+
+exit:
+	gtk_window_present (GTK_WINDOW (editor));
+}
+
+void
 e_cal_shell_view_set_status_message (ECalShellView *cal_shell_view,
                                      const gchar *status_message)
 {
@@ -212,6 +394,8 @@ e_cal_shell_view_update_sidebar (ECalShellView *cal_shell_view)
 	gchar buffer[512];
 	gchar end_buffer[512];
 
+	g_return_if_fail (E_IS_CAL_SHELL_VIEW (cal_shell_view));
+
 	shell_view = E_SHELL_VIEW (cal_shell_view);
 	shell_sidebar = e_shell_view_get_shell_sidebar (shell_view);
 
diff --git a/calendar/modules/e-cal-shell-view-private.h b/calendar/modules/e-cal-shell-view-private.h
index 320e489cbc..bf246cd4ac 100644
--- a/calendar/modules/e-cal-shell-view-private.h
+++ b/calendar/modules/e-cal-shell-view-private.h
@@ -29,11 +29,19 @@
 #include <libecal/e-cal-time-util.h>
 #include <libedataserver/e-data-server-util.h>
 
+#include "e-util/e-dialog-utils.h"
 #include "e-util/e-util.h"
 
-#include "shell/e-shell-content.h"
-
+#include "calendar/gui/comp-util.h"
+#include "calendar/gui/e-cal-model-tasks.h"
+#include "calendar/gui/e-calendar-view.h"
 #include "calendar/gui/gnome-cal.h"
+#include "calendar/gui/goto.h"
+#include "calendar/gui/print.h"
+#include "calendar/gui/dialogs/copy-source-dialog.h"
+#include "calendar/gui/dialogs/event-editor.h"
+#include "calendar/gui/dialogs/memo-editor.h"
+#include "calendar/gui/dialogs/task-editor.h"
 
 #include "e-cal-shell-content.h"
 #include "e-cal-shell-sidebar.h"
@@ -60,6 +68,22 @@
 
 G_BEGIN_DECLS
 
+/* Filter items are displayed in ascending order.
+ * Non-negative values are reserved for categories. */
+enum {
+	CALENDAR_FILTER_ANY_CATEGORY			= -4,
+	CALENDAR_FILTER_UNMATCHED			= -3,
+	CALENDAR_FILTER_ACTIVE_APPOINTMENTS		= -2,
+	CALENDAR_FILTER_NEXT_7_DAYS_APPOINTMENTS	= -1
+};
+
+/* Search items are displayed in ascending order. */
+enum {
+	CALENDAR_SEARCH_SUMMARY_CONTAINS,
+	CALENDAR_SEARCH_DESCRIPTION_CONTAINS,
+	CALENDAR_SEARCH_ANY_FIELD_CONTAINS
+};
+
 struct _ECalShellViewPrivate {
 
 	/*** Module Data ***/
@@ -69,11 +93,15 @@ struct _ECalShellViewPrivate {
 	/*** UI Management ***/
 
 	GtkActionGroup *calendar_actions;
+	GtkActionGroup *filter_actions;
 
 	/* These are just for convenience. */
 	ECalShellContent *cal_shell_content;
 	ECalShellSidebar *cal_shell_sidebar;
 
+	/* The last time explicitly selected by the user. */
+	time_t base_view_time;
+
 	EActivity *activity;
 };
 
@@ -91,11 +119,38 @@ void		e_cal_shell_view_private_finalize
 
 void		e_cal_shell_view_actions_init
 					(ECalShellView *cal_shell_view);
+void		e_cal_shell_view_execute_search
+					(ECalShellView *cal_shell_view);
+void		e_cal_shell_view_open_event
+					(ECalShellView *cal_shell_view,
+					 ECalModelComponent *comp_data);
 void		e_cal_shell_view_set_status_message
 					(ECalShellView *cal_shell_view,
 					 const gchar *status_message);
 void		e_cal_shell_view_update_sidebar
 					(ECalShellView *cal_shell_view);
+void		e_cal_shell_view_update_search_filter
+					(ECalShellView *cal_shell_view);
+
+/* Memo Pad Utilities */
+
+void		e_cal_shell_view_memopad_actions_init
+					(ECalShellView *cal_shell_view);
+void		e_cal_shell_view_memopad_actions_update
+					(ECalShellView *cal_shell_view);
+void		e_cal_shell_view_memopad_open_memo
+					(ECalShellView *cal_shell_view,
+					 ECalModelComponent *comp_data);
+
+/* Task Pad Utilities */
+
+void		e_cal_shell_view_taskpad_actions_init
+					(ECalShellView *cal_shell_view);
+void		e_cal_shell_view_taskpad_actions_update
+					(ECalShellView *cal_shell_view);
+void		e_cal_shell_view_taskpad_open_task
+					(ECalShellView *cal_shell_view,
+					 ECalModelComponent *comp_data);
 
 G_END_DECLS
 
diff --git a/calendar/modules/e-cal-shell-view-taskpad.c b/calendar/modules/e-cal-shell-view-taskpad.c
new file mode 100644
index 0000000000..e2cc9d9a52
--- /dev/null
+++ b/calendar/modules/e-cal-shell-view-taskpad.c
@@ -0,0 +1,600 @@
+/*
+ * e-cal-shell-view-taskpad.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-shell-view-private.h"
+
+/* Much of this file is based on e-task-shell-view-actions.c. */
+
+static void
+action_calendar_taskpad_assign_cb (GtkAction *action,
+                                   ECalShellView *cal_shell_view)
+{
+	ECalShellContent *cal_shell_content;
+	ECalendarTable *task_table;
+	ECalModelComponent *comp_data;
+	GSList *list;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	task_table = e_cal_shell_content_get_task_table (cal_shell_content);
+
+	list = e_calendar_table_get_selected (task_table);
+	g_return_if_fail (list != NULL);
+	comp_data = list->data;
+	g_slist_free (list);
+
+	/* XXX We only open the first selected task. */
+	e_cal_shell_view_taskpad_open_task (cal_shell_view, comp_data);
+
+	/* FIXME Need to actually assign the task. */
+}
+
+static void
+action_calendar_taskpad_clipboard_copy_cb (GtkAction *action,
+                                           ECalShellView *cal_shell_view)
+{
+	ECalShellContent *cal_shell_content;
+	ECalendarTable *task_table;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	task_table = e_cal_shell_content_get_task_table (cal_shell_content);
+
+	e_calendar_table_copy_clipboard (task_table);
+}
+
+static void
+action_calendar_taskpad_clipboard_cut_cb (GtkAction *action,
+                                          ECalShellView *cal_shell_view)
+{
+	ECalShellContent *cal_shell_content;
+	ECalendarTable *task_table;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	task_table = e_cal_shell_content_get_task_table (cal_shell_content);
+
+	e_calendar_table_cut_clipboard (task_table);
+}
+
+static void
+action_calendar_taskpad_clipboard_paste_cb (GtkAction *action,
+                                            ECalShellView *cal_shell_view)
+{
+	ECalShellContent *cal_shell_content;
+	ECalendarTable *task_table;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	task_table = e_cal_shell_content_get_task_table (cal_shell_content);
+
+	e_calendar_table_paste_clipboard (task_table);
+}
+
+static void
+action_calendar_taskpad_delete_cb (GtkAction *action,
+                                   ECalShellView *cal_shell_view)
+{
+	ECalShellContent *cal_shell_content;
+	ECalendarTable *task_table;
+	const gchar *status_message;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	task_table = e_cal_shell_content_get_task_table (cal_shell_content);
+
+	status_message = _("Deleting selected tasks...");
+	e_cal_shell_view_set_status_message (cal_shell_view, status_message);
+	e_calendar_table_delete_selected (task_table);
+	e_cal_shell_view_set_status_message (cal_shell_view, NULL);
+}
+
+static void
+action_calendar_taskpad_forward_cb (GtkAction *action,
+                                    ECalShellView *cal_shell_view)
+{
+	ECalShellContent *cal_shell_content;
+	ECalendarTable *task_table;
+	ECalModelComponent *comp_data;
+	ECalComponent *comp;
+	icalcomponent *clone;
+	ECalComponentItipMethod method;
+	GSList *list;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	task_table = e_cal_shell_content_get_task_table (cal_shell_content);
+
+	list = e_calendar_table_get_selected (task_table);
+	g_return_if_fail (list != NULL);
+	comp_data = list->data;
+	g_slist_free (list);
+
+	/* XXX We only forward the first selected task. */
+	comp = e_cal_component_new ();
+	clone = icalcomponent_new_clone (comp_data->icalcomp);
+	method = E_CAL_COMPONENT_METHOD_PUBLISH;
+	e_cal_component_set_icalcomponent (comp, clone);
+	itip_send_comp (method, comp, comp_data->client, NULL, NULL, NULL);
+	g_object_unref (comp);
+}
+
+static void
+action_calendar_taskpad_mark_complete_cb (GtkAction *action,
+                                          ECalShellView *cal_shell_view)
+{
+	ECalShellContent *cal_shell_content;
+	ECalendarTable *task_table;
+	ECalModel *model;
+	GSList *list, *iter;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	task_table = e_cal_shell_content_get_task_table (cal_shell_content);
+	list = e_calendar_table_get_selected (task_table);
+	model = e_calendar_table_get_model (task_table);
+
+	for (iter = list; iter != NULL; iter = iter->next) {
+		ECalModelComponent *comp_data = iter->data;
+		e_cal_model_tasks_mark_comp_complete (
+			E_CAL_MODEL_TASKS (model), comp_data);
+	}
+
+	g_slist_free (list);
+}
+
+static void
+action_calendar_taskpad_mark_incomplete_cb (GtkAction *action,
+                                            ECalShellView *cal_shell_view)
+{
+	ECalShellContent *cal_shell_content;
+	ECalendarTable *task_table;
+	ECalModel *model;
+	GSList *list, *iter;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	task_table = e_cal_shell_content_get_task_table (cal_shell_content);
+	list = e_calendar_table_get_selected (task_table);
+	model = e_calendar_table_get_model (task_table);
+
+	for (iter = list; iter != NULL; iter = iter->next) {
+		ECalModelComponent *comp_data = iter->data;
+		e_cal_model_tasks_mark_comp_incomplete (
+			E_CAL_MODEL_TASKS (model), comp_data);
+	}
+
+	g_slist_free (list);
+}
+
+static void
+action_calendar_taskpad_new_cb (GtkAction *action,
+                                ECalShellView *cal_shell_view)
+{
+	ECalShellContent *cal_shell_content;
+	ECalendarTable *task_table;
+	ECalModelComponent *comp_data;
+	ECal *client;
+	ECalComponent *comp;
+	CompEditor *editor;
+	GSList *list;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	task_table = e_cal_shell_content_get_task_table (cal_shell_content);
+
+	list = e_calendar_table_get_selected (task_table);
+	g_return_if_fail (list != NULL);
+	comp_data = list->data;
+	g_slist_free (list);
+
+	client = comp_data->client;
+	editor = task_editor_new (client, COMP_EDITOR_NEW_ITEM);
+	comp = cal_comp_task_new_with_defaults (client);
+	comp_editor_edit_comp (editor, comp);
+
+	gtk_window_present (GTK_WINDOW (editor));
+
+	g_object_unref (comp);
+	g_object_unref (client);
+}
+
+static void
+action_calendar_taskpad_open_cb (GtkAction *action,
+                                 ECalShellView *cal_shell_view)
+{
+	ECalShellContent *cal_shell_content;
+	ECalendarTable *task_table;
+	ECalModelComponent *comp_data;
+	GSList *list;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	task_table = e_cal_shell_content_get_task_table (cal_shell_content);
+
+	list = e_calendar_table_get_selected (task_table);
+	g_return_if_fail (list != NULL);
+	comp_data = list->data;
+	g_slist_free (list);
+
+	/* XXX We only open the first selected task. */
+	e_cal_shell_view_taskpad_open_task (cal_shell_view, comp_data);
+}
+
+static void
+action_calendar_taskpad_open_url_cb (GtkAction *action,
+                                     ECalShellView *cal_shell_view)
+{
+	ECalShellContent *cal_shell_content;
+	ECalendarTable *task_table;
+	ECalModelComponent *comp_data;
+	icalproperty *prop;
+	GdkScreen *screen;
+	const gchar *uri;
+	GSList *list;
+	GError *error = NULL;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	task_table = e_cal_shell_content_get_task_table (cal_shell_content);
+
+	list = e_calendar_table_get_selected (task_table);
+	g_return_if_fail (list != NULL);
+	comp_data = list->data;
+
+	/* XXX We only open the URI of the first selected task. */
+	prop = icalcomponent_get_first_property (
+		comp_data->icalcomp, ICAL_URL_PROPERTY);
+	g_return_if_fail (prop == NULL);
+
+	screen = gtk_widget_get_screen (GTK_WIDGET (cal_shell_view));
+	uri = icalproperty_get_url (prop);
+	gtk_show_uri (screen, uri, GDK_CURRENT_TIME, &error);
+
+	if (error != NULL) {
+		g_warning ("%s", error->message);
+		g_error_free (error);
+	}
+}
+
+static void
+action_calendar_taskpad_print_cb (GtkAction *action,
+                                  ECalShellView *cal_shell_view)
+{
+	ECalShellContent *cal_shell_content;
+	ECalendarTable *task_table;
+	ECalModelComponent *comp_data;
+	ECalComponent *comp;
+	icalcomponent *clone;
+	GtkPrintOperationAction print_action;
+	GSList *list;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	task_table = e_cal_shell_content_get_task_table (cal_shell_content);
+
+	list = e_calendar_table_get_selected (task_table);
+	g_return_if_fail (list != NULL);
+	comp_data = list->data;
+	g_slist_free (list);
+
+	/* XXX We only print the first selected task. */
+	comp = e_cal_component_new ();
+	clone = icalcomponent_new_clone (comp_data->icalcomp);
+	print_action = GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG;
+	e_cal_component_set_icalcomponent (comp, clone);
+	print_comp (comp, comp_data->client, print_action);
+	g_object_unref (comp);
+}
+
+static void
+action_calendar_taskpad_save_as_cb (GtkAction *action,
+                                    ECalShellView *cal_shell_view)
+{
+	ECalShellContent *cal_shell_content;
+	ECalendarTable *task_table;
+	ECalModelComponent *comp_data;
+	GSList *list;
+	gchar *filename;
+	gchar *string;
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	task_table = e_cal_shell_content_get_task_table (cal_shell_content);
+
+	list = e_calendar_table_get_selected (task_table);
+	g_return_if_fail (list != NULL);
+	comp_data = list->data;
+	g_slist_free (list);
+
+	filename = e_file_dialog_save (_("Save as..."), NULL);
+	if (filename == NULL)
+		return;
+
+	string = e_cal_get_component_as_string (
+		comp_data->client, comp_data->icalcomp);
+	if (string == NULL) {
+		g_warning ("Could not convert task to a string");
+		return;
+	}
+
+	e_write_file_uri (filename, string);
+
+	g_free (filename);
+	g_free (string);
+}
+
+static GtkActionEntry calendar_taskpad_entries[] = {
+
+	{ "calendar-taskpad-assign",
+	  NULL,
+	  N_("_Assign Task"),
+	  NULL,
+	  NULL,  /* XXX Add a tooltip! */
+	  G_CALLBACK (action_calendar_taskpad_assign_cb) },
+
+	{ "calendar-taskpad-clipboard-copy",
+	  GTK_STOCK_COPY,
+	  NULL,
+	  NULL,
+	  N_("Copy selected tasks"),
+	  G_CALLBACK (action_calendar_taskpad_clipboard_copy_cb) },
+
+	{ "calendar-taskpad-clipboard-cut",
+	  GTK_STOCK_CUT,
+	  NULL,
+	  NULL,
+	  N_("Cut selected tasks"),
+	  G_CALLBACK (action_calendar_taskpad_clipboard_cut_cb) },
+
+	{ "calendar-taskpad-clipboard-paste",
+	  GTK_STOCK_PASTE,
+	  NULL,
+	  NULL,
+	  N_("Paste tasks from the clipboard"),
+	  G_CALLBACK (action_calendar_taskpad_clipboard_paste_cb) },
+
+	{ "calendar-taskpad-delete",
+	  GTK_STOCK_DELETE,
+	  N_("_Delete Task"),
+	  NULL,
+	  N_("Delete selected tasks"),
+	  G_CALLBACK (action_calendar_taskpad_delete_cb) },
+
+	{ "calendar-taskpad-forward",
+	  "mail-forward",
+	  N_("_Forward as iCalendar..."),
+	  NULL,
+	  NULL,  /* XXX Add a tooltip! */
+	  G_CALLBACK (action_calendar_taskpad_forward_cb) },
+
+	{ "calendar-taskpad-mark-complete",
+	  NULL,
+	  N_("_Mark as Complete"),
+	  NULL,
+	  N_("Mark selected tasks as complete"),
+	  G_CALLBACK (action_calendar_taskpad_mark_complete_cb) },
+
+	{ "calendar-taskpad-mark-incomplete",
+	  NULL,
+	  N_("_Mar_k as Incomplete"),
+	  NULL,
+	  N_("Mark selected tasks as incomplete"),
+	  G_CALLBACK (action_calendar_taskpad_mark_incomplete_cb) },
+
+	{ "calendar-taskpad-new",
+	  "stock_task",
+	  N_("New _Task"),
+	  NULL,
+	  N_("Create a new task"),
+	  G_CALLBACK (action_calendar_taskpad_new_cb) },
+
+	{ "calendar-taskpad-open",
+	  GTK_STOCK_OPEN,
+	  N_("_Open Task"),
+	  NULL,
+	  N_("View the selected task"),
+	  G_CALLBACK (action_calendar_taskpad_open_cb) },
+
+	{ "calendar-taskpad-open-url",
+	  "applications-internet",
+	  N_("Open _Web Page"),
+	  NULL,
+	  NULL,  /* XXX Add a tooltip! */
+	  G_CALLBACK (action_calendar_taskpad_open_url_cb) },
+
+	{ "calendar-taskpad-print",
+	  GTK_STOCK_PRINT,
+	  NULL,
+	  NULL,
+	  N_("Print the selected task"),
+	  G_CALLBACK (action_calendar_taskpad_print_cb) },
+
+	{ "calendar-taskpad-save-as",
+	  GTK_STOCK_SAVE_AS,
+	  N_("_Save as iCalendar..."),
+	  NULL,
+	  NULL,  /* XXX Add a tooltip! */
+	  G_CALLBACK (action_calendar_taskpad_save_as_cb) }
+};
+
+void
+e_cal_shell_view_taskpad_actions_init (ECalShellView *cal_shell_view)
+{
+	EShellView *shell_view;
+	EShellWindow *shell_window;
+	GtkActionGroup *action_group;
+	GtkUIManager *ui_manager;
+
+	shell_view = E_SHELL_VIEW (cal_shell_view);
+	shell_window = e_shell_view_get_shell_window (shell_view);
+	ui_manager = e_shell_window_get_ui_manager (shell_window);
+
+	action_group = cal_shell_view->priv->calendar_actions;
+	gtk_action_group_add_actions (
+		action_group, calendar_taskpad_entries,
+		G_N_ELEMENTS (calendar_taskpad_entries), cal_shell_view);
+	gtk_ui_manager_insert_action_group (ui_manager, action_group, 0);
+}
+
+void
+e_cal_shell_view_taskpad_actions_update (ECalShellView *cal_shell_view)
+{
+	ECalShellContent *cal_shell_content;
+	EShellWindow *shell_window;
+	EShellView *shell_view;
+	ECalendarTable *task_table;
+	ETable *table;
+	GtkAction *action;
+	GSList *list, *iter;
+	const gchar *label;
+	gboolean assignable = TRUE;
+	gboolean editable = TRUE;
+	gboolean has_url = FALSE;
+	gboolean sensitive;
+	gint n_selected;
+	gint n_complete = 0;
+	gint n_incomplete = 0;
+
+	shell_view = E_SHELL_VIEW (cal_shell_view);
+	shell_window = e_shell_view_get_shell_window (shell_view);
+
+	cal_shell_content = cal_shell_view->priv->cal_shell_content;
+	task_table = e_cal_shell_content_get_task_table (cal_shell_content);
+
+	table = e_calendar_table_get_table (task_table);
+	n_selected = e_table_selected_count (table);
+
+	list = e_calendar_table_get_selected (task_table);
+	for (iter = list; iter != NULL; iter = iter->next) {
+		ECalModelComponent *comp_data = iter->data;
+		icalproperty *prop;
+		const gchar *cap;
+		gboolean read_only;
+
+		e_cal_is_read_only (comp_data->client, &read_only, NULL);
+		editable &= !read_only;
+
+		cap = CAL_STATIC_CAPABILITY_NO_TASK_ASSIGNMENT;
+		if (e_cal_get_static_capability (comp_data->client, cap))
+			assignable = FALSE;
+
+		cap = CAL_STATIC_CAPABILITY_NO_CONV_TO_ASSIGN_TASK;
+		if (e_cal_get_static_capability (comp_data->client, cap))
+			assignable = FALSE;
+
+		prop = icalcomponent_get_first_property (
+			comp_data->icalcomp, ICAL_URL_PROPERTY);
+		has_url |= (prop != NULL);
+
+		prop = icalcomponent_get_first_property (
+			comp_data->icalcomp, ICAL_COMPLETED_PROPERTY);
+		if (prop != NULL)
+			n_complete++;
+		else
+			n_incomplete++;
+	}
+	g_slist_free (list);
+
+	action = ACTION (CALENDAR_TASKPAD_ASSIGN);
+	sensitive = (n_selected == 1) && editable && assignable;
+	gtk_action_set_sensitive (action, sensitive);
+
+	action = ACTION (CALENDAR_TASKPAD_CLIPBOARD_COPY);
+	sensitive = (n_selected > 0);
+	gtk_action_set_sensitive (action, sensitive);
+
+	action = ACTION (CALENDAR_TASKPAD_CLIPBOARD_CUT);
+	sensitive = (n_selected > 0) && editable;
+	gtk_action_set_sensitive (action, sensitive);
+
+	action = ACTION (CALENDAR_TASKPAD_CLIPBOARD_PASTE);
+	sensitive = editable;
+	gtk_action_set_sensitive (action, sensitive);
+
+	action = ACTION (CALENDAR_TASKPAD_DELETE);
+	sensitive = (n_selected > 0) && editable;
+	gtk_action_set_sensitive (action, sensitive);
+	label = ngettext ("Delete Task", "Delete Tasks", n_selected);
+	g_object_set (action, "label", label, NULL);
+
+	action = ACTION (CALENDAR_TASKPAD_FORWARD);
+	sensitive = (n_selected == 1);
+	gtk_action_set_sensitive (action, sensitive);
+
+	action = ACTION (CALENDAR_TASKPAD_MARK_COMPLETE);
+	sensitive = (n_selected > 0) && editable && (n_incomplete > 0);
+	gtk_action_set_sensitive (action, sensitive);
+
+	action = ACTION (CALENDAR_TASKPAD_MARK_INCOMPLETE);
+	sensitive = (n_selected > 0) && editable && (n_complete > 0);
+	gtk_action_set_sensitive (action, sensitive);
+
+	action = ACTION (CALENDAR_TASKPAD_OPEN);
+	sensitive = (n_selected == 1);
+	gtk_action_set_sensitive (action, sensitive);
+
+	action = ACTION (CALENDAR_TASKPAD_OPEN_URL);
+	sensitive = (n_selected == 1) && has_url;
+	gtk_action_set_sensitive (action, sensitive);
+
+	action = ACTION (CALENDAR_TASKPAD_PRINT);
+	sensitive = (n_selected == 1);
+	gtk_action_set_sensitive (action, sensitive);
+
+	action = ACTION (CALENDAR_TASKPAD_SAVE_AS);
+	sensitive = (n_selected == 1);
+	gtk_action_set_sensitive (action, sensitive);
+}
+
+void
+e_cal_shell_view_taskpad_open_task (ECalShellView *cal_shell_view,
+                                    ECalModelComponent *comp_data)
+{
+	CompEditor *editor;
+	CompEditorFlags flags = 0;
+	ECalComponent *comp;
+	icalcomponent *clone;
+	icalproperty *prop;
+	const gchar *uid;
+
+	g_return_if_fail (E_IS_CAL_SHELL_VIEW (cal_shell_view));
+	g_return_if_fail (E_IS_CAL_MODEL_COMPONENT (comp_data));
+
+	uid = icalcomponent_get_uid (comp_data->icalcomp);
+	editor = comp_editor_find_instance (uid);
+
+	if (editor != NULL)
+		goto exit;
+
+	comp = e_cal_component_new ();
+	clone = icalcomponent_new_clone (comp_data->icalcomp);
+	e_cal_component_set_icalcomponent (comp, clone);
+
+	prop = icalcomponent_get_first_property (
+		comp_data->icalcomp, ICAL_ATTENDEE_PROPERTY);
+	if (prop != NULL)
+		flags |= COMP_EDITOR_IS_ASSIGNED;
+
+	if (itip_organizer_is_user (comp, comp_data->client))
+		flags |= COMP_EDITOR_USER_ORG;
+
+	if (!e_cal_component_has_attendees (comp))
+		flags |= COMP_EDITOR_USER_ORG;
+
+	editor = task_editor_new (comp_data->client, flags);
+	comp_editor_edit_comp (editor, comp);
+
+	g_object_ref (comp);
+
+	if (flags & COMP_EDITOR_IS_ASSIGNED)
+		task_editor_show_assignment (TASK_EDITOR (editor));
+
+exit:
+	gtk_window_present (GTK_WINDOW (editor));
+}
diff --git a/calendar/modules/e-cal-shell-view.c b/calendar/modules/e-cal-shell-view.c
index 06e433be31..353658474b 100644
--- a/calendar/modules/e-cal-shell-view.c
+++ b/calendar/modules/e-cal-shell-view.c
@@ -77,17 +77,99 @@ static void
 cal_shell_view_update_actions (EShellView *shell_view)
 {
 	ECalShellViewPrivate *priv;
+	ECalShellContent *cal_shell_content;
+	ECalShellSidebar *cal_shell_sidebar;
 	EShellWindow *shell_window;
+	GnomeCalendar *calendar;
+	ECalModel *model;
+	ESourceSelector *selector;
+	ESource *source;
+	GtkAction *action;
+	GtkWidget *widget;
+	GList *list, *iter;
+	const gchar *uri = NULL;
+	gboolean user_created_source;
+	gboolean editable = TRUE;
+	gboolean recurring = FALSE;
+	gboolean sensitive;
+	gint n_selected;
 
 	priv = E_CAL_SHELL_VIEW_GET_PRIVATE (shell_view);
 
 	shell_window = e_shell_view_get_shell_window (shell_view);
 
-	/* FIXME */
+	cal_shell_content = priv->cal_shell_content;
+	calendar = e_cal_shell_content_get_calendar (cal_shell_content);
+	widget = gnome_calendar_get_current_view_widget (calendar);
+	model = e_calendar_view_get_model (E_CALENDAR_VIEW (widget));
+
+	cal_shell_sidebar = priv->cal_shell_sidebar;
+	selector = e_cal_shell_sidebar_get_selector (cal_shell_sidebar);
+
+	list = e_calendar_view_get_selected_events (E_CALENDAR_VIEW (widget));
+	n_selected = g_list_length (list);
+
+	for (iter = list; iter != NULL; iter = iter->next) {
+		ECalModelComponent *comp_data = iter->data;
+		gboolean read_only;
+
+		e_cal_is_read_only (comp_data->client, &read_only, NULL);
+		editable &= !read_only;
+
+		if (e_cal_util_component_has_recurrences (comp_data->icalcomp))
+			recurring |= TRUE;
+		else if (e_cal_util_component_is_instance (comp_data->icalcomp))
+			recurring |= TRUE;
+	}
+
+	source = e_source_selector_peek_primary_selection (selector);
+	if (source != NULL)
+		uri = e_source_peek_relative_uri (source);
+	user_created_source = (uri != NULL && strcmp (uri, "system") != 0);
+
+	action = ACTION (CALENDAR_COPY);
+	sensitive = (source != NULL);
+	gtk_action_set_sensitive (action, sensitive);
+
+	action = ACTION (CALENDAR_DELETE);
+	sensitive = user_created_source;
+	gtk_action_set_sensitive (action, sensitive);
+
+	action = ACTION (CALENDAR_PROPERTIES);
+	sensitive = (source != NULL);
+	gtk_action_set_sensitive (action, sensitive);
+
+	action = ACTION (EVENT_CLIPBOARD_COPY);
+	sensitive = (n_selected > 0);
+	gtk_action_set_sensitive (action, sensitive);
+
+	action = ACTION (EVENT_CLIPBOARD_CUT);
+	sensitive = (n_selected > 0) && editable;
+	gtk_action_set_sensitive (action, sensitive);
+
+	action = ACTION (EVENT_CLIPBOARD_PASTE);
+	sensitive = editable;
+	gtk_action_set_sensitive (action, sensitive);
+
+	action = ACTION (EVENT_DELETE);
+	sensitive = (n_selected > 0) && editable && !recurring;
+	gtk_action_set_sensitive (action, sensitive);
+
+	action = ACTION (EVENT_DELETE_OCCURRENCE);
+	sensitive = (n_selected > 0) && editable && recurring;
+	gtk_action_set_sensitive (action, sensitive);
+
+	action = ACTION (EVENT_DELETE_OCCURRENCE_ALL);
+	sensitive = (n_selected > 0) && editable && recurring;
+	gtk_action_set_sensitive (action, sensitive);
+
+	action = ACTION (EVENT_OPEN);
+	sensitive = (n_selected == 1);
+	gtk_action_set_sensitive (action, sensitive);
 }
 
 static void
-cal_shell_view_class_init (ECalShellView *class,
+cal_shell_view_class_init (ECalShellViewClass *class,
                             GTypeModule *type_module)
 {
 	GObjectClass *object_class;
diff --git a/calendar/modules/e-memo-shell-module.c b/calendar/modules/e-memo-shell-module.c
index 7f6df49691..9f6c45b695 100644
--- a/calendar/modules/e-memo-shell-module.c
+++ b/calendar/modules/e-memo-shell-module.c
@@ -480,10 +480,9 @@ e_shell_module_init (GTypeModule *type_module)
 	shell_module = E_SHELL_MODULE (type_module);
 	shell = e_shell_module_get_shell (shell_module);
 
-	/* Register the GType for EMemoShellView. */
-	e_memo_shell_view_get_type (type_module);
-
-	e_shell_module_set_info (shell_module, &module_info);
+	e_shell_module_set_info (
+		shell_module, &module_info,
+		e_memo_shell_view_get_type (type_module));
 
 	memo_module_ensure_sources (shell_module);
 
diff --git a/calendar/modules/e-memo-shell-sidebar.c b/calendar/modules/e-memo-shell-sidebar.c
index 63629f2108..e46b84e8ea 100644
--- a/calendar/modules/e-memo-shell-sidebar.c
+++ b/calendar/modules/e-memo-shell-sidebar.c
@@ -360,6 +360,7 @@ memo_shell_sidebar_constructed (GObject *object)
 	GtkContainer *container;
 	GtkTreeModel *model;
 	GtkWidget *widget;
+	AtkObject *a11y;
 	GSList *list, *iter;
 	gchar *uid;
 
@@ -389,6 +390,8 @@ memo_shell_sidebar_constructed (GObject *object)
 	widget = e_calendar_selector_new (source_list);
 	e_source_selector_set_select_new (E_SOURCE_SELECTOR (widget), TRUE);
 	gtk_container_add (container, widget);
+	a11y = gtk_widget_get_accessible (widget);
+	atk_object_set_name (a11y, _("Memo List Selector"));
 	priv->selector = g_object_ref (widget);
 	gtk_widget_show (widget);
 
diff --git a/calendar/modules/e-memo-shell-view-actions.c b/calendar/modules/e-memo-shell-view-actions.c
index cbbaceaf9c..d6e9387e31 100644
--- a/calendar/modules/e-memo-shell-view-actions.c
+++ b/calendar/modules/e-memo-shell-view-actions.c
@@ -29,6 +29,9 @@ action_gal_save_custom_view_cb (GtkAction *action,
 	EShellView *shell_view;
 	GalViewInstance *view_instance;
 
+	/* All shell views respond to the activation of this action,
+	 * which is defined by EShellWindow.  But only the currently
+	 * active shell view proceeds with saving the custom view. */
 	shell_view = E_SHELL_VIEW (memo_shell_view);
 	if (!e_shell_view_is_active (shell_view))
 		return;
@@ -47,6 +50,7 @@ action_memo_clipboard_copy_cb (GtkAction *action,
 
 	memo_shell_content = memo_shell_view->priv->memo_shell_content;
 	memo_table = e_memo_shell_content_get_memo_table (memo_shell_content);
+
 	e_memo_table_copy_clipboard (memo_table);
 }
 
@@ -59,6 +63,7 @@ action_memo_clipboard_cut_cb (GtkAction *action,
 
 	memo_shell_content = memo_shell_view->priv->memo_shell_content;
 	memo_table = e_memo_shell_content_get_memo_table (memo_shell_content);
+
 	e_memo_table_cut_clipboard (memo_table);
 }
 
@@ -71,6 +76,7 @@ action_memo_clipboard_paste_cb (GtkAction *action,
 
 	memo_shell_content = memo_shell_view->priv->memo_shell_content;
 	memo_table = e_memo_shell_content_get_memo_table (memo_shell_content);
+
 	e_memo_table_paste_clipboard (memo_table);
 }
 
@@ -384,6 +390,7 @@ action_memo_open_url_cb (GtkAction *action,
 	list = e_memo_table_get_selected (memo_table);
 	g_return_if_fail (list != NULL);
 	comp_data = list->data;
+	g_slist_free (list);
 
 	/* XXX We only open the URI of the first selected memo. */
 	prop = icalcomponent_get_first_property (
@@ -464,6 +471,7 @@ action_memo_save_as_cb (GtkAction *action,
 	if (filename == NULL)
 		return;
 
+	/* XXX We only save the first selected memo. */
 	string = e_cal_get_component_as_string (
 		comp_data->client, comp_data->icalcomp);
 	if (string == NULL) {
@@ -483,6 +491,9 @@ action_search_execute_cb (GtkAction *action,
 {
 	EShellView *shell_view;
 
+	/* All shell views respond to the activation of this action,
+	 * which is defined by EShellWindow.  But only the currently
+	 * active shell view proceeds with executing the search. */
 	shell_view = E_SHELL_VIEW (memo_shell_view);
 	if (!e_shell_view_is_active (shell_view))
 		return;
@@ -523,7 +534,7 @@ static GtkActionEntry memo_entries[] = {
 
 	{ "memo-delete",
 	  GTK_STOCK_DELETE,
-	  N_("Delete Memo"),
+	  N_("_Delete Memo"),
 	  NULL,
 	  N_("Delete selected memos"),
 	  G_CALLBACK (action_memo_delete_cb) },
@@ -678,7 +689,7 @@ e_memo_shell_view_actions_init (EMemoShellView *memo_shell_view)
 	EShellView *shell_view;
 	EShellWindow *shell_window;
 	GtkActionGroup *action_group;
-	GtkUIManager *manager;
+	GtkUIManager *ui_manager;
 	GConfBridge *bridge;
 	GtkAction *action;
 	GObject *object;
@@ -687,7 +698,7 @@ e_memo_shell_view_actions_init (EMemoShellView *memo_shell_view)
 
 	shell_view = E_SHELL_VIEW (memo_shell_view);
 	shell_window = e_shell_view_get_shell_window (shell_view);
-	manager = e_shell_window_get_ui_manager (shell_window);
+	ui_manager = e_shell_window_get_ui_manager (shell_window);
 	domain = GETTEXT_PACKAGE;
 
 	action_group = memo_shell_view->priv->memo_actions;
@@ -703,7 +714,7 @@ e_memo_shell_view_actions_init (EMemoShellView *memo_shell_view)
 		G_N_ELEMENTS (memo_search_entries),
 		MEMO_SEARCH_SUMMARY_CONTAINS,
 		NULL, NULL);
-	gtk_ui_manager_insert_action_group (manager, action_group, 0);
+	gtk_ui_manager_insert_action_group (ui_manager, action_group, 0);
 
 	/* Bind GObject properties to GConf keys. */
 
diff --git a/calendar/modules/e-memo-shell-view-private.c b/calendar/modules/e-memo-shell-view-private.c
index 4c2312a9d2..183d48a5b0 100644
--- a/calendar/modules/e-memo-shell-view-private.c
+++ b/calendar/modules/e-memo-shell-view-private.c
@@ -178,7 +178,6 @@ e_memo_shell_view_private_constructed (EMemoShellView *memo_shell_view)
 	EMemoShellContent *memo_shell_content;
 	EMemoShellSidebar *memo_shell_sidebar;
 	EShellView *shell_view;
-	EShellWindow *shell_window;
 	EShellContent *shell_content;
 	EShellSidebar *shell_sidebar;
 	EMemoTable *memo_table;
@@ -187,7 +186,6 @@ e_memo_shell_view_private_constructed (EMemoShellView *memo_shell_view)
 	ESourceSelector *selector;
 
 	shell_view = E_SHELL_VIEW (memo_shell_view);
-	shell_window = e_shell_view_get_shell_window (shell_view);
 	shell_content = e_shell_view_get_shell_content (shell_view);
 	shell_sidebar = e_shell_view_get_shell_sidebar (shell_view);
 
diff --git a/calendar/modules/e-memo-shell-view.c b/calendar/modules/e-memo-shell-view.c
index 17a28fb0d8..72427107d3 100644
--- a/calendar/modules/e-memo-shell-view.c
+++ b/calendar/modules/e-memo-shell-view.c
@@ -81,8 +81,8 @@ memo_shell_view_update_actions (EShellView *shell_view)
 	EMemoShellSidebar *memo_shell_sidebar;
 	EShellWindow *shell_window;
 	ESourceSelector *selector;
-	ETable *table;
 	EMemoTable *memo_table;
+	ETable *table;
 	ESource *source;
 	GtkAction *action;
 	GSList *list, *iter;
@@ -179,7 +179,7 @@ memo_shell_view_update_actions (EShellView *shell_view)
 }
 
 static void
-memo_shell_view_class_init (EMemoShellView *class,
+memo_shell_view_class_init (EMemoShellViewClass *class,
                             GTypeModule *type_module)
 {
 	GObjectClass *object_class;
diff --git a/calendar/modules/e-task-shell-module.c b/calendar/modules/e-task-shell-module.c
index c5f268d131..9ed38b0cad 100644
--- a/calendar/modules/e-task-shell-module.c
+++ b/calendar/modules/e-task-shell-module.c
@@ -486,10 +486,9 @@ e_shell_module_init (GTypeModule *type_module)
         shell_module = E_SHELL_MODULE (type_module);
         shell = e_shell_module_get_shell (shell_module);
 
-	/* Register the GType for ETaskShellView. */
-        e_task_shell_view_get_type (type_module);
-
-        e_shell_module_set_info (shell_module, &module_info);
+        e_shell_module_set_info (
+		shell_module, &module_info,
+		e_task_shell_view_get_type (type_module));
 
 	task_module_ensure_sources (shell_module);
 
diff --git a/calendar/modules/e-task-shell-sidebar.c b/calendar/modules/e-task-shell-sidebar.c
index e36c05b879..6a84ef3179 100644
--- a/calendar/modules/e-task-shell-sidebar.c
+++ b/calendar/modules/e-task-shell-sidebar.c
@@ -360,6 +360,7 @@ task_shell_sidebar_constructed (GObject *object)
 	GtkContainer *container;
 	GtkTreeModel *model;
 	GtkWidget *widget;
+	AtkObject *a11y;
 	GSList *list, *iter;
 	gchar *uid;
 
@@ -389,6 +390,8 @@ task_shell_sidebar_constructed (GObject *object)
 	widget = e_calendar_selector_new (source_list);
 	e_source_selector_set_select_new (E_SOURCE_SELECTOR (widget), TRUE);
 	gtk_container_add (container, widget);
+	a11y = gtk_widget_get_accessible (widget);
+	atk_object_set_name (a11y, _("Task List Selector"));
 	priv->selector = g_object_ref (widget);
 	gtk_widget_show (widget);
 
diff --git a/calendar/modules/e-task-shell-view-actions.c b/calendar/modules/e-task-shell-view-actions.c
index fe7331b4be..805089ea8b 100644
--- a/calendar/modules/e-task-shell-view-actions.c
+++ b/calendar/modules/e-task-shell-view-actions.c
@@ -29,6 +29,9 @@ action_gal_save_custom_view_cb (GtkAction *action,
 	EShellView *shell_view;
 	GalViewInstance *view_instance;
 
+	/* All shell views respond to the activation of this action,
+	 * which is defined by EShellWindow.  But only the currently
+	 * active shell view proceeds with saving the custom view. */
 	shell_view = E_SHELL_VIEW (task_shell_view);
 	if (!e_shell_view_is_active (shell_view))
 		return;
@@ -44,6 +47,9 @@ action_search_execute_cb (GtkAction *action,
 {
 	EShellView *shell_view;
 
+	/* All shell views respond to the activation of this action,
+	 * which is defined by EShellWindow.  But only the currently
+	 * active shell view proceeds with executing the search. */
 	shell_view = E_SHELL_VIEW (task_shell_view);
 	if (!e_shell_view_is_active (shell_view))
 		return;
@@ -91,6 +97,7 @@ action_task_clipboard_copy_cb (GtkAction *action,
 
 	task_shell_content = task_shell_view->priv->task_shell_content;
 	task_table = e_task_shell_content_get_task_table (task_shell_content);
+
 	e_calendar_table_copy_clipboard (task_table);
 }
 
@@ -103,6 +110,7 @@ action_task_clipboard_cut_cb (GtkAction *action,
 
 	task_shell_content = task_shell_view->priv->task_shell_content;
 	task_table = e_task_shell_content_get_task_table (task_shell_content);
+
 	e_calendar_table_cut_clipboard (task_table);
 }
 
@@ -115,6 +123,7 @@ action_task_clipboard_paste_cb (GtkAction *action,
 
 	task_shell_content = task_shell_view->priv->task_shell_content;
 	task_table = e_task_shell_content_get_task_table (task_shell_content);
+
 	e_calendar_table_paste_clipboard (task_table);
 }
 
@@ -535,6 +544,50 @@ static void
 action_task_purge_cb (GtkAction *action,
                       ETaskShellView *task_shell_view)
 {
+	EShellView *shell_view;
+	EShellWindow *shell_window;
+	GtkWidget *dialog;
+	GtkWidget *widget;
+	gboolean active;
+	gint response;
+
+	shell_view = E_SHELL_VIEW (task_shell_view);
+	shell_window = e_shell_view_get_shell_window (shell_view);
+
+	if (!calendar_config_get_confirm_purge ())
+		goto purge;
+
+	/* XXX This needs reworked.  The dialog looks like ass. */
+
+	dialog = gtk_message_dialog_new (
+		GTK_WINDOW (shell_window),
+		GTK_DIALOG_DESTROY_WITH_PARENT,
+		GTK_MESSAGE_WARNING,
+		GTK_BUTTONS_YES_NO,
+		"%s", _("This operation will permanently erase all tasks "
+		"marked as completed. If you continue, you will not be able "
+		"to recover these tasks.\n\nReally erase these tasks?"));
+
+	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_NO);
+
+	widget = gtk_check_button_new_with_label (_("Do not ask me again"));
+	gtk_box_pack_start (
+		GTK_BOX (GTK_DIALOG (dialog)->vbox), widget, TRUE, TRUE, 6);
+	gtk_widget_show (widget);
+
+	response = gtk_dialog_run (GTK_DIALOG (dialog));
+	active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
+	gtk_widget_destroy (dialog);
+
+	if (response != GTK_RESPONSE_YES)
+		return;
+
+	if (active)
+		calendar_config_set_confirm_purge (FALSE);
+
+purge:
+
+	/* FIXME */
 }
 
 static void
@@ -825,7 +878,7 @@ e_task_shell_view_actions_init (ETaskShellView *task_shell_view)
 	EShellView *shell_view;
 	EShellWindow *shell_window;
 	GtkActionGroup *action_group;
-	GtkUIManager *manager;
+	GtkUIManager *ui_manager;
 	GConfBridge *bridge;
 	GtkAction *action;
 	GObject *object;
@@ -834,7 +887,7 @@ e_task_shell_view_actions_init (ETaskShellView *task_shell_view)
 
 	shell_view = E_SHELL_VIEW (task_shell_view);
 	shell_window = e_shell_view_get_shell_window (shell_view);
-	manager = e_shell_window_get_ui_manager (shell_window);
+	ui_manager = e_shell_window_get_ui_manager (shell_window);
 	domain = GETTEXT_PACKAGE;
 
 	action_group = task_shell_view->priv->task_actions;
@@ -850,7 +903,7 @@ e_task_shell_view_actions_init (ETaskShellView *task_shell_view)
 		G_N_ELEMENTS (task_search_entries),
 		TASK_SEARCH_SUMMARY_CONTAINS,
 		NULL, NULL);
-	gtk_ui_manager_insert_action_group (manager, action_group, 0);
+	gtk_ui_manager_insert_action_group (ui_manager, action_group, 0);
 
 	/* Bind GObject properties to GConf keys. */
 
diff --git a/calendar/modules/e-task-shell-view-private.c b/calendar/modules/e-task-shell-view-private.c
index bd48cf3f23..754f6fe4c6 100644
--- a/calendar/modules/e-task-shell-view-private.c
+++ b/calendar/modules/e-task-shell-view-private.c
@@ -178,7 +178,6 @@ e_task_shell_view_private_constructed (ETaskShellView *task_shell_view)
 	ETaskShellContent *task_shell_content;
 	ETaskShellSidebar *task_shell_sidebar;
 	EShellView *shell_view;
-	EShellWindow *shell_window;
 	EShellContent *shell_content;
 	EShellSidebar *shell_sidebar;
 	ECalendarTable *task_table;
@@ -187,7 +186,6 @@ e_task_shell_view_private_constructed (ETaskShellView *task_shell_view)
 	ESourceSelector *selector;
 
 	shell_view = E_SHELL_VIEW (task_shell_view);
-	shell_window = e_shell_view_get_shell_window (shell_view);
 	shell_content = e_shell_view_get_shell_content (shell_view);
 	shell_sidebar = e_shell_view_get_shell_sidebar (shell_view);
 
diff --git a/calendar/modules/e-task-shell-view.c b/calendar/modules/e-task-shell-view.c
index 8ff7e16c91..9fc0643a14 100644
--- a/calendar/modules/e-task-shell-view.c
+++ b/calendar/modules/e-task-shell-view.c
@@ -148,6 +148,7 @@ task_shell_view_update_actions (EShellView *shell_view)
 
 	action = ACTION (TASK_ASSIGN);
 	sensitive = (n_selected == 1) && editable && assignable;
+	gtk_action_set_sensitive (action, sensitive);
 
 	action = ACTION (TASK_CLIPBOARD_COPY);
 	sensitive = (n_selected > 0);
@@ -213,7 +214,7 @@ task_shell_view_update_actions (EShellView *shell_view)
 }
 
 static void
-task_shell_view_class_init (ETaskShellView *class,
+task_shell_view_class_init (ETaskShellViewClass *class,
                             GTypeModule *type_module)
 {
 	GObjectClass *object_class;