This commit was manufactured by cvs2svn to create tagRELEASE-2_8_0

'RELEASE-2_8_0'.

svn path=/tags/RELEASE-2_8_0/; revision=23849

67 files changed, 0 insertions, 12261 deletions

diff --git a/a11y/.cvsignore b/a11y/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/a11y/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/a11y/ChangeLog b/a11y/ChangeLog
deleted file mode 100644
index 6752384193..0000000000
--- a/a11y/ChangeLog
+++ /dev/null
@@ -1,103 +0,0 @@
-2003-12-05  Bolian Yin <bolian.yin@sun.com>
-                                                                                
-        * calendar/ea-cal-view-event.c (ea_cal_view_event_new): shortcut when cal_view is NULL.
-        * calendar/ea-cal-view.c: Change an action name.
-        * calendar/ea-calendar.c (ea_calendar_focus_watcher): add check for event atk object.
-        * calendar/ea-week-view.c (ea_week_view_get_n_children): correct impl.
-          (get_visible_text_item_count): removed.
-                                                                                
-2003-12-06  JP Rosevear <jpr@ximian.com>
-
-	* */Makefile.am: Remove hard coded disable deprecated flags
-	
-2003-12-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* calendar/Makefile.am (SHELL_IDLS): Only get Evolution.idl.
-
-2003-11-11  Bolian Yin <bolian.yin@sun.com>
-                                                                                
-        Fixes #50538
-                                                                                
-        * new files:
-                widgets/ea-calendar-cell.[hc]
-                                                                                
-        * widgets/ea-calendar-item: impl. atk selection and atk table interface.        
-
-	* widgets/Makefile.am : use shared object library (.so)
-                                                                                
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* calendar/Makefile.am (INCLUDES): don't include toplevel libical
-	
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* Handle some more renaming
-	
-2003-11-07  JP Rosevear <jpr@ximian.com>
-
-	* Reflect renaming of ECalView to ECalendarView
-
-2003-11-04  Bolian Yin <bolian.yin@sun.com>
-
-	Fixes # 48509
-
-	* new files:
-		ea-cell-table.h ea-cell-table.c
-	* calendar/Makefile.am: add entries for new files
-	* calendar/New files added:
-		ea-day-view-main-item.c ea-day-view-main-item.h
-		ea-day-view-cell.c ea-day-view-cell.h
-	* Add debug info and remove some non-C99 compilers warnings.
-	* calendar/ea-cal-view: add action interface. 
-
-2003-10-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* calendar/Makefile.am: INCLUDE path fixes for changes made to
-	libical build.
-
-2003-08-27  Bolian Yin <bolian.yin@sun.com>
-
-	* Makefile.am: add widgets directory; move calendar idl stuff to
-	calendar directory; stop make a single shared lib for whole a11y
-	stuff.
-
-	* ea-factory.h: make factory macros available to GOBJECT
-
-	* calendar/Makefile.am: add calendar idl stuff
-
-	* calendar/ea-cal-view-event.c: add atkcomponent interface.
-
-	* calendar/ea-gnome-calendar.c (ea_gcal_switch_view_cb): add
-	details for "children_changed".
-
-	* new widgets directory for widgets a11y stuff, new files are:
-		widgets/Makefile.am, widgets/ea-calendar-item.c,
-		widgets/ea-calendar-item.h, widgets/ea-widgets.c,
-		widgets/ea-widgets.h
-
-2003-08-20  Rodrigo Moya <rodrigo@ximian.com>
-
-	* calendar/ea-cal-view-event.c (ea_cal_view_event_get_name):
-	adapted to changes in ECalViewEvent.
-
-2003-08-20  Bolian Yin <bolian.yin@sun.com>
-	setup the a11y directory for evolution accessibility work
-	New files are:
-		ChangeLog
-		ea-factory.h
-		Makefile.am
-		calendar/ea-calendar.c
-		calendar/ea-calendar.h
-		calendar/ea-calendar-helpers.c
-		calendar/ea-calendar-helpers.h
-		calendar/ea-cal-view.c
-		calendar/ea-cal-view.h
-		calendar/ea-cal-view-event.c
-		calendar/ea-cal-view-event.h
-		calendar/ea-day-view.c
-		calendar/ea-day-view.h
-		calendar/ea-week-view.c
-		calendar/ea-week-view.h
-		calendar/ea-gnome-calendar.c
-		calendar/ea-gnome-calendar.h
-		calendar/Makefile.am
diff --git a/a11y/Makefile.am b/a11y/Makefile.am
deleted file mode 100644
index c3e7a89fed..0000000000
--- a/a11y/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-SUBDIRS = . calendar widgets
-
-# for debug
-#A11Y_CFLAGS += -pedantic -ansi -DACC_DEBUG -Werror
-
-privlib_LTLIBRARIES = libevolution-a11y.la
-
-INCLUDES =                                              \
-        -I$(top_srcdir)/a11y                            \
-        $(A11Y_CFLAGS)
-
-libevolution_a11y_la_SOURCES = 		        \
-        ea-factory.h                            \
-        ea-cell-table.h                         \
-        ea-cell-table.c
-
diff --git a/a11y/calendar/.cvsignore b/a11y/calendar/.cvsignore
deleted file mode 100644
index 0e1e389af7..0000000000
--- a/a11y/calendar/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-Makefile
-Makefile.in
-Evolution-*.c
-Evolution.h
-evolution-calendar-*.c
-evolution-calendar.h
diff --git a/a11y/calendar/Makefile.am b/a11y/calendar/Makefile.am
deleted file mode 100644
index 0c4aba11a0..0000000000
--- a/a11y/calendar/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-# Calendar IDL files
-
-# for debug
-#A11Y_CFLAGS += -pedantic -ansi -DACC_DEBUG -Werror
-
-CALENDAR_IDLS = $(top_srcdir)/calendar/idl/evolution-calendar.idl
-SHELL_IDLS = \
-        $(top_srcdir)/shell/Evolution.idl
-                                                                                                                       
-CALENDAR_IDL_GENERATED_H = evolution-calendar.h
-CALENDAR_IDL_GENERATED_C =                              \
-        evolution-calendar-common.c                     \
-        evolution-calendar-skels.c                      \
-        evolution-calendar-stubs.c
-
-SHELL_IDL_GENERATED_H = Evolution.h
-SHELL_IDL_GENERATED_C =			\
-	Evolution-common.c  		\
-	Evolution-skels.c 		\
-	Evolution-stubs.c
-                                                                                                                       
-$(CALENDAR_IDL_GENERATED_H): $(CALENDAR_IDLS)
-	$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES)   \
-                $(top_srcdir)/calendar/idl/evolution-calendar.idl
-                                                                                                                       
-$(SHELL_IDL_GENERATED_H): $(SHELL_IDLS)
-	$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES)  \
-        $(top_srcdir)/shell/Evolution.idl
-
-IDL_GENERATED = $(SHELL_IDL_GENERATED_H) $(CALENDAR_IDL_GENERATED_H)
-BUILT_SOURCES = $(IDL_GENERATED)
-CLEANFILES = $(BUILT_SOURCES) $(CALENDAR_IDL_GENERATED_C) $(SHELL_IDL_GENERATED_C)
-                                                                                                                       
-privlib_LTLIBRARIES = libevolution-calendar-a11y.la
-
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"evolution-a11y\"		\
-	-I$(top_srcdir)/shell				\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_srcdir)/calendar/cal-client		\
-	-I$(top_srcdir)/calendar/gui			\
-	-I$(top_srcdir)/widgets				\
-	-I$(top_srcdir)/a11y				\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
-	-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\"	\
-	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"	\
-	-DPREFIX=\""$(prefix)"\"			\
-	$(A11Y_CFLAGS)					\
-	$(EVOLUTION_CALENDAR_CFLAGS)
-
-libevolution_calendar_a11y_la_SOURCES =		\
-	$(CALENDAR_IDL_GENERATED_H)		\
-	$(SHELL_IDL_GENERATED_H)		\
-	ea-calendar.c				\
-	ea-calendar.h				\
-	ea-calendar-helpers.c			\
-	ea-calendar-helpers.h			\
-	ea-cal-view.c				\
-	ea-cal-view.h				\
-	ea-cal-view-event.c			\
-	ea-cal-view-event.h			\
-	ea-day-view.c				\
-	ea-day-view.h				\
-	ea-day-view-main-item.c			\
-	ea-day-view-main-item.h			\
-	ea-day-view-cell.c			\
-	ea-day-view-cell.h			\
-	ea-week-view.c				\
-	ea-week-view.h				\
-	ea-gnome-calendar.c			\
-	ea-gnome-calendar.h
-
-libevolution_calendar_a11y_la_LIBADD =   \
-        $(top_builddir)/a11y/libevolution-a11y.la
-
diff --git a/a11y/calendar/ea-cal-view-event.c b/a11y/calendar/ea-cal-view-event.c
deleted file mode 100644
index 37b0d5ed90..0000000000
--- a/a11y/calendar/ea-cal-view-event.c
+++ /dev/null
@@ -1,479 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-cal-view-event.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-cal-view-event.h"
-#include "ea-calendar-helpers.h"
-#include "ea-day-view.h"
-#include "ea-week-view.h"
-#include <gal/e-text/e-text.h>
-
-static void ea_cal_view_event_class_init (EaCalViewEventClass *klass);
-
-static G_CONST_RETURN gchar* ea_cal_view_event_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_cal_view_event_get_description (AtkObject *accessible);
-static AtkObject* ea_cal_view_event_get_parent (AtkObject *accessible);
-static gint ea_cal_view_event_get_index_in_parent (AtkObject *accessible);
-
-/* component interface */
-static void atk_component_interface_init (AtkComponentIface *iface);
-static void ea_cal_view_get_extents (AtkComponent *component,
-				     gint *x, gint *y, gint *width, gint *height,
-				     AtkCoordType coord_type);
-
-#ifdef ACC_DEBUG
-static gint n_ea_cal_view_event_created = 0, n_ea_cal_view_event_destroyed = 0;
-static void ea_cal_view_finalize (GObject *object);
-#endif
-
-static gpointer parent_class = NULL;
-
-GType
-ea_cal_view_event_get_type (void)
-{
-	static GType type = 0;
-	AtkObjectFactory *factory;
-	GTypeQuery query;
-	GType derived_atk_type;
-
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (EaCalViewEventClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) ea_cal_view_event_class_init, /* class init */
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (EaCalViewEvent), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		static const GInterfaceInfo atk_component_info = {
-			(GInterfaceInitFunc) atk_component_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		/*
-		 * Figure out the size of the class and instance
-		 * we are run-time deriving from (atk object for E_TEXT, in this case)
-		 */
-
-		factory = atk_registry_get_factory (atk_get_default_registry (),
-						    E_TYPE_TEXT);
-		derived_atk_type = atk_object_factory_get_accessible_type (factory);
-		g_type_query (derived_atk_type, &query);
-
-		tinfo.class_size = query.class_size;
-		tinfo.instance_size = query.instance_size;
-
-		/* we inherit the component, text and other interfaces from E_TEXT */
-		type = g_type_register_static (derived_atk_type,
-					       "EaCalViewEvent", &tinfo, 0);
-		g_type_add_interface_static (type, ATK_TYPE_COMPONENT,
-					     &atk_component_info);
-	}
-
-	return type;
-}
-
-static void
-ea_cal_view_event_class_init (EaCalViewEventClass *klass)
-{
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-#ifdef ACC_DEBUG
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-	gobject_class->finalize = ea_cal_view_finalize;
-#endif
-
-	parent_class = g_type_class_peek_parent (klass);
-
-
-	class->get_name = ea_cal_view_event_get_name;
-	class->get_description = ea_cal_view_event_get_description;
-	class->get_parent = ea_cal_view_event_get_parent;
-	class->get_index_in_parent = ea_cal_view_event_get_index_in_parent;
-
-}
-
-#ifdef ACC_DEBUG
-static void ea_cal_view_finalize (GObject *object)
-{
-	++n_ea_cal_view_event_destroyed;
-	printf ("ACC_DEBUG: n_ea_cal_view_event_destroyed = %d\n",
-		n_ea_cal_view_event_destroyed);
-}
-#endif
-
-AtkObject* 
-ea_cal_view_event_new (GObject *obj)
-{
-	AtkObject *atk_obj = NULL;
-	GObject *target_obj;
-	ECalendarView *cal_view;
-
-	g_return_val_if_fail (E_IS_TEXT (obj), NULL);
-	cal_view = ea_calendar_helpers_get_cal_view_from (GNOME_CANVAS_ITEM (obj));
-	if (!cal_view)
-		return NULL;
-
-	if (E_IS_WEEK_VIEW (cal_view)) {
-		gint event_num, span_num;
-		EWeekViewEvent *week_view_event;
-		EWeekViewEventSpan *event_span;
-		EWeekView *week_view = E_WEEK_VIEW (cal_view);
-
-		/* for week view, we need to check if a atkobject exists for
-		 * the first span of the same event
-		 */
-		if (!e_week_view_find_event_from_item (week_view,
-						       GNOME_CANVAS_ITEM (obj),
-						       &event_num,
-						       &span_num))
-			return NULL;
-		week_view_event = &g_array_index (week_view->events,
-						  EWeekViewEvent,
-						  event_num);
-		/* get the first span */
-		event_span = &g_array_index (week_view->spans,
-					     EWeekViewEventSpan,
-					     week_view_event->spans_index);
-		target_obj = G_OBJECT (event_span->text_item);
-		atk_obj = g_object_get_data (target_obj, "accessible-object");
-
-	}
-	else
-		target_obj = obj;
-
-	if (!atk_obj) {
-		static AtkRole event_role = ATK_ROLE_INVALID;
-		atk_obj = ATK_OBJECT (g_object_new (EA_TYPE_CAL_VIEW_EVENT,
-						    NULL));
-		atk_object_initialize (atk_obj, target_obj);
-		if (event_role == ATK_ROLE_INVALID)
-			event_role = atk_role_register ("Calendar Event");
-		atk_obj->role = event_role;
-#ifdef ACC_DEBUG
-		++n_ea_cal_view_event_created;
-		printf ("ACC_DEBUG: n_ea_cal_view_event_created = %d\n",
-			n_ea_cal_view_event_created);
-#endif
-	}
-
-	/* the registered factory for E_TEXT is cannot create a EaCalViewEvent,
-	 * we should save the EaCalViewEvent object in it.
-	 */
-	g_object_set_data (obj, "accessible-object", atk_obj);
-
-	return atk_obj;
-}
-
-static G_CONST_RETURN gchar*
-ea_cal_view_event_get_name (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarViewEvent *event;
-	gchar *tmp_name;
-	gchar *new_name = g_strdup ("");
-        const char *summary;
-
-
-	g_return_val_if_fail (EA_IS_CAL_VIEW_EVENT (accessible), NULL);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj || !E_IS_TEXT (g_obj))
-		return NULL;
-	event = ea_calendar_helpers_get_cal_view_event_from (GNOME_CANVAS_ITEM(g_obj));
-
-	if (event && event->comp_data) {
-		if (e_cal_util_component_has_alarms (event->comp_data->icalcomp)) {
-			tmp_name = new_name;
-			new_name = g_strconcat (new_name, "alarm ", NULL);
-			g_free (tmp_name);
-		}
-
-		if (e_cal_util_component_has_recurrences (event->comp_data->icalcomp)) {
-			tmp_name = new_name;
-			new_name = g_strconcat (new_name, "recurrence ", NULL);
-			g_free (tmp_name);
-		}
-
-		if (event->different_timezone) {
-			tmp_name = new_name;
-			new_name = g_strconcat (new_name, "time-zone ", NULL);
-			g_free (tmp_name);
-		}
-
-		if (e_cal_util_component_has_organizer (event->comp_data->icalcomp)) {
-			tmp_name = new_name;
-			new_name = g_strconcat (new_name, "meeting ", NULL);
-			g_free (tmp_name);
-		}
-	}
-	tmp_name = new_name;
-	new_name = g_strconcat (new_name, "event. Summary is ", NULL);
-	g_free (tmp_name);
-
-	summary = icalcomponent_get_summary (event->comp_data->icalcomp);
-	if (summary) {
-		tmp_name = new_name;
-		new_name = g_strconcat (new_name, summary, NULL);
-		g_free (tmp_name);
-	}
-	else {
-		tmp_name = new_name;
-		new_name = g_strconcat (new_name, "empty", NULL);
-		g_free (tmp_name);
-	}
-
-	ATK_OBJECT_CLASS (parent_class)->set_name (accessible, new_name);
-#ifdef ACC_DEBUG
-	printf("EvoAcc:  name for event accobj=%p, is %s\n",
-	       (void *)accessible, new_name);
-#endif
-	g_free (new_name);
-	return accessible->name;
-}
-
-static G_CONST_RETURN gchar*
-ea_cal_view_event_get_description (AtkObject *accessible)
-{
-	if (accessible->description)
-		return accessible->description;
-
-	return "calendar view event";
-}
-
-static AtkObject *
-ea_cal_view_event_get_parent (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	GnomeCanvasItem *canvas_item;
-	ECalendarView *cal_view;
-
-	g_return_val_if_fail (EA_IS_CAL_VIEW_EVENT (accessible), NULL);
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (g_obj == NULL)
-		/* Object is defunct */
-		return NULL;
-	canvas_item = GNOME_CANVAS_ITEM (g_obj);
-
-	cal_view = ea_calendar_helpers_get_cal_view_from (canvas_item);
-
-	if (!cal_view)
-		return NULL;
-
-	return gtk_widget_get_accessible (GTK_WIDGET (cal_view));
-}
-
-static gint
-ea_cal_view_event_get_index_in_parent (AtkObject *accessible)
-{
-	GObject *g_obj;
-	GnomeCanvasItem *canvas_item;
-	ECalendarView *cal_view;
-	ECalendarViewEvent *cal_view_event;
-
-	g_return_val_if_fail (EA_IS_CAL_VIEW_EVENT (accessible), -1);
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(accessible));
-	if (!g_obj)
-		/* defunct object*/
-		return -1;
-
-	canvas_item = GNOME_CANVAS_ITEM (g_obj);
-	cal_view = ea_calendar_helpers_get_cal_view_from (canvas_item);
-	if (!cal_view)
-		return -1;
-
-	cal_view_event = ea_calendar_helpers_get_cal_view_event_from (canvas_item);
-	if (!cal_view_event)
-		return -1;
-
-	if (E_IS_DAY_VIEW (cal_view)) {
-		gint day, event_num, num_before;
-		EDayViewEvent *day_view_event;
-		EDayView *day_view = E_DAY_VIEW (cal_view);
-
-		/* the long event comes first in the order */
-		for (event_num = day_view->long_events->len - 1; event_num >= 0;
-		     --event_num) {
-			day_view_event = &g_array_index (day_view->long_events,
-							 EDayViewEvent, event_num);
-			if (cal_view_event == (ECalendarViewEvent*)day_view_event)
-				return event_num;
-
-		}
-		num_before = day_view->long_events->len;
-
-		for (day = 0; day < day_view->days_shown; ++day) {
-			for (event_num = day_view->events[day]->len - 1; event_num >= 0;
-			     --event_num) {
-				day_view_event = &g_array_index (day_view->events[day],
-							EDayViewEvent, event_num);
-				if (cal_view_event == (ECalendarViewEvent*)day_view_event)
-					return num_before + event_num;
-			}
-			num_before += day_view->events[day]->len;
-		}
-	}
-	else if (E_IS_WEEK_VIEW (cal_view)) {
-		gint index;
-		EWeekViewEvent *week_view_event;
-		EWeekView *week_view = E_WEEK_VIEW (cal_view);
-
-		for (index = week_view->events->len - 1; index >= 0; --index) {
-			week_view_event = &g_array_index (week_view->events,
-							  EWeekViewEvent, index);
-			if (cal_view_event == (ECalendarViewEvent*)week_view_event)
-				return index;
-		}
-	}
-	else {
-		g_assert_not_reached ();
-		return -1;
-	}
-	return -1;
-}
-
-/* Atk Component Interface */
-
-static void 
-atk_component_interface_init (AtkComponentIface *iface)
-{
-  g_return_if_fail (iface != NULL);
-
-  iface->get_extents = ea_cal_view_get_extents;
-}
-
-static void 
-ea_cal_view_get_extents (AtkComponent   *component,
-                         gint           *x,
-                         gint           *y,
-                         gint           *width,
-                         gint           *height,
-                         AtkCoordType   coord_type)
-{
-	GObject *g_obj;
-	GnomeCanvasItem *canvas_item;
-	gint x_window, y_window;
-	gint scroll_x, scroll_y;
-	ECalendarView *cal_view;
-	gint item_x, item_y, item_w, item_h;
-	GtkWidget *canvas = NULL;
-
-	g_return_if_fail (EA_IS_CAL_VIEW_EVENT (component));
-
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(component));
-	if (!g_obj)
-		/* defunct object*/
-		return;
-	g_return_if_fail (E_IS_TEXT (g_obj));
-
-	canvas_item = GNOME_CANVAS_ITEM (g_obj);
-	cal_view = ea_calendar_helpers_get_cal_view_from (canvas_item);
-	if (!cal_view)
-		return;
-
-	if (E_IS_DAY_VIEW (cal_view)) {
-		gint day, event_num;
-
-		if (!e_day_view_find_event_from_item (E_DAY_VIEW (cal_view),
-						      canvas_item,
-						      &day, &event_num))
-			return;
-		if (day == E_DAY_VIEW_LONG_EVENT) {
-			gint start_day, end_day;
-			if (!e_day_view_get_long_event_position (E_DAY_VIEW (cal_view),
-								 event_num,
-								 &start_day,
-								 &end_day,
-								 &item_x,
-								 &item_y,
-								 &item_w,
-								 &item_h))
-				return;
-			canvas = E_DAY_VIEW (cal_view)->top_canvas;
-		}
-		else {
-			if (!e_day_view_get_event_position (E_DAY_VIEW (cal_view), day,
-							    event_num,
-							    &item_x, &item_y,
-							    &item_w, &item_h))
-
-				return;
-			canvas = E_DAY_VIEW (cal_view)->main_canvas;
-		}
-	}
-	else if (E_IS_WEEK_VIEW (cal_view)) {
-		gint event_num, span_num;
-		if (!e_week_view_find_event_from_item (E_WEEK_VIEW (cal_view),
-						       canvas_item, &event_num,
-						       &span_num))
-			return;
-
-		if (!e_week_view_get_span_position (E_WEEK_VIEW (cal_view),
-						    event_num, span_num,
-						    &item_x, &item_y, &item_w))
-			return;
-		item_h = E_WEEK_VIEW_ICON_HEIGHT;
-		canvas = E_WEEK_VIEW (cal_view)->main_canvas;
-	}
-	else
-		return;
-
-	if (!canvas)
-		return;
-
-	gdk_window_get_origin (canvas->window,
-			       &x_window, &y_window);
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (canvas), &scroll_x, &scroll_y);
-
-	*x = item_x + x_window - scroll_x;
-	*y = item_y + y_window - scroll_y;
-	*width = item_w;
-	*height = item_h;
-
-	if (coord_type == ATK_XY_WINDOW) {
-		GdkWindow *window;
-		gint x_toplevel, y_toplevel;
-
-		window = gdk_window_get_toplevel (GTK_WIDGET (cal_view)->window);
-		gdk_window_get_origin (window, &x_toplevel, &y_toplevel);
-
-		*x -= x_toplevel;
-		*y -= y_toplevel;
-	}
-
-#ifdef ACC_DEBUG
-	printf ("Event Bounds (%d, %d, %d, %d)\n", *x, *y, *width, *height);
-#endif
-}
diff --git a/a11y/calendar/ea-cal-view-event.h b/a11y/calendar/ea-cal-view-event.h
deleted file mode 100644
index f139dde9fb..0000000000
--- a/a11y/calendar/ea-cal-view-event.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-cal-view-event.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#ifndef __EA_CAL_VIEW_EVENT_H__
-#define __EA_CAL_VIEW_EVENT_H__
-
-#include <atk/atkgobjectaccessible.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define EA_TYPE_CAL_VIEW_EVENT                   (ea_cal_view_event_get_type ())
-#define EA_CAL_VIEW_EVENT(obj)                   (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_CAL_VIEW_EVENT, EaCalViewEvent))
-#define EA_CAL_VIEW_EVENT_CLASS(klass)           (G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_CAL_VIEW_EVENT, EaCalViewEventClass))
-#define EA_IS_CAL_VIEW_EVENT(obj)                (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_CAL_VIEW_EVENT))
-#define EA_IS_CAL_VIEW_EVENT_CLASS(klass)        (G_TYPE_CHECK_CLASS_TYPE ((klass), EA_TYPE_CAL_VIEW_EVENT))
-#define EA_CAL_VIEW_EVENT_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), EA_TYPE_CAL_VIEW_EVENT, EaCalViewEventClass))
-
-typedef struct _EaCalViewEvent                   EaCalViewEvent;
-typedef struct _EaCalViewEventClass              EaCalViewEventClass;
-
-struct _EaCalViewEvent
-{
-	AtkGObjectAccessible parent;
-};
-
-GType ea_cal_view_event_get_type (void);
-
-struct _EaCalViewEventClass
-{
-	AtkGObjectAccessibleClass parent_class;
-};
-
-AtkObject *ea_cal_view_event_new (GObject *obj);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __EA_CAL_VIEW_EVENT_H__ */
diff --git a/a11y/calendar/ea-cal-view.c b/a11y/calendar/ea-cal-view.c
deleted file mode 100644
index 2d86d9ef10..0000000000
--- a/a11y/calendar/ea-cal-view.c
+++ /dev/null
@@ -1,440 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-cal-view.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-cal-view.h"
-#include "ea-calendar-helpers.h"
-#include "e-day-view.h"
-#include "e-week-view.h"
-#include "calendar-commands.h"
-#include "goto.h"
-#include <glib/gstrfuncs.h>
-
-static void ea_cal_view_class_init (EaCalViewClass *klass);
-
-static AtkObject* ea_cal_view_get_parent (AtkObject *accessible);
-static void ea_cal_view_real_initialize (AtkObject *accessible, gpointer data);
-
-static void ea_cal_view_event_changed_cb (ECalendarView *cal_view,
-                                          ECalendarViewEvent *event, gpointer data);
-static void ea_cal_view_event_added_cb (ECalendarView *cal_view,
-                                        ECalendarViewEvent *event, gpointer data);
-
-static gboolean idle_dates_changed (gpointer data);
-static void ea_cal_view_dates_change_cb (GnomeCalendar *gcal, gpointer data);
-
-static void atk_action_interface_init (AtkActionIface *iface);
-static gboolean action_interface_do_action (AtkAction *action, gint i);
-static gint action_interface_get_n_actions (AtkAction *action);
-static G_CONST_RETURN gchar*
-action_interface_get_description(AtkAction *action, gint i);
-static G_CONST_RETURN gchar*
-action_interface_get_keybinding (AtkAction *action, gint i);
-static G_CONST_RETURN gchar*
-action_interface_action_get_name(AtkAction *action, gint i);
-
-static gpointer parent_class = NULL;
-
-GType
-ea_cal_view_get_type (void)
-{
-	static GType type = 0;
-	AtkObjectFactory *factory;
-	GTypeQuery query;
-	GType derived_atk_type;
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (EaCalViewClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) ea_cal_view_class_init, /* class init */
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (EaCalView), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		static const GInterfaceInfo atk_action_info = {
-			(GInterfaceInitFunc) atk_action_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		/*
-		 * Figure out the size of the class and instance
-		 * we are run-time deriving from (GailWidget, in this case)
-		 */
-
-		factory = atk_registry_get_factory (atk_get_default_registry (),
-						    GTK_TYPE_WIDGET);
-		derived_atk_type = atk_object_factory_get_accessible_type (factory);
-		g_type_query (derived_atk_type, &query);
-
-		tinfo.class_size = query.class_size;
-		tinfo.instance_size = query.instance_size;
-
-		type = g_type_register_static (derived_atk_type,
-					       "EaCalView", &tinfo, 0);
-		g_type_add_interface_static (type, ATK_TYPE_ACTION,
-					     &atk_action_info);
-	}
-
-	return type;
-}
-
-static void
-ea_cal_view_class_init (EaCalViewClass *klass)
-{
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	class->get_parent = ea_cal_view_get_parent;
-	class->initialize = ea_cal_view_real_initialize;
-}
-
-AtkObject* 
-ea_cal_view_new (GtkWidget *widget)
-{
-	GObject *object;
-	AtkObject *accessible;
-
-	g_return_val_if_fail (E_IS_CALENDAR_VIEW (widget), NULL);
-
-	object = g_object_new (EA_TYPE_CAL_VIEW, NULL);
-
-	accessible = ATK_OBJECT (object);
-	atk_object_initialize (accessible, widget);
-
-	return accessible;
-}
-
-static void
-ea_cal_view_real_initialize (AtkObject *accessible, gpointer data)
-{
-	ECalendarView *cal_view;
-	GnomeCalendar *gcal;
-	static AtkRole role = ATK_ROLE_INVALID;
-
-	g_return_if_fail (EA_IS_CAL_VIEW (accessible));
-	g_return_if_fail (E_IS_CALENDAR_VIEW (data));
-
-        ATK_OBJECT_CLASS (parent_class)->initialize (accessible, data);
-	if (role == ATK_ROLE_INVALID)
-		role = atk_role_register ("Calendar View");
-	accessible->role = role;
-	cal_view = E_CALENDAR_VIEW (data);
-
-	/* add listener for event_changed, event_added
-	 * we don't need to listen on event_removed. When the e_text
-	 * of the event is removed, the cal_view_event will go to the state
-	 * of "defunct" (changed by weak ref callback of atkgobjectaccessible
-	 */
-	g_signal_connect (G_OBJECT(cal_view), "event_changed",
-			  G_CALLBACK (ea_cal_view_event_changed_cb), NULL);
-	g_signal_connect (G_OBJECT(cal_view), "event_added",
-			  G_CALLBACK (ea_cal_view_event_added_cb), NULL);
-
-	/* listen for date changes of calendar */
-	gcal = e_calendar_view_get_calendar (cal_view);
-
-	if (gcal)
-		g_signal_connect (gcal, "dates_shown_changed",
-				  G_CALLBACK (ea_cal_view_dates_change_cb),
-				  accessible);
-}
-
-static AtkObject* 
-ea_cal_view_get_parent (AtkObject *accessible)
-{
-	ECalendarView *cal_view;
-	GnomeCalendar *gnomeCalendar;
-
-	g_return_val_if_fail (EA_IS_CAL_VIEW (accessible), NULL);
-
-	if (!GTK_ACCESSIBLE (accessible)->widget)
-		return NULL;
-	cal_view = E_CALENDAR_VIEW (GTK_ACCESSIBLE (accessible)->widget);
-
-	gnomeCalendar = e_calendar_view_get_calendar (cal_view);
-
-	return gtk_widget_get_accessible (GTK_WIDGET(gnomeCalendar));
-}
-
-static void
-ea_cal_view_event_changed_cb (ECalendarView *cal_view, ECalendarViewEvent *event,
-                              gpointer data)
-{
-	AtkObject *atk_obj;
-	EaCalView *ea_cal_view;
-	AtkObject *event_atk_obj = NULL;
-
-	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
-
-	atk_obj = gtk_widget_get_accessible (GTK_WIDGET(cal_view));
-	if (!EA_IS_CAL_VIEW (atk_obj))
-		return;
-	ea_cal_view = EA_CAL_VIEW (atk_obj);
-
-	if ((E_IS_DAY_VIEW (cal_view)) && event && event->canvas_item) {
-		event_atk_obj =
-			ea_calendar_helpers_get_accessible_for (event->canvas_item);
-	}
-	else if ((E_IS_WEEK_VIEW (cal_view)) && event) {
-		EWeekViewEventSpan *span;
-		EWeekViewEvent *week_view_event = (EWeekViewEvent *)event;
-		EWeekView *week_view = E_WEEK_VIEW (cal_view);
-		/* get the first span of the event */
-		span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-				       week_view_event->spans_index);
-		if (span && span->text_item)
-			event_atk_obj = ea_calendar_helpers_get_accessible_for (span->text_item);
-	}
-	if (event_atk_obj) {
-#ifdef ACC_DEBUG
-		printf ("AccDebug: event=%p changed\n", (void *)event);
-#endif
-		g_object_notify (G_OBJECT(event_atk_obj), "accessible-name");
-		g_signal_emit_by_name (event_atk_obj, "visible_data_changed");
-	}
-
-}
-
-static void
-ea_cal_view_event_added_cb (ECalendarView *cal_view, ECalendarViewEvent *event,
-                            gpointer data)
-{
-	AtkObject *atk_obj;
-	EaCalView *ea_cal_view;
-	AtkObject *event_atk_obj = NULL;
-	gint index;
-
-	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
-
-	atk_obj = gtk_widget_get_accessible (GTK_WIDGET(cal_view));
-	if (!EA_IS_CAL_VIEW (atk_obj))
-		return;
-	ea_cal_view = EA_CAL_VIEW (atk_obj);
-
-	if ((E_IS_DAY_VIEW (cal_view)) && event && event->canvas_item) {
-		event_atk_obj =
-			ea_calendar_helpers_get_accessible_for (event->canvas_item);
-	}
-	else if ((E_IS_WEEK_VIEW (cal_view)) && event) {
-		EWeekViewEventSpan *span;
-		EWeekViewEvent *week_view_event = (EWeekViewEvent *)event;
-		EWeekView *week_view = E_WEEK_VIEW (cal_view);
-		/* get the first span of the event */
-		span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-				       week_view_event->spans_index);
-		if (span && span->text_item)
-			event_atk_obj = ea_calendar_helpers_get_accessible_for (span->text_item);
-
-	}
-	if (event_atk_obj) {
-		index = atk_object_get_index_in_parent (event_atk_obj);
-		if (index < 0)
-			return;
-#ifdef ACC_DEBUG
-		printf ("AccDebug: event=%p added\n", (void *)event);
-#endif
-		g_signal_emit_by_name (atk_obj, "children_changed::add",
-				       index, event_atk_obj, NULL);
-	}
-}
-
-static gboolean
-idle_dates_changed (gpointer data)
-{
-	AtkObject *ea_cal_view;
-
-	g_return_val_if_fail (data, FALSE);
-	g_return_val_if_fail (EA_IS_CAL_VIEW (data), FALSE);
-
-	ea_cal_view = ATK_OBJECT(data);
-
-	if (ea_cal_view->name) {
-		g_free (ea_cal_view->name);
-		ea_cal_view->name = NULL;
-	}
-	g_object_notify (G_OBJECT (ea_cal_view), "accessible-name");
-	g_signal_emit_by_name (ea_cal_view, "visible_data_changed");
-	g_signal_emit_by_name (ea_cal_view, "children_changed", NULL);
-#ifdef ACC_DEBUG
-	printf ("AccDebug: cal view date changed\n");
-#endif
-
-	return FALSE;
-}
-
-static void
-ea_cal_view_dates_change_cb (GnomeCalendar *gcal, gpointer data)
-{
-	g_idle_add (idle_dates_changed, data);
-}
-
-/* atk action interface */
-
-#define CAL_VIEW_ACTION_NUM 5
-
-static const char * action_name [CAL_VIEW_ACTION_NUM] = {
-	"New Appointment",
-	"New All Day Event",
-	"New Meeting",
-	"Go to Today",
-	"Go to Date"
-};
-
-static void
-atk_action_interface_init (AtkActionIface *iface)
-{
-	g_return_if_fail (iface != NULL);
-
-	iface->do_action = action_interface_do_action;
-	iface->get_n_actions = action_interface_get_n_actions;
-	iface->get_description = action_interface_get_description;
-	iface->get_keybinding = action_interface_get_keybinding;
-	iface->get_name = action_interface_action_get_name;
-}
-
-static gboolean
-action_interface_do_action (AtkAction *action, gint index)
-{
-	GtkWidget *widget;
-	gboolean return_value = TRUE;
-	time_t dtstart, dtend;
-	ECalendarView *cal_view;
-
-	widget = GTK_ACCESSIBLE (action)->widget;
-	if (widget == NULL)
-		/*
-		 * State is defunct
-		 */
-		return FALSE;
-
-	if (!GTK_WIDGET_IS_SENSITIVE (widget) || !GTK_WIDGET_VISIBLE (widget))
-		return FALSE;
-
-	cal_view = E_CALENDAR_VIEW (widget);
-	 switch (index) {
-	 case 0:
-		 /* New Appointment */
-		 e_calendar_view_new_appointment (cal_view);
-		 break;
-	 case 1:
-		 /* New All Day Event */
-		 e_calendar_view_get_selected_time_range (cal_view,
-						     &dtstart, &dtend);
-		 e_calendar_view_new_appointment_for (cal_view,
-						 dtstart, dtend, TRUE, FALSE);
-		 break;
-	 case 2:
-		 /* New Meeting */
-		 e_calendar_view_get_selected_time_range (cal_view,
-						     &dtstart, &dtend);
-		 e_calendar_view_new_appointment_for (cal_view,
-						 dtstart, dtend, FALSE, TRUE);
-		 break;
-	 case 3:
-		 /* Go to today */
-		 break;
-		 calendar_goto_today (e_calendar_view_get_calendar (cal_view));
-	 case 4:
-		 /* Go to date */
-		 goto_dialog (e_calendar_view_get_calendar (cal_view));
-		 break;
-	 default:
-		 return_value = FALSE;
-		 break;
-	 }
-	 return return_value;
-}
-
-static gint
-action_interface_get_n_actions (AtkAction *action)
-{
-	return CAL_VIEW_ACTION_NUM;
-}
-
-static G_CONST_RETURN gchar*
-action_interface_get_description(AtkAction *action, gint index)
-{
-	return action_interface_action_get_name (action, index);
-}
-
-static G_CONST_RETURN gchar*
-action_interface_get_keybinding (AtkAction *action, gint index)
-{
-	GtkWidget *widget;
-	EaCalView *ea_cal_view;
-
-	widget = GTK_ACCESSIBLE (action)->widget;
-	if (widget == NULL)
-		/*
-		 * State is defunct
-		 */
-		return NULL;
-
-	if (!GTK_WIDGET_IS_SENSITIVE (widget) || !GTK_WIDGET_VISIBLE (widget))
-		return FALSE;
-
-	 ea_cal_view = EA_CAL_VIEW (action);
-
-	 switch (index) {
-	 case 0:
-		 /* New Appointment */
-		 return "<Alt>fna;<Control>n";
-		 break;
-	 case 1:
-		 /* New Event */
-		 return "<Alt>fnd;<Shift><Control>d";
-		 break;
-	 case 2:
-		 /* New Meeting */
-		 return "<Alt>fne;<Shift><Control>e";
-		 break;
-	 case 3:
-		 /* Go to today */
-		 return "<Alt>vt;<Alt><Control>t";
-		 break;
-	 case 4:
-		 /* Go to date */
-		 return "<Alt>vd;<Alt><Control>g";
-		 break;
-	 default:
-		 break;
-	 }
-	 return NULL;
-}
-
-static G_CONST_RETURN gchar*
-action_interface_action_get_name(AtkAction *action, gint i)
-{
-	if (i >= 0 && i < CAL_VIEW_ACTION_NUM)
-		return action_name [i];
-	return NULL;
-}
diff --git a/a11y/calendar/ea-cal-view.h b/a11y/calendar/ea-cal-view.h
deleted file mode 100644
index 858aa497d4..0000000000
--- a/a11y/calendar/ea-cal-view.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-cal-view.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#ifndef __EA_CAL_VIEW_H__
-#define __EA_CAL_VIEW_H__
-
-#include <gtk/gtkaccessible.h>
-#include "e-cal-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define EA_TYPE_CAL_VIEW                     (ea_cal_view_get_type ())
-#define EA_CAL_VIEW(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_CAL_VIEW, EaCalView))
-#define EA_CAL_VIEW_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_CAL_VIEW, EaCalViewClass))
-#define EA_IS_CAL_VIEW(obj)                  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_CAL_VIEW))
-#define EA_IS_CAL_VIEW_CLASS(klass)          (G_TYPE_CHECK_CLASS_TYPE ((klass), EA_TYPE_CAL_VIEW))
-#define EA_CAL_VIEW_GET_CLASS(obj)           (G_TYPE_INSTANCE_GET_CLASS ((obj), EA_TYPE_CAL_VIEW, EaCalViewClass))
-
-typedef struct _EaCalView                   EaCalView;
-typedef struct _EaCalViewClass              EaCalViewClass;
-
-struct _EaCalView
-{
-	GtkAccessible parent;
-};
-
-GType ea_cal_view_get_type (void);
-
-struct _EaCalViewClass
-{
-	GtkAccessibleClass parent_class;
-};
-
-AtkObject* ea_cal_view_new (GtkWidget *widget);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __EA_CAL_VIEW_H__ */
diff --git a/a11y/calendar/ea-calendar-helpers.c b/a11y/calendar/ea-calendar-helpers.c
deleted file mode 100644
index 535265ebeb..0000000000
--- a/a11y/calendar/ea-calendar-helpers.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-calendar-helpers.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-calendar-helpers.h"
-#include "ea-cal-view-event.h"
-#include "e-day-view.h"
-#include "e-week-view.h"
-
-#include <gal/e-text/e-text.h>
-
-/**
- * ea_calendar_helpers_get_accessible_for
- * @canvas_item: the canvas item (e_text) for a event
- * @returns: the atk object for the canvas_item
- * 
- **/
-AtkObject *
-ea_calendar_helpers_get_accessible_for (GnomeCanvasItem *canvas_item)
-{
-	AtkObject *atk_obj = NULL;
-	GObject *g_obj;
-
-	g_return_val_if_fail (E_IS_TEXT (canvas_item), NULL);
-
-	g_obj = G_OBJECT (canvas_item);
-	/* we cannot use atk_gobject_accessible_for_object here,
-	 * EaDayViewEvent/EaWeekViewEvent cannot be created by the
-	 * registered facotry of E_TEXT
-	 */
-	atk_obj = g_object_get_data (g_obj, "accessible-object");
-	if (!atk_obj)
-		atk_obj = ea_cal_view_event_new (g_obj);
-	return atk_obj;
-}
-
-/**
- * ea_calendar_helpers_get_view_widget_from:
- * @canvas_item: the canvas item (e_text) for a event
- * @returns: the cal view widget if exists
- *
- * Get the cal view widget contains the canvas_item.
- * 
- **/
-ECalendarView *
-ea_calendar_helpers_get_cal_view_from (GnomeCanvasItem *canvas_item)
-{
-	GnomeCanvas *canvas;
-	GtkWidget *view_widget = NULL;
-
-	g_return_val_if_fail (canvas_item, NULL);
-	g_return_val_if_fail (E_IS_TEXT (canvas_item), NULL);
-
-	/* canvas_item is the e_text for the event */
-	/* canvas_item->canvas is the ECanvas for day view */
-	/* parent of canvas_item->canvas is the EDayView or EWeekView widget */
-	canvas = canvas_item->canvas;
-	view_widget = gtk_widget_get_parent (GTK_WIDGET(canvas));
-	if (!view_widget || !E_IS_CALENDAR_VIEW (view_widget))
-		return NULL;
-	return E_CALENDAR_VIEW (view_widget);
-}
-
-/**
- * ea_calendar_helpers_get_cal_view_event_from
- * @canvas_item: the cavas_item (e_text) for the event
- * @returns: the ECalendarViewEvent
- *
- * Get the ECalendarViewEvent for the canvas_item.
- *
- **/
-ECalendarViewEvent *
-ea_calendar_helpers_get_cal_view_event_from (GnomeCanvasItem *canvas_item)
-{
-	ECalendarView *cal_view;
-	gboolean event_found;
-	ECalendarViewEvent *cal_view_event;
-
-	g_return_val_if_fail (E_IS_TEXT (canvas_item), NULL);
-
-	cal_view = ea_calendar_helpers_get_cal_view_from (canvas_item);
-
-	if (!cal_view)
-		return NULL;
-
-	if (E_IS_DAY_VIEW (cal_view)) {
-		gint event_day, event_num;
-		EDayViewEvent *day_view_event;
-		EDayView *day_view = E_DAY_VIEW (cal_view);
-		event_found = e_day_view_find_event_from_item (day_view, canvas_item,
-							       &event_day, &event_num);
-		if (!event_found)
-			return NULL;
-		if (event_day == E_DAY_VIEW_LONG_EVENT) {
-			/* a long event */
-			day_view_event = &g_array_index (day_view->long_events,
-							 EDayViewEvent, event_num);
-		}
-		else {
-			/* a main canvas event */
-			day_view_event = &g_array_index (day_view->events[event_day],
-							 EDayViewEvent, event_num);
-		}
-		cal_view_event = (ECalendarViewEvent *) day_view_event;
-	}
-	else if (E_IS_WEEK_VIEW (cal_view)) {
-		gint event_num, span_num;
-		EWeekViewEvent *week_view_event;
-		EWeekView *week_view = E_WEEK_VIEW (cal_view);
-		event_found = e_week_view_find_event_from_item (week_view,
-								canvas_item,
-								&event_num,
-								&span_num);
-		if (!event_found)
-			return NULL;
-
-		week_view_event = &g_array_index (week_view->events, EWeekViewEvent,
-						  event_num);
-
-		cal_view_event = (ECalendarViewEvent *)week_view_event;
-	}
-	else {
-		g_assert_not_reached ();
-		return NULL;
-	}
-	return cal_view_event;
-}
diff --git a/a11y/calendar/ea-calendar-helpers.h b/a11y/calendar/ea-calendar-helpers.h
deleted file mode 100644
index 50d997d91d..0000000000
--- a/a11y/calendar/ea-calendar-helpers.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-calendar-helpers.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-/* Evolution Accessibility
- */
-
-#ifndef _EA_CALENDAR_HELPERS_H__
-#define _EA_CALENDAR_HELPERS_H__
-
-#include "ea-cal-view.h"
-
-AtkObject *
-ea_calendar_helpers_get_accessible_for (GnomeCanvasItem *canvas_item);
-
-ECalendarView *
-ea_calendar_helpers_get_cal_view_from (GnomeCanvasItem *canvas_item);
-
-ECalendarViewEvent *
-ea_calendar_helpers_get_cal_view_event_from (GnomeCanvasItem *canvas_item);
-
-#endif /* _EA_CALENDAR_HELPERS_H__ */
diff --git a/a11y/calendar/ea-calendar.c b/a11y/calendar/ea-calendar.c
deleted file mode 100644
index bb528cb919..0000000000
--- a/a11y/calendar/ea-calendar.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-calendar.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include <gal/e-text/e-text.h>
-#include "ea-calendar-helpers.h"
-#include "ea-factory.h"
-#include "ea-calendar.h"
-
-#include "calendar/ea-cal-view.h"
-#include "calendar/ea-cal-view-event.h"
-#include "calendar/ea-day-view.h"
-#include "calendar/ea-day-view-main-item.h"
-#include "calendar/ea-week-view.h"
-#include "calendar/ea-gnome-calendar.h"
-
-
-EA_FACTORY (EA_TYPE_CAL_VIEW, ea_cal_view, ea_cal_view_new)
-EA_FACTORY (EA_TYPE_DAY_VIEW, ea_day_view, ea_day_view_new)
-EA_FACTORY_GOBJECT (EA_TYPE_DAY_VIEW_MAIN_ITEM, ea_day_view_main_item, ea_day_view_main_item_new)
-EA_FACTORY (EA_TYPE_WEEK_VIEW, ea_week_view, ea_week_view_new)
-EA_FACTORY (EA_TYPE_GNOME_CALENDAR, ea_gnome_calendar, ea_gnome_calendar_new)
-
-static gboolean ea_calendar_focus_watcher (GSignalInvocationHint *ihint,
-					   guint n_param_values,
-					   const GValue *param_values,
-					   gpointer data);
-
-void
-gnome_calendar_a11y_init (void)
-{
-	EA_SET_FACTORY (gnome_calendar_get_type(), ea_gnome_calendar);
-	/* we only add focus watcher when accessibility is enabled
-	 */
-	if (atk_get_root ()) {
-		g_signal_add_emission_hook (g_signal_lookup ("event", E_TYPE_TEXT),
-					    0, ea_calendar_focus_watcher,
-					    NULL, (GDestroyNotify) NULL);
-		g_signal_add_emission_hook (g_signal_lookup ("event-after",
-							     e_day_view_get_type()),
-					    0, ea_calendar_focus_watcher,
-					    NULL, (GDestroyNotify) NULL);
-		g_signal_add_emission_hook (g_signal_lookup ("event",
-							     e_day_view_main_item_get_type()),
-					    0, ea_calendar_focus_watcher,
-					    NULL, (GDestroyNotify) NULL);
-
-	}
-}
-
-void
-e_cal_view_a11y_init (void)
-{
-	EA_SET_FACTORY (e_cal_view_get_type(), ea_cal_view);
-}
-
-void
-e_day_view_a11y_init (void)
-{
-	EA_SET_FACTORY (e_day_view_get_type(), ea_day_view);
-}
-
-void e_day_view_main_item_a11y_init (void)
-{
-	EA_SET_FACTORY (e_day_view_main_item_get_type (), ea_day_view_main_item);
-}
-
-void
-e_week_view_a11y_init (void)
-{
-	EA_SET_FACTORY (e_week_view_get_type(), ea_week_view);
-}
-
-gboolean
-ea_calendar_focus_watcher (GSignalInvocationHint *ihint,
-                           guint n_param_values,
-                           const GValue *param_values,
-                           gpointer data)
-{
-	GObject *object;
-	GdkEvent *event;
-        AtkObject *ea_event = NULL;
-
-	object = g_value_get_object (param_values + 0);
-	event = g_value_get_boxed (param_values + 1);
-
-	if (E_IS_TEXT (object)) {
-		/* "event" signal on canvas item
-		 */
-		GnomeCanvasItem *canvas_item;
-
-		canvas_item = GNOME_CANVAS_ITEM (object);
-		if (event->type == GDK_FOCUS_CHANGE) {
-			if (event->focus_change.in) {
-				ea_event =
-					ea_calendar_helpers_get_accessible_for (canvas_item);
-				if (!ea_event)
-					/* not canvas item we want */
-					return TRUE;
-
-			}
-			atk_focus_tracker_notify (ea_event);
-		}
-	}
-	else if (E_IS_DAY_VIEW (object)) {
-		EDayView *day_view = E_DAY_VIEW (object);
-		if (event->type == GDK_FOCUS_CHANGE) {
-			if (event->focus_change.in) {
-				/* give main item chance to emit focus */
-				gnome_canvas_item_grab_focus (day_view->main_canvas_item);
-			}
-		}
-	}
-	else if (E_IS_DAY_VIEW_MAIN_ITEM (object)) {
-		if (event->type == GDK_FOCUS_CHANGE) {
-			if (event->focus_change.in) {
-				/* we should emit focus on main item */
-				ea_event = atk_gobject_accessible_for_object (object);
-			}
-			else
-				/* focus out */
-				ea_event = NULL;
-#ifdef ACC_DEBUG
-			printf ("EvoAcc: focus notify on day main item %p\n", (void *)object);
-#endif
-			atk_focus_tracker_notify (ea_event);
-		}
-	}
-	return TRUE;
-}
diff --git a/a11y/calendar/ea-calendar.h b/a11y/calendar/ea-calendar.h
deleted file mode 100644
index 4b1779c0b5..0000000000
--- a/a11y/calendar/ea-calendar.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-calendar.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-/* Evolution Accessibility
-*/
-
-#ifndef _EA_CALENDAR_H__
-#define _EA_CALENDAR_H__
-
-void gnome_calendar_a11y_init (void);
-void e_cal_view_a11y_init (void);
-void e_day_view_a11y_init (void);
-void e_day_view_main_item_a11y_init (void);
-void e_week_view_a11y_init (void);
-
-#endif /* _EA_CALENDAR_H__ */
diff --git a/a11y/calendar/ea-day-view-cell.c b/a11y/calendar/ea-day-view-cell.c
deleted file mode 100644
index 52fb860fd6..0000000000
--- a/a11y/calendar/ea-day-view-cell.c
+++ /dev/null
@@ -1,336 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-day-view-cell.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-day-view-cell.h"
-#include "ea-day-view-main-item.h"
-#include "ea-day-view.h"
-#include "ea-factory.h"
-
-/* EDayViewCell */
-
-static void e_day_view_cell_class_init (EDayViewCellClass *class);
-
-EA_FACTORY_GOBJECT (EA_TYPE_DAY_VIEW_CELL, ea_day_view_cell, ea_day_view_cell_new)
-
-GType
-e_day_view_cell_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (EDayViewCellClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) e_day_view_cell_class_init, /* class init */
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (EDayViewCell), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		type = g_type_register_static (G_TYPE_OBJECT,
-					       "EDayViewCell", &tinfo, 0);
-	}
-
-	return type;
-}
-
-static void
-e_day_view_cell_class_init (EDayViewCellClass *class)
-{
-    EA_SET_FACTORY (e_day_view_cell_get_type (), ea_day_view_cell);
-}
-
-EDayViewCell *
-e_day_view_cell_new (EDayView *day_view, gint row, gint column)
-{
-	GObject *object;
-	EDayViewCell *cell;
-
-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), NULL);
-
-	object = g_object_new (E_TYPE_DAY_VIEW_CELL, NULL);
-	cell = E_DAY_VIEW_CELL (object);
-	cell->day_view = day_view;
-	cell->row = row;
-	cell->column = column;
-
-#ifdef ACC_DEBUG
-	printf ("EvoAcc: e_day_view_cell created %p\n", (void *)cell);
-#endif
-
-	return cell;
-}
-
-/* EaDayViewCell */
-
-static void ea_day_view_cell_class_init (EaDayViewCellClass *klass);
-
-static G_CONST_RETURN gchar* ea_day_view_cell_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_day_view_cell_get_description (AtkObject *accessible);
-static AtkStateSet* ea_day_view_cell_ref_state_set (AtkObject *obj);
-static AtkObject * ea_day_view_cell_get_parent (AtkObject *accessible);
-
-/* component interface */
-static void atk_component_interface_init (AtkComponentIface *iface);
-static void component_interface_get_extents (AtkComponent *component,
-					     gint *x, gint *y,
-					     gint *width, gint *height,
-					     AtkCoordType coord_type);
-static gpointer parent_class = NULL;
-
-#ifdef ACC_DEBUG
-static gint n_ea_day_view_cell_created = 0, n_ea_day_view_cell_destroyed = 0;
-static void ea_day_view_cell_finalize (GObject *object);
-#endif
-
-GType
-ea_day_view_cell_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (EaDayViewCellClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) ea_day_view_cell_class_init, /* class init */
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (EaDayViewCell), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		static const GInterfaceInfo atk_component_info = {
-			(GInterfaceInitFunc) atk_component_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		type = g_type_register_static (ATK_TYPE_GOBJECT_ACCESSIBLE,
-					       "EaDayViewCell", &tinfo, 0);
-		g_type_add_interface_static (type, ATK_TYPE_COMPONENT,
-					     &atk_component_info);
-	}
-
-	return type;
-}
-
-static void
-ea_day_view_cell_class_init (EaDayViewCellClass *klass)
-{
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-
-#ifdef ACC_DEBUG
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-	gobject_class->finalize = ea_day_view_cell_finalize;
-#endif
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	class->get_name = ea_day_view_cell_get_name;
-	class->get_description = ea_day_view_cell_get_description;
-	class->ref_state_set = ea_day_view_cell_ref_state_set;
-
-	class->get_parent = ea_day_view_cell_get_parent;
-}
-
-AtkObject* 
-ea_day_view_cell_new (GObject *obj)
-{
-	gpointer object;
-	AtkObject *atk_object;
-
-	g_return_val_if_fail (E_IS_DAY_VIEW_CELL (obj), NULL);
-
-	object = g_object_new (EA_TYPE_DAY_VIEW_CELL, NULL);
-	atk_object = ATK_OBJECT (object);
-	atk_object_initialize (atk_object, obj);
-	atk_object->role = ATK_ROLE_TABLE_CELL;
-
-#ifdef ACC_DEBUG
-	++n_ea_day_view_cell_created;
-	printf ("ACC_DEBUG: n_ea_day_view_cell_created = %d\n",
-		n_ea_day_view_cell_created);
-#endif
-	return atk_object;
-}
-
-#ifdef ACC_DEBUG
-static void ea_day_view_cell_finalize (GObject *object)
-{
-	++n_ea_day_view_cell_destroyed;
-	printf ("ACC_DEBUG: n_ea_day_view_cell_destroyed = %d\n",
-		n_ea_day_view_cell_destroyed);
-}
-#endif
-
-static G_CONST_RETURN gchar*
-ea_day_view_cell_get_name (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewCell *cell;
-
-	g_return_val_if_fail (EA_IS_DAY_VIEW_CELL (accessible), NULL);
-
-	if (!accessible->name) {
-		AtkObject *ea_main_item;
-		GnomeCanvasItem *main_item;
-		gchar *new_name = g_strdup ("");
-		const gchar *row_label, *column_label;
-
-		atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-		g_obj = atk_gobject_accessible_get_object (atk_gobj);
-		if (!g_obj)
-			return NULL;
-
-		cell = E_DAY_VIEW_CELL (g_obj);
-		main_item = cell->day_view->main_canvas_item;
-		ea_main_item = atk_gobject_accessible_for_object (G_OBJECT (main_item));
-		column_label = atk_table_get_column_description (ATK_TABLE (ea_main_item),
-								 cell->column);
-		row_label = atk_table_get_row_description (ATK_TABLE (ea_main_item),
-							   cell->row);
-		new_name = g_strconcat (column_label, " ", row_label, NULL);
-		ATK_OBJECT_CLASS (parent_class)->set_name (accessible, new_name);
-		g_free (new_name);
-	}
-	return accessible->name;
-}
-
-static G_CONST_RETURN gchar*
-ea_day_view_cell_get_description (AtkObject *accessible)
-{
-	return ea_day_view_cell_get_name (accessible);
-}
-
-static AtkStateSet*
-ea_day_view_cell_ref_state_set (AtkObject *obj)
-{
-  AtkStateSet *state_set;
-  GObject *g_obj;
-  AtkObject *parent;
-  gint x, y, width, height;
-  gint parent_x, parent_y, parent_width, parent_height;
-
-  state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (obj);
-  g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(obj));
-  if (!g_obj)
-	  return state_set;
-
-  atk_state_set_add_state (state_set, ATK_STATE_SELECTABLE);
-
-  parent = atk_object_get_parent (obj);
-  atk_component_get_extents (ATK_COMPONENT (obj), &x, &y,
-			     &width, &height, ATK_XY_WINDOW);
-  atk_component_get_extents (ATK_COMPONENT (parent), &parent_x, &parent_y,
-			     &parent_width, &parent_height, ATK_XY_WINDOW);
-
-
-  if (x + width < parent_x || x > parent_x + parent_width ||
-      y + height < parent_y || y > parent_y + parent_height)
-	  /* the cell is out of the main canvas */	  
-	  ;
-  else
-	  atk_state_set_add_state (state_set, ATK_STATE_VISIBLE);
-
-  return state_set;
-}
-
-static AtkObject *
-ea_day_view_cell_get_parent (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewCell *cell;
-
-	g_return_val_if_fail (EA_IS_DAY_VIEW_CELL (accessible), NULL);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	cell = E_DAY_VIEW_CELL (g_obj);
-	return gtk_widget_get_accessible (GTK_WIDGET (cell->day_view->main_canvas));
-}
-
-/* Atk Component Interface */
-
-static void 
-atk_component_interface_init (AtkComponentIface *iface)
-{
-	g_return_if_fail (iface != NULL);
-
-	iface->get_extents = component_interface_get_extents;
-}
-
-static void 
-component_interface_get_extents (AtkComponent *component,
-				 gint *x, gint *y, gint *width, gint *height,
-				 AtkCoordType coord_type)
-{
-	GObject *g_obj;
-	AtkObject *atk_obj;
-	EDayViewCell *cell;
-	EDayView *day_view;
-	GtkWidget *main_canvas;
-	gint day_view_width, day_view_height;
-	gint scroll_x, scroll_y;
-
-	*x = *y = *width = *height = 0;
-
-	g_return_if_fail (EA_IS_DAY_VIEW_CELL (component));
-
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(component));
-	if (!g_obj)
-		/* defunct object*/
-		return;
-
-	cell = E_DAY_VIEW_CELL (g_obj);
-	day_view = cell->day_view;
-	main_canvas = cell->day_view->main_canvas;
-
-	atk_obj = atk_gobject_accessible_for_object (G_OBJECT (main_canvas));
-	atk_component_get_extents (ATK_COMPONENT (atk_obj),
-				   x, y,
-				   &day_view_width, &day_view_height,
-				   coord_type);
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (day_view->main_canvas),
-					 &scroll_x, &scroll_y);
-	*x += day_view->day_offsets[cell->column] - scroll_x;
-	*y += day_view->row_height * cell->row
-		- scroll_y;
-	printf ("ybl: cellrow=%d, cellcol=%d, scroll_x=%d, scroll_y=%d\n",
-		cell->row, cell->column, scroll_x, scroll_y);
-	*width = day_view->day_widths[cell->column];
-	*height = day_view->row_height;
-}
diff --git a/a11y/calendar/ea-day-view-cell.h b/a11y/calendar/ea-day-view-cell.h
deleted file mode 100644
index cba2fec15b..0000000000
--- a/a11y/calendar/ea-day-view-cell.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-day-view-cell.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#ifndef __EA_DAY_VIEW_CELL_H__
-#define __EA_DAY_VIEW_CELL_H__
-
-#include <atk/atkgobjectaccessible.h>
-#include "e-day-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_TYPE_DAY_VIEW_CELL                     (e_day_view_cell_get_type ())
-#define E_DAY_VIEW_CELL(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_DAY_VIEW_CELL, EDayViewCell))
-#define E_DAY_VIEW_CELL_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_DAY_VIEW_CELL, EDayViewCellClass))
-#define E_IS_DAY_VIEW_CELL(obj)                  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_DAY_VIEW_CELL))
-#define E_IS_DAY_VIEW_CELL_CLASS(klass)          (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_DAY_VIEW_CELL))
-#define E_DAY_VIEW_CELL_GET_CLASS(obj)           (G_TYPE_INSTANCE_GET_CLASS ((obj), E_TYPE_DAY_VIEW_CELL, EDayViewCellClass))
-
-typedef struct _EDayViewCell                   EDayViewCell;
-typedef struct _EDayViewCellClass              EDayViewCellClass;
-
-struct _EDayViewCell
-{
-	GObject parent;
-	EDayView *day_view;
-	gint row;
-	gint column;
-};
-
-GType e_day_view_cell_get_type (void);
-
-struct _EDayViewCellClass
-{
-	GObjectClass parent_class;
-};
-
-EDayViewCell * e_day_view_cell_new (EDayView *day_view, gint row, gint column);
-
-#define EA_TYPE_DAY_VIEW_CELL                     (ea_day_view_cell_get_type ())
-#define EA_DAY_VIEW_CELL(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_DAY_VIEW_CELL, EaDayViewCell))
-#define EA_DAY_VIEW_CELL_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_DAY_VIEW_CELL, EaDayViewCellClass))
-#define EA_IS_DAY_VIEW_CELL(obj)                  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_DAY_VIEW_CELL))
-#define EA_IS_DAY_VIEW_CELL_CLASS(klass)          (G_TYPE_CHECK_CLASS_TYPE ((klass), EA_TYPE_DAY_VIEW_CELL))
-#define EA_DAY_VIEW_CELL_GET_CLASS(obj)           (G_TYPE_INSTANCE_GET_CLASS ((obj), EA_TYPE_DAY_VIEW_CELL, EaDayViewCellClass))
-
-typedef struct _EaDayViewCell                   EaDayViewCell;
-typedef struct _EaDayViewCellClass              EaDayViewCellClass;
-
-struct _EaDayViewCell
-{
-	AtkGObjectAccessible parent;
-};
-
-GType ea_day_view_cell_get_type (void);
-
-struct _EaDayViewCellClass
-{
-	AtkGObjectAccessibleClass parent_class;
-};
-
-AtkObject*     ea_day_view_cell_new         (GObject *gobj);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __EA_DAY_VIEW_CELL_H__ */
diff --git a/a11y/calendar/ea-day-view-main-item.c b/a11y/calendar/ea-day-view-main-item.c
deleted file mode 100644
index af8d704178..0000000000
--- a/a11y/calendar/ea-day-view-main-item.c
+++ /dev/null
@@ -1,1259 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-day-view-main-item.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-day-view-main-item.h"
-#include "e-day-view-top-item.h"
-#include "ea-day-view.h"
-#include "ea-day-view-cell.h"
-#include "ea-cell-table.h"
-
-/* EaDayViewMainItem */
-static void ea_day_view_main_item_class_init (EaDayViewMainItemClass *klass);
-
-static void ea_day_view_main_item_finalize (GObject *object);
-static G_CONST_RETURN gchar* ea_day_view_main_item_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_day_view_main_item_get_description (AtkObject *accessible);
-
-static gint         ea_day_view_main_item_get_n_children (AtkObject *obj);
-static AtkObject*   ea_day_view_main_item_ref_child (AtkObject *obj,
-						     gint i);
-static AtkObject * ea_day_view_main_item_get_parent (AtkObject *accessible);
-static gint ea_day_view_main_item_get_index_in_parent (AtkObject *accessible);
-
-/* callbacks */
-static void ea_day_view_main_item_dates_change_cb (GnomeCalendar *gcal, gpointer data);
-static void ea_day_view_main_item_time_change_cb (EDayView *day_view, gpointer data);
-
-/* component interface */
-static void atk_component_interface_init (AtkComponentIface *iface);
-static void component_interface_get_extents (AtkComponent *component,
-					     gint *x, gint *y,
-					     gint *width, gint *height,
-					     AtkCoordType coord_type);
-/* atk table interface */
-static void atk_table_interface_init (AtkTableIface *iface);
-static gint table_interface_get_index_at (AtkTable *table,
-					  gint     row,
-					  gint     column);
-static gint table_interface_get_column_at_index (AtkTable *table,
-						 gint     index);
-static gint table_interface_get_row_at_index (AtkTable *table,
-					      gint     index);
-static AtkObject* table_interface_ref_at (AtkTable *table,
-					  gint     row, 
-					  gint     column);
-static gint table_interface_get_n_rows (AtkTable *table);
-static gint table_interface_get_n_columns (AtkTable *table);
-static gint table_interface_get_column_extent_at (AtkTable      *table,
-						  gint          row,
-						  gint          column);
-static gint table_interface_get_row_extent_at (AtkTable      *table,
-					       gint          row,
-					       gint          column);
-
-static gboolean table_interface_is_row_selected (AtkTable *table,
-						 gint     row);
-static gboolean table_interface_is_column_selected (AtkTable *table,
-						    gint     row);
-static gboolean table_interface_is_selected (AtkTable *table,
-					     gint     row,
-					     gint     column);
-static gint table_interface_get_selected_rows (AtkTable *table,
-					       gint **rows_selected);
-static gint table_interface_get_selected_columns (AtkTable *table,
-						  gint     **columns_selected);
-static gboolean table_interface_add_row_selection (AtkTable *table, gint row);
-static gboolean table_interface_remove_row_selection (AtkTable *table,
-						      gint row);
-static gboolean table_interface_add_column_selection (AtkTable *table,
-						      gint column);
-static gboolean table_interface_remove_column_selection (AtkTable *table,
-							 gint column);
-static AtkObject* table_interface_get_row_header (AtkTable *table, gint row);
-static AtkObject* table_interface_get_column_header (AtkTable *table,
-						     gint in_col);
-static AtkObject* table_interface_get_caption (AtkTable *table);
-
-static G_CONST_RETURN gchar*
-table_interface_get_column_description (AtkTable *table, gint in_col);
-
-static G_CONST_RETURN gchar*
-table_interface_get_row_description (AtkTable *table, gint row);
-
-static AtkObject* table_interface_get_summary (AtkTable *table);
-
-/* atk selection interface */
-static void atk_selection_interface_init (AtkSelectionIface *iface);
-static gboolean selection_interface_add_selection (AtkSelection *selection,
-						   gint i);
-static gboolean selection_interface_clear_selection (AtkSelection *selection);
-static AtkObject* selection_interface_ref_selection (AtkSelection *selection,
-						     gint i);
-static gint selection_interface_get_selection_count (AtkSelection *selection);
-static gboolean selection_interface_is_child_selected (AtkSelection *selection,
-						       gint i);
-
-/* helpers */
-static EaCellTable *
-ea_day_view_main_item_get_cell_data (EaDayViewMainItem *ea_main_item);
-
-static void
-ea_day_view_main_item_destory_cell_data (EaDayViewMainItem *ea_main_item);
-
-static gint
-ea_day_view_main_item_get_child_index_at (EaDayViewMainItem *ea_main_item,
-					  gint row, gint column);
-static gint
-ea_day_view_main_item_get_row_at_index (EaDayViewMainItem *ea_main_item,
-					gint index);
-static gint
-ea_day_view_main_item_get_column_at_index (EaDayViewMainItem *ea_main_item,
-					   gint index);
-static gint
-ea_day_view_main_item_get_row_label (EaDayViewMainItem *ea_main_item,
-				     gint row, gchar *buffer,
-				     gint buffer_size);
-
-#ifdef ACC_DEBUG
-static gint n_ea_day_view_main_item_created = 0;
-static gint n_ea_day_view_main_item_destroyed = 0;
-#endif
-
-static gpointer parent_class = NULL;
-
-GType
-ea_day_view_main_item_get_type (void)
-{
-	static GType type = 0;
-	AtkObjectFactory *factory;
-	GTypeQuery query;
-	GType derived_atk_type;
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (EaDayViewMainItemClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) ea_day_view_main_item_class_init,
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (EaDayViewMainItem), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		static const GInterfaceInfo atk_component_info = {
-			(GInterfaceInitFunc) atk_component_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		static const GInterfaceInfo atk_table_info = {
-			(GInterfaceInitFunc) atk_table_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-		static const GInterfaceInfo atk_selection_info = {
-			(GInterfaceInitFunc) atk_selection_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-
-		/*
-		 * Figure out the size of the class and instance
-		 * we are run-time deriving from (GailCanvasItem, in this case)
-		 *
-		 */
-
-		factory = atk_registry_get_factory (atk_get_default_registry (),
-						    e_day_view_main_item_get_type());
-		derived_atk_type = atk_object_factory_get_accessible_type (factory);
-		g_type_query (derived_atk_type, &query);
-
-		tinfo.class_size = query.class_size;
-		tinfo.instance_size = query.instance_size;
-
-		type = g_type_register_static (derived_atk_type,
-					       "EaDayViewMainItem", &tinfo, 0);
-		g_type_add_interface_static (type, ATK_TYPE_COMPONENT,
-					     &atk_component_info);
-		g_type_add_interface_static (type, ATK_TYPE_TABLE,
-					     &atk_table_info);
-		g_type_add_interface_static (type, ATK_TYPE_SELECTION,
-					     &atk_selection_info);
-	}
-
-	return type;
-}
-
-static void
-ea_day_view_main_item_class_init (EaDayViewMainItemClass *klass)
-{
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-
-	gobject_class->finalize = ea_day_view_main_item_finalize;
-	parent_class = g_type_class_peek_parent (klass);
-
-	class->get_name = ea_day_view_main_item_get_name;
-	class->get_description = ea_day_view_main_item_get_description;
-
-	class->get_n_children = ea_day_view_main_item_get_n_children;
-	class->ref_child = ea_day_view_main_item_ref_child;
-	class->get_parent = ea_day_view_main_item_get_parent;
-	class->get_index_in_parent = ea_day_view_main_item_get_index_in_parent;
-}
-
-AtkObject* 
-ea_day_view_main_item_new (GObject *obj)
-{
-	AtkObject *accessible;
-	GnomeCalendar *gcal;
-	EDayViewMainItem *main_item;
-
-	g_return_val_if_fail (E_IS_DAY_VIEW_MAIN_ITEM (obj), NULL);
-
-	accessible = ATK_OBJECT (g_object_new (EA_TYPE_DAY_VIEW_MAIN_ITEM,
-					       NULL));
-
-	atk_object_initialize (accessible, obj);
-	accessible->role = ATK_ROLE_TABLE;
-
-#ifdef ACC_DEBUG
-	++n_ea_day_view_main_item_created;
-	printf ("ACC_DEBUG: n_ea_day_view_main_item_created = %d\n",
-		n_ea_day_view_main_item_created);
-#endif
-	main_item = E_DAY_VIEW_MAIN_ITEM (obj);
-	g_signal_connect (main_item->day_view, "selected_time_changed",
-			  G_CALLBACK (ea_day_view_main_item_time_change_cb),
-			  accessible);
-
-	/* listen for date changes of calendar */
-	gcal = e_calendar_view_get_calendar (E_CALENDAR_VIEW (main_item->day_view));
-	if (gcal)
-		g_signal_connect (gcal, "dates_shown_changed",
-				  G_CALLBACK (ea_day_view_main_item_dates_change_cb),
-				  accessible);
-
-	return accessible;
-}
-
-static void
-ea_day_view_main_item_finalize (GObject *object)
-{
-	EaDayViewMainItem *ea_main_item;
-
-	g_return_if_fail (EA_IS_DAY_VIEW_MAIN_ITEM (object));
-
-	ea_main_item = EA_DAY_VIEW_MAIN_ITEM (object);
-
-	/* Free the allocated cell data */
-	ea_day_view_main_item_destory_cell_data (ea_main_item);
-
-	G_OBJECT_CLASS (parent_class)->finalize (object);
-#ifdef ACC_DEBUG
-	++n_ea_day_view_main_item_destroyed;
-	printf ("ACC_DEBUG: n_ea_day_view_main_item_destroyed = %d\n",
-		n_ea_day_view_main_item_destroyed);
-#endif
-}
-
-static G_CONST_RETURN gchar*
-ea_day_view_main_item_get_name (AtkObject *accessible)
-{
-	AtkObject *parent;
-	g_return_val_if_fail (EA_IS_DAY_VIEW_MAIN_ITEM (accessible), NULL);
-	parent = atk_object_get_parent (accessible);
-	return atk_object_get_name (parent);
-}
-
-static G_CONST_RETURN gchar*
-ea_day_view_main_item_get_description (AtkObject *accessible)
-{
-	return "a table to view and select the current time range";
-}
-
-static gint
-ea_day_view_main_item_get_n_children (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-
-	g_return_val_if_fail (EA_IS_DAY_VIEW_MAIN_ITEM (accessible), -1);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	return day_view->rows * day_view->days_shown;
-}
-
-static AtkObject *
-ea_day_view_main_item_ref_child (AtkObject *accessible, gint index)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	gint n_children;
-	EDayViewCell *cell;
-	EaCellTable *cell_data;
-	EaDayViewMainItem *ea_main_item;
-
-	g_return_val_if_fail (EA_IS_DAY_VIEW_MAIN_ITEM (accessible), NULL);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	n_children = ea_day_view_main_item_get_n_children (accessible);
-	if (index < 0 || index >= n_children)
-		return NULL;
-
-	ea_main_item = EA_DAY_VIEW_MAIN_ITEM (accessible);
-	cell_data = ea_day_view_main_item_get_cell_data (ea_main_item);
-	if (!cell_data)
-		return NULL;
-
-	cell = ea_cell_table_get_cell_at_index (cell_data, index);
-	if (!cell) {
-		gint row, column;
-
-		row = ea_day_view_main_item_get_row_at_index (ea_main_item, index);
-		column = ea_day_view_main_item_get_column_at_index (ea_main_item, index);
-		cell = e_day_view_cell_new (day_view, row, column);
-		ea_cell_table_set_cell_at_index (cell_data, index, cell);
-		g_object_unref (cell);
-	}
-	return g_object_ref (atk_gobject_accessible_for_object (G_OBJECT(cell)));
-}
-
-static AtkObject *
-ea_day_view_main_item_get_parent (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-
-	g_return_val_if_fail (EA_IS_DAY_VIEW_MAIN_ITEM (accessible), NULL);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	return gtk_widget_get_accessible (GTK_WIDGET (main_item->day_view));
-}
-
-static gint
-ea_day_view_main_item_get_index_in_parent (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-
-	g_return_val_if_fail (EA_IS_DAY_VIEW_MAIN_ITEM (accessible), -1);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	/* always the first child of ea-day-view */
-	return 0;
-}
-
-/* callbacks */
-
-static void
-ea_day_view_main_item_dates_change_cb (GnomeCalendar *gcal, gpointer data)
-{
-	EaDayViewMainItem *ea_main_item;
-
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-	g_return_if_fail (data);
-	g_return_if_fail (EA_IS_DAY_VIEW_MAIN_ITEM (data));
-
-	ea_main_item = EA_DAY_VIEW_MAIN_ITEM (data);
-
-#ifdef ACC_DEBUG
-	printf ("EvoAcc: ea_day_view_main_item update cb\n");
-#endif
-
-	ea_day_view_main_item_destory_cell_data (ea_main_item);
-}
-
-static void
-ea_day_view_main_item_time_change_cb (EDayView *day_view, gpointer data)
-{
-	EaDayViewMainItem *ea_main_item;
-
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-	g_return_if_fail (data);
-	g_return_if_fail (EA_IS_DAY_VIEW_MAIN_ITEM (data));
-
-	ea_main_item = EA_DAY_VIEW_MAIN_ITEM (data);
-
-#ifdef ACC_DEBUG
-	printf ("EvoAcc: ea_day_view_main_item time changed cb\n");
-#endif
-	g_signal_emit_by_name (data, "selection_changed");
-}
-
-/* helpers */
-
-static gint
-ea_day_view_main_item_get_child_index_at (EaDayViewMainItem *ea_main_item,
-					  gint row, gint column)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-
-	g_return_val_if_fail (ea_main_item, -1);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	if (row >= 0 && row < day_view->rows &&
-	    column >= 0 && column < day_view->days_shown)
-		return column * day_view->rows + row;
-	return -1;
-}
-
-static gint
-ea_day_view_main_item_get_row_at_index (EaDayViewMainItem *ea_main_item,
-					gint index)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	gint n_children;
-
-	g_return_val_if_fail (ea_main_item, -1);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	n_children = ea_day_view_main_item_get_n_children (ATK_OBJECT (ea_main_item));
-	if (index >= 0 && index < n_children)
-		return index % day_view->rows;
-	return -1;
-}
-
-static gint
-ea_day_view_main_item_get_column_at_index (EaDayViewMainItem *ea_main_item,
-					   gint index)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	gint n_children;
-
-	g_return_val_if_fail (ea_main_item, -1);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	n_children = ea_day_view_main_item_get_n_children (ATK_OBJECT (ea_main_item));
-	if (index >= 0 && index < n_children)
-		return index / day_view->rows;
-	return -1;
-}
-
-static gint
-ea_day_view_main_item_get_row_label (EaDayViewMainItem *ea_main_item,
-				     gint row, gchar *buffer, gint buffer_size)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	gchar *suffix;
-	gint hour, minute, suffix_width;
-
-	g_return_val_if_fail (ea_main_item, 0);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return 0 ;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	hour = day_view->first_hour_shown;
-	minute = day_view->first_minute_shown;
-	minute += row * day_view->mins_per_row;
-	hour = (hour + minute / 60) % 24;
-	minute %= 60;
-
-	e_day_view_convert_time_to_display (day_view, hour, &hour,
-					    &suffix, &suffix_width);
-	return g_snprintf (buffer, buffer_size, "%i:%02i %s",
-		    hour, minute, suffix);
-}
-
-static EaCellTable *
-ea_day_view_main_item_get_cell_data (EaDayViewMainItem *ea_main_item)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaCellTable *cell_data;
-
-	g_return_val_if_fail (ea_main_item, NULL);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	cell_data = g_object_get_data (G_OBJECT(ea_main_item),
-				       "ea-day-view-cell-table");
-	if (!cell_data) {
-		cell_data = ea_cell_table_create (day_view->rows,
-						  day_view->days_shown, TRUE);
-		g_object_set_data (G_OBJECT(ea_main_item),
-				   "ea-day-view-cell-table", cell_data);
-	}
-	return cell_data;
-}
-
-static void
-ea_day_view_main_item_destory_cell_data (EaDayViewMainItem *ea_main_item)
-{
-	EaCellTable *cell_data;
-
-	g_return_if_fail (ea_main_item);
-
-	cell_data = g_object_get_data (G_OBJECT(ea_main_item),
-				       "ea-day-view-cell-table");
-	if (cell_data) {
-		ea_cell_table_destroy (cell_data);
-		g_object_set_data (G_OBJECT(ea_main_item),
-				   "ea-day-view-cell-table", NULL);
-	}
-}
-
-/* Atk Component Interface */
-
-static void 
-atk_component_interface_init (AtkComponentIface *iface)
-{
-	g_return_if_fail (iface != NULL);
-
-	iface->get_extents = component_interface_get_extents;
-}
-
-static void 
-component_interface_get_extents (AtkComponent *component,
-				 gint *x, gint *y, gint *width, gint *height,
-				 AtkCoordType coord_type)
-{
-	GObject *g_obj;
-	AtkObject *ea_canvas;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-
-	*x = *y = *width = *height = 0;
-
-	g_return_if_fail (EA_IS_DAY_VIEW_MAIN_ITEM (component));
-
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(component));
-	if (!g_obj)
-		/* defunct object*/
-		return;
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	ea_canvas = gtk_widget_get_accessible (day_view->main_canvas);
-	atk_component_get_extents (ATK_COMPONENT (ea_canvas), x, y,
-				   width, height, coord_type);
-}
-
-/* atk table interface */
-
-static void 
-atk_table_interface_init (AtkTableIface *iface)
-{
-	g_return_if_fail (iface != NULL);
-
-	iface->ref_at = table_interface_ref_at;
-
-	iface->get_n_rows = table_interface_get_n_rows;
-	iface->get_n_columns = table_interface_get_n_columns;
-	iface->get_index_at = table_interface_get_index_at;
-	iface->get_column_at_index = table_interface_get_column_at_index;
-	iface->get_row_at_index = table_interface_get_row_at_index;
-	iface->get_column_extent_at = table_interface_get_column_extent_at;
-	iface->get_row_extent_at = table_interface_get_row_extent_at;
-
-	iface->is_selected = table_interface_is_selected;
-	iface->get_selected_rows = table_interface_get_selected_rows;
-	iface->get_selected_columns = table_interface_get_selected_columns;
-	iface->is_row_selected = table_interface_is_row_selected;
-	iface->is_column_selected = table_interface_is_column_selected;
-	iface->add_row_selection = table_interface_add_row_selection;
-	iface->remove_row_selection = table_interface_remove_row_selection;
-	iface->add_column_selection = table_interface_add_column_selection;
-	iface->remove_column_selection = table_interface_remove_column_selection;
-
-	iface->get_row_header = table_interface_get_row_header;
-	iface->get_column_header = table_interface_get_column_header;
-	iface->get_caption = table_interface_get_caption;
-	iface->get_summary = table_interface_get_summary;
-	iface->get_row_description = table_interface_get_row_description;
-	iface->get_column_description = table_interface_get_column_description;
-}
-
-static AtkObject* 
-table_interface_ref_at (AtkTable *table,
-			gint     row, 
-			gint     column)
-{
-	gint index;
-
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-	index = ea_day_view_main_item_get_child_index_at (ea_main_item,
-							  row, column);
-	return ea_day_view_main_item_ref_child (ATK_OBJECT (ea_main_item), index);
-}
-
-static gint 
-table_interface_get_n_rows (AtkTable *table)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	return day_view->rows;
-}
-
-static gint 
-table_interface_get_n_columns (AtkTable *table)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	return day_view->days_shown;
-}
-
-static gint
-table_interface_get_index_at (AtkTable *table,
-			      gint     row,
-			      gint     column)
-{
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-	return ea_day_view_main_item_get_child_index_at (ea_main_item,
-							 row, column);
-}
-
-static gint
-table_interface_get_column_at_index (AtkTable *table,
-				     gint     index)
-{
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-	return ea_day_view_main_item_get_column_at_index (ea_main_item, index);
-}
-
-static gint
-table_interface_get_row_at_index (AtkTable *table,
-				  gint     index)
-{
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-	return ea_day_view_main_item_get_row_at_index (ea_main_item, index);
-}
-
-static gint
-table_interface_get_column_extent_at (AtkTable      *table,
-				      gint          row,
-				      gint          column)
-{
-	gint index;
-	gint width = 0, height = 0;
-	AtkObject *child;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-
-	index = ea_day_view_main_item_get_child_index_at (ea_main_item,
-							  row, column);
-	child = atk_object_ref_accessible_child (ATK_OBJECT (ea_main_item),
-						 index);
-	if (child)
-		atk_component_get_size (ATK_COMPONENT (child),
-					&width, &height);
-
-	return width;
-}
-
-static gint 
-table_interface_get_row_extent_at (AtkTable      *table,
-				   gint          row,
-				   gint          column)
-{
-	gint index;
-	gint width = 0, height = 0;
-	AtkObject *child;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-
-	index = ea_day_view_main_item_get_child_index_at (ea_main_item,
-							  row, column);
-	child = atk_object_ref_accessible_child (ATK_OBJECT (ea_main_item),
-						 index);
-	if (child)
-		atk_component_get_size (ATK_COMPONENT (child),
-					&width, &height);
-
-	return height;
-}
-
-static gboolean 
-table_interface_is_row_selected (AtkTable *table,
-				 gint     row)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	if (day_view->selection_start_day == -1)
-		/* no selection */
-		return FALSE;
-	if (day_view->selection_start_day != day_view->selection_end_day)
-		/* all row is selected */
-		return TRUE;
-	if (row >= day_view->selection_start_row &&
-	    row <= day_view->selection_end_row)
-		return TRUE;
-	return FALSE;
-}
-
-static gboolean 
-table_interface_is_selected (AtkTable *table, 
-			     gint     row, 
-			     gint     column)
-{
-	return table_interface_is_row_selected (table, row) &&
-		table_interface_is_column_selected (table, column);
-}
-
-static gboolean 
-table_interface_is_column_selected (AtkTable *table,
-				    gint     column)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	if (column >= day_view->selection_start_day &&
-	    column <= day_view->selection_end_day)
-		return TRUE;
-	return FALSE;
-}
-
-static gint 
-table_interface_get_selected_rows (AtkTable *table,
-				   gint     **rows_selected)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-	gint start_row = -1, n_rows = 0;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	if (day_view->selection_start_day == -1)
-		return 0;
-
-	if (day_view->selection_start_day != day_view->selection_end_day) {
-		/* all the rows should be selected */
-		n_rows = day_view->rows;
-		start_row = 0;
-	}
-	else if (day_view->selection_start_row != -1) {
-		start_row = day_view->selection_start_row;
-		n_rows = day_view->selection_end_row - start_row + 1;
-	}
-	if (n_rows > 0 && start_row != -1 && rows_selected) {
-		gint index;
-
-		*rows_selected = (gint *) g_malloc (n_rows * sizeof (gint));
-		for (index = 0; index < n_rows; ++index)
-			(*rows_selected)[index] = start_row + index;
-	}
-	return n_rows;
-}
-
-static gint 
-table_interface_get_selected_columns (AtkTable *table,
-				      gint **columns_selected)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-	gint start_column = -1, n_columns = 0;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	if (day_view->selection_start_day == -1)
-		return 0;
-
-	start_column = day_view->selection_start_day;
-	n_columns = day_view->selection_end_day - start_column + 1;
-	if (n_columns > 0 && start_column != -1 && columns_selected) {
-		gint index;
-
-		*columns_selected = (gint *) g_malloc (n_columns * sizeof (gint));
-		for (index = 0; index < n_columns; ++index)
-			(*columns_selected)[index] = start_column + index;
-	}
-	return n_columns;
-}
-
-static gboolean 
-table_interface_add_row_selection (AtkTable *table, 
-				   gint row)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	/* FIXME: we need multi-selection */
-
-	day_view->selection_start_day = 0;
-	day_view->selection_end_day = 0;
-	day_view->selection_start_row = row;
-	day_view->selection_end_row = row;
-
-	e_day_view_ensure_rows_visible (day_view,
-					day_view->selection_start_row,
-					day_view->selection_end_row);
-	e_day_view_update_calendar_selection_time (day_view);
-	gtk_widget_queue_draw (day_view->main_canvas);
-	return TRUE;
-}
-
-static gboolean 
-table_interface_remove_row_selection (AtkTable *table, 
-				      gint row)
-{
-	return FALSE;
-}
-
-static gboolean 
-table_interface_add_column_selection (AtkTable *table, 
-				      gint column)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	/* FIXME: we need multi-selection */
-
-	day_view->selection_start_day = column;
-	day_view->selection_end_day = column;
-	day_view->selection_start_row = 0;
-	day_view->selection_end_row = day_view->rows;
-
-	e_day_view_update_calendar_selection_time (day_view);
-	gtk_widget_queue_draw (day_view->main_canvas);
-	return TRUE;
-}
-
-static gboolean 
-table_interface_remove_column_selection (AtkTable *table, 
-					 gint     column)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return FALSE;
-}
-
-static AtkObject* 
-table_interface_get_row_header (AtkTable *table, 
-				gint     row)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return NULL;
-}
-
-static AtkObject* 
-table_interface_get_column_header (AtkTable *table, 
-				   gint     in_col)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return NULL;
-}
-
-static AtkObject*
-table_interface_get_caption (AtkTable	*table)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return NULL;
-}
-
-static G_CONST_RETURN gchar*
-table_interface_get_column_description (AtkTable	  *table,
-					gint       in_col)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-	const gchar *description;
-	EaCellTable *cell_data;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	if (in_col < 0 || in_col >= day_view->days_shown)
-		return NULL;
-	cell_data = ea_day_view_main_item_get_cell_data (ea_main_item);
-	if (!cell_data)
-		return NULL;
-
-	description = ea_cell_table_get_column_label (cell_data, in_col);
-	if (!description) {
-		gchar buffer[128];
-		e_day_view_top_item_get_day_label (day_view, in_col, buffer, 128);
-		ea_cell_table_set_column_label (cell_data, in_col, buffer);
-		description = ea_cell_table_get_column_label (cell_data, in_col);
-	}
-	return description;
-}
-
-static G_CONST_RETURN gchar*
-table_interface_get_row_description (AtkTable    *table,
-				     gint        row)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (table);
-	const gchar *description;
-	EaCellTable *cell_data;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	if (row < 0 || row >= 12 * 24)
-		return NULL;
-	cell_data = ea_day_view_main_item_get_cell_data (ea_main_item);
-	if (!cell_data)
-		return NULL;
-
-	description = ea_cell_table_get_row_label (cell_data, row);
-	if (!description) {
-		gchar buffer[128];
-		ea_day_view_main_item_get_row_label (ea_main_item, row, buffer, sizeof (buffer));
-		ea_cell_table_set_row_label (cell_data, row, buffer);
-		description = ea_cell_table_get_row_label (cell_data,
-								row);
-	}
-	return description;
-}
-
-static AtkObject*
-table_interface_get_summary (AtkTable	*table)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return NULL;
-}
-
-/* atkselection interface */
-
-static void
-atk_selection_interface_init (AtkSelectionIface *iface)
-{
-	g_return_if_fail (iface != NULL);
-
-	iface->add_selection = selection_interface_add_selection;
-	iface->clear_selection = selection_interface_clear_selection;
-	iface->ref_selection = selection_interface_ref_selection;
-	iface->get_selection_count = selection_interface_get_selection_count;
-	iface->is_child_selected = selection_interface_is_child_selected;
-}
-
-static gboolean
-selection_interface_add_selection (AtkSelection *selection, gint i)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (selection);
-	gint column, row;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	row = ea_day_view_main_item_get_row_at_index (ea_main_item, i);
-	column = ea_day_view_main_item_get_column_at_index (ea_main_item, i);
-
-	if (row == -1 || column == -1)
-		return FALSE;
-
-	/*FIXME: multi-selection is needed */
-	day_view->selection_start_day = column;
-	day_view->selection_end_day = column;
-	day_view->selection_start_row = row;
-	day_view->selection_end_row = row;
-
-	e_day_view_ensure_rows_visible (day_view,
-					day_view->selection_start_row,
-					day_view->selection_end_row);
-	e_day_view_update_calendar_selection_time (day_view);
-	gtk_widget_queue_draw (day_view->main_canvas);
-	return TRUE;
-}
-
-static gboolean
-selection_interface_clear_selection (AtkSelection *selection)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (selection);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	day_view->selection_start_row = -1;
-	day_view->selection_start_day = -1;
-	day_view->selection_end_row = -1;
-	day_view->selection_end_day = -1;
-
-	e_day_view_update_calendar_selection_time (day_view);
-	gtk_widget_queue_draw (day_view->main_canvas);
-
-	return TRUE;
-}
-
-static AtkObject*  
-selection_interface_ref_selection (AtkSelection *selection, gint i)
-{
-	if (selection_interface_is_child_selected (selection, i))
-		return ea_day_view_main_item_ref_child (ATK_OBJECT (selection), i);
-	return NULL;
-}
-
-static gint
-selection_interface_get_selection_count (AtkSelection *selection)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (selection);
-	gint start_index, end_index;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return 0;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	if (day_view->selection_start_day == -1 ||
-	    day_view->selection_start_row == -1)
-		return 0;
-	start_index = ea_day_view_main_item_get_child_index_at (ea_main_item,
-								day_view->selection_start_row,
-								day_view->selection_start_day);
-	end_index = ea_day_view_main_item_get_child_index_at (ea_main_item,
-								day_view->selection_end_row,
-								day_view->selection_end_day);
-
-	return end_index - start_index + 1;
-}
-
-static gboolean
-selection_interface_is_child_selected (AtkSelection *selection, gint i)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EDayViewMainItem *main_item;
-	EDayView *day_view;
-	EaDayViewMainItem* ea_main_item = EA_DAY_VIEW_MAIN_ITEM (selection);
-	gint column, row;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
-	day_view = main_item->day_view;
-
-	row = ea_day_view_main_item_get_row_at_index (ea_main_item, i);
-	column = ea_day_view_main_item_get_column_at_index (ea_main_item, i);
-
-	if (column < day_view->selection_start_day ||
-	    column > day_view->selection_end_day)
-		return FALSE;
-
-	if ((column == day_view->selection_start_day ||
-	     column == day_view->selection_end_day) &&
-	    (row < day_view->selection_start_row ||
-	     row > day_view->selection_end_row))
-		return FALSE;
-
-	/* if comes here, the cell is selected */
-	return TRUE;
-}
diff --git a/a11y/calendar/ea-day-view-main-item.h b/a11y/calendar/ea-day-view-main-item.h
deleted file mode 100644
index d22372d064..0000000000
--- a/a11y/calendar/ea-day-view-main-item.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-day-view-main-item.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#ifndef __EA_DAY_VIEW_MAIN_ITEM_H__
-#define __EA_DAY_VIEW_MAIN_ITEM_H__
-
-#include <atk/atkgobjectaccessible.h>
-#include "e-day-view-main-item.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define EA_TYPE_DAY_VIEW_MAIN_ITEM                     (ea_day_view_main_item_get_type ())
-#define EA_DAY_VIEW_MAIN_ITEM(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_DAY_VIEW_MAIN_ITEM, EaDayViewMainItem))
-#define EA_DAY_VIEW_MAIN_ITEM_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_DAY_VIEW_MAIN_ITEM, EaDayViewMainItemClass))
-#define EA_IS_DAY_VIEW_MAIN_ITEM(obj)                  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_DAY_VIEW_MAIN_ITEM))
-#define EA_IS_DAY_VIEW_MAIN_ITEM_CLASS(klass)          (G_TYPE_CHECK_CLASS_TYPE ((klass), EA_TYPE_DAY_VIEW_MAIN_ITEM))
-#define EA_DAY_VIEW_MAIN_ITEM_GET_CLASS(obj)           (G_TYPE_INSTANCE_GET_CLASS ((obj), EA_TYPE_DAY_VIEW_MAIN_ITEM, EaDayViewMainItemClass))
-
-typedef struct _EaDayViewMainItem                   EaDayViewMainItem;
-typedef struct _EaDayViewMainItemClass              EaDayViewMainItemClass;
-
-struct _EaDayViewMainItem
-{
-	AtkGObjectAccessible parent;
-};
-
-GType ea_day_view_main_item_get_type (void);
-
-struct _EaDayViewMainItemClass
-{
-	AtkGObjectAccessibleClass parent_class;
-};
-
-AtkObject*     ea_day_view_main_item_new         (GObject *obj);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __EA_DAY_VIEW_MAIN_ITEM_H__ */
diff --git a/a11y/calendar/ea-day-view.c b/a11y/calendar/ea-day-view.c
deleted file mode 100644
index f91583da24..0000000000
--- a/a11y/calendar/ea-day-view.c
+++ /dev/null
@@ -1,261 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-day-view.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-day-view.h"
-#include "ea-cal-view-event.h"
-
-#include "ea-calendar-helpers.h"
-#include "calendar-commands.h"
-#include <glib/gstrfuncs.h>
-
-static void ea_day_view_class_init (EaDayViewClass *klass);
-
-static G_CONST_RETURN gchar* ea_day_view_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_day_view_get_description (AtkObject *accessible);
-static gint         ea_day_view_get_n_children      (AtkObject *obj);
-static AtkObject*   ea_day_view_ref_child           (AtkObject *obj,
-                                                     gint i);
-static gpointer parent_class = NULL;
-
-GType
-ea_day_view_get_type (void)
-{
-	static GType type = 0;
-	AtkObjectFactory *factory;
-	GTypeQuery query;
-	GType derived_atk_type;
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (EaDayViewClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) ea_day_view_class_init, /* class init */
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (EaDayView), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		/*
-		 * Figure out the size of the class and instance
-		 * we are run-time deriving from (EaCalView, in this case)
-		 *
-		 * Note: we must still use run-time deriving here, because
-		 * our parent class EaCalView is run-time deriving.
-		 */
-
-		factory = atk_registry_get_factory (atk_get_default_registry (),
-						    e_cal_view_get_type());
-		derived_atk_type = atk_object_factory_get_accessible_type (factory);
-		g_type_query (derived_atk_type, &query);
-
-		tinfo.class_size = query.class_size;
-		tinfo.instance_size = query.instance_size;
-
-		type = g_type_register_static (derived_atk_type,
-					       "EaDayView", &tinfo, 0);
-	}
-
-	return type;
-}
-
-static void
-ea_day_view_class_init (EaDayViewClass *klass)
-{
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	class->get_name = ea_day_view_get_name;
-	class->get_description = ea_day_view_get_description;
-
-	class->get_n_children = ea_day_view_get_n_children;
-	class->ref_child = ea_day_view_ref_child;
-}
-
-AtkObject* 
-ea_day_view_new (GtkWidget *widget)
-{
-	GObject *object;
-	AtkObject *accessible;
-
-	g_return_val_if_fail (E_IS_DAY_VIEW (widget), NULL);
-
-	object = g_object_new (EA_TYPE_DAY_VIEW, NULL);
-
-	accessible = ATK_OBJECT (object);
-	atk_object_initialize (accessible, widget);
-
-#ifdef ACC_DEBUG
-	printf ("EvoAcc: ea_day_view created %p\n", (void *)accessible);
-#endif
-
-	return accessible;
-}
-
-static G_CONST_RETURN gchar*
-ea_day_view_get_name (AtkObject *accessible)
-{
-	EDayView *day_view;
-	GnomeCalendar *gcal;
-	const gchar *label_text;
-	GnomeCalendarViewType view_type;
-	gchar buffer[128] = "";
-	gint n_events;
-
-
-	g_return_val_if_fail (EA_IS_DAY_VIEW (accessible), NULL);
-
-	if (!GTK_ACCESSIBLE (accessible)->widget)
-		return NULL;
-	day_view = E_DAY_VIEW (GTK_ACCESSIBLE (accessible)->widget);
-
-	gcal = e_calendar_view_get_calendar (E_CALENDAR_VIEW (day_view));
-	label_text = calendar_get_text_for_folder_bar_label (gcal);
-
-	n_events = atk_object_get_n_accessible_children (accessible);
-	/* the child main item is always there */
-	--n_events;
-	if (n_events > 0)
-		g_snprintf (buffer, sizeof (buffer),
-			    ", %d events", n_events);
-	view_type = gnome_calendar_get_view (gcal);
-	if (view_type == GNOME_CAL_WORK_WEEK_VIEW)
-		accessible->name = g_strconcat ("work week view :",
-						label_text, buffer,
-						NULL);
-	else
-		accessible->name = g_strconcat ("day view :",
-						label_text, buffer,
-						NULL);
-	return accessible->name;
-}
-
-static G_CONST_RETURN gchar*
-ea_day_view_get_description (AtkObject *accessible)
-{
-	EDayView *day_view;
-
-	g_return_val_if_fail (EA_IS_DAY_VIEW (accessible), NULL);
-
-	if (!GTK_ACCESSIBLE (accessible)->widget)
-		return NULL;
-	day_view = E_DAY_VIEW (GTK_ACCESSIBLE (accessible)->widget);
-
-	if (accessible->description)
-		return accessible->description;
-	else {
-		GnomeCalendar *gcal;
-		GnomeCalendarViewType view_type;
-
-		gcal = e_calendar_view_get_calendar (E_CALENDAR_VIEW (day_view));
-		view_type = gnome_calendar_get_view (gcal);
-
-		if (view_type == GNOME_CAL_WORK_WEEK_VIEW)
-			return "calendar view for a work week";
-		else
-			return "calendar view for one or more days";
-	}
-}
-
-static gint
-ea_day_view_get_n_children (AtkObject *accessible)
-{
-	EDayView *day_view;
-	gint day;
-	gint child_num = 0;
-
-	g_return_val_if_fail (EA_IS_DAY_VIEW (accessible), -1);
-
-	if (!GTK_ACCESSIBLE (accessible)->widget)
-		return -1;
-
-	day_view = E_DAY_VIEW (GTK_ACCESSIBLE (accessible)->widget);
-
-	child_num += day_view->long_events->len;
-
-	for (day = 0; day < day_view->days_shown; day++) {
-		child_num += day_view->events[day]->len;
-	}
-
-	/* "+1" for the main item */
-	return child_num + 1;
-}
-
-static AtkObject *
-ea_day_view_ref_child (AtkObject *accessible, gint index)
-{
-	EDayView *day_view;
-	gint child_num;
-	gint day;
-	AtkObject *atk_object = NULL;
-	EDayViewEvent *event = NULL;
-
-	g_return_val_if_fail (EA_IS_DAY_VIEW (accessible), NULL);
-
-	child_num = atk_object_get_n_accessible_children (accessible);
-	if (child_num <= 0 || index < 0 || index >= child_num)
-		return NULL;
-
-	if (!GTK_ACCESSIBLE (accessible)->widget)
-		return NULL;
-	day_view = E_DAY_VIEW (GTK_ACCESSIBLE (accessible)->widget);
-
-	if (index == 0) {
-		/* index == 0 is the main item */
-		atk_object = atk_gobject_accessible_for_object (G_OBJECT (day_view->main_canvas_item));
-		g_object_ref (atk_object);
-	}
-	else {
-		--index;
-		/* a long event */
-		if (index < day_view->long_events->len) {
-			event = &g_array_index (day_view->long_events,
-						EDayViewEvent, index);
-		}
-		else {
-			index -= day_view->long_events->len;
-			day = 0;
-			while (index >= day_view->events[day]->len) {
-				index -= day_view->events[day]->len;
-				++day;
-			}
-
-			event = &g_array_index (day_view->events[day],
-						EDayViewEvent, index);
-		}
-		if (event && event->canvas_item) {
-			/* Not use atk_gobject_accessible_for_object here,
-			 * we need to do special thing here
-			 */
-			atk_object = ea_calendar_helpers_get_accessible_for (event->canvas_item);
-			g_object_ref (atk_object);
-		}
-	}
-	return atk_object;
-}
diff --git a/a11y/calendar/ea-day-view.h b/a11y/calendar/ea-day-view.h
deleted file mode 100644
index 5ca4614f03..0000000000
--- a/a11y/calendar/ea-day-view.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-day-view.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#ifndef __EA_DAY_VIEW_H__
-#define __EA_DAY_VIEW_H__
-
-#include "ea-cal-view.h"
-#include "e-day-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define EA_TYPE_DAY_VIEW                     (ea_day_view_get_type ())
-#define EA_DAY_VIEW(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_DAY_VIEW, EaDayView))
-#define EA_DAY_VIEW_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_DAY_VIEW, EaDayViewClass))
-#define EA_IS_DAY_VIEW(obj)                  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_DAY_VIEW))
-#define EA_IS_DAY_VIEW_CLASS(klass)          (G_TYPE_CHECK_CLASS_TYPE ((klass), EA_TYPE_DAY_VIEW))
-#define EA_DAY_VIEW_GET_CLASS(obj)           (G_TYPE_INSTANCE_GET_CLASS ((obj), EA_TYPE_DAY_VIEW, EaDayViewClass))
-
-typedef struct _EaDayView                   EaDayView;
-typedef struct _EaDayViewClass              EaDayViewClass;
-
-struct _EaDayView
-{
-	EaCalView parent;
-};
-
-GType ea_day_view_get_type (void);
-
-struct _EaDayViewClass
-{
-	EaCalViewClass parent_class;
-};
-
-AtkObject*     ea_day_view_new         (GtkWidget       *widget);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __EA_DAY_VIEW_H__ */
diff --git a/a11y/calendar/ea-gnome-calendar.c b/a11y/calendar/ea-gnome-calendar.c
deleted file mode 100644
index 9d057ee31a..0000000000
--- a/a11y/calendar/ea-gnome-calendar.c
+++ /dev/null
@@ -1,248 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-gnome-calendar.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-gnome-calendar.h"
-#include "calendar-commands.h"
-#include <gtk/gtknotebook.h>
-
-static void ea_gnome_calendar_class_init (EaGnomeCalendarClass *klass);
-
-static G_CONST_RETURN gchar* ea_gnome_calendar_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_gnome_calendar_get_description (AtkObject *accessible);
-static gint ea_gnome_calendar_get_n_children (AtkObject* obj);
-static AtkObject * ea_gnome_calendar_ref_child (AtkObject *obj, gint i);
-
-static void ea_gcal_switch_view_cb (GtkNotebook *widget, GtkNotebookPage *page,
-				    guint index, gpointer data);
-static void ea_gcal_dates_change_cb (GnomeCalendar *gcal, gpointer data);
-
-static gpointer parent_class = NULL;
-
-GType
-ea_gnome_calendar_get_type (void)
-{
-	static GType type = 0;
-	AtkObjectFactory *factory;
-	GTypeQuery query;
-	GType derived_atk_type;
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (EaGnomeCalendarClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) ea_gnome_calendar_class_init, /* class init */
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (EaGnomeCalendar), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		/*
-		 * Figure out the size of the class and instance
-		 * we are run-time deriving from (GailWidget, in this case)
-		 */
-
-		factory = atk_registry_get_factory (atk_get_default_registry (),
-						    GTK_TYPE_WIDGET);
-		derived_atk_type = atk_object_factory_get_accessible_type (factory);
-		g_type_query (derived_atk_type, &query);
-		tinfo.class_size = query.class_size;
-		tinfo.instance_size = query.instance_size;
-
-		type = g_type_register_static (derived_atk_type,
-					       "EaGnomeCalendar", &tinfo, 0);
-
-	}
-
-	return type;
-}
-
-static void
-ea_gnome_calendar_class_init (EaGnomeCalendarClass *klass)
-{
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	class->get_name = ea_gnome_calendar_get_name;
-	class->get_description = ea_gnome_calendar_get_description;
-
-	class->get_n_children = ea_gnome_calendar_get_n_children;
-	class->ref_child = ea_gnome_calendar_ref_child;
-}
-
-AtkObject* 
-ea_gnome_calendar_new (GtkWidget *widget)
-{
-	GObject *object;
-	AtkObject *accessible;
-	GnomeCalendar *gcal;
-	GtkWidget *notebook;
-
-	g_return_val_if_fail (GNOME_IS_CALENDAR (widget), NULL);
-
-	object = g_object_new (EA_TYPE_GNOME_CALENDAR, NULL);
-
-	accessible = ATK_OBJECT (object);
-	atk_object_initialize (accessible, widget);
-
-	accessible->role = ATK_ROLE_FILLER;
-
-	gcal = GNOME_CALENDAR (widget);
-
-	/* listen on view type change
-	 */
-	g_signal_connect (widget, "dates_shown_changed",
-			  G_CALLBACK (ea_gcal_dates_change_cb),
-			  accessible);
-	notebook = gnome_calendar_get_view_notebook_widget (gcal);
-	if (notebook) {
-		g_signal_connect (notebook, "switch_page",
-				  G_CALLBACK (ea_gcal_switch_view_cb),
-				  accessible);
-	}
-
-#ifdef ACC_DEBUG
-	printf ("EvoAcc: ea-gnome-calendar created: %p\n", (void *)accessible);
-#endif
-
-	return accessible;
-}
-
-static G_CONST_RETURN gchar*
-ea_gnome_calendar_get_name (AtkObject *accessible)
-{
-	if (accessible->name)
-		return accessible->name;
-	return "Gnome Calendar";
-}
-
-static G_CONST_RETURN gchar*
-ea_gnome_calendar_get_description (AtkObject *accessible)
-{
-	if (accessible->description)
-		return accessible->description;
-	return "Gnome Calendar";
-}
-
-static gint
-ea_gnome_calendar_get_n_children (AtkObject* obj)
-{
-	g_return_val_if_fail (EA_IS_GNOME_CALENDAR (obj), 0);
-
-	if (!GTK_ACCESSIBLE (obj)->widget)
-		return -1;
-	return 4;
-}
-
-static AtkObject *
-ea_gnome_calendar_ref_child (AtkObject *obj, gint i)
-{
-	AtkObject * child = NULL;
-	GnomeCalendar * calendarWidget;
-	GtkWidget *childWidget;
-
-	g_return_val_if_fail (EA_IS_GNOME_CALENDAR (obj), NULL);
-	/* valid child index range is [0-3] */
-	if (i < 0 || i >3 )
-		return NULL;
-
-	if (!GTK_ACCESSIBLE (obj)->widget)
-		return NULL;
-	calendarWidget = GNOME_CALENDAR (GTK_ACCESSIBLE (obj)->widget);
-
-	switch (i) {
-	case 0:
-		/* for the search bar */
-		childWidget = gnome_calendar_get_search_bar_widget (calendarWidget);
-		child = gtk_widget_get_accessible (childWidget);
-		atk_object_set_parent (child, obj);
-		atk_object_set_name (child, "search bar");
-		atk_object_set_description (child, "evolution calendar search bar");
-		break;
-	case 1:
-		/* for the day/week view */
-		childWidget = gnome_calendar_get_current_view_widget (calendarWidget);
-		child = gtk_widget_get_accessible (childWidget);
-		atk_object_set_parent (child, obj);
-		break;
-	case 2:
-		/* for calendar */
-		childWidget = gnome_calendar_get_e_calendar_widget (calendarWidget);
-		child = gtk_widget_get_accessible (childWidget);
-		break;
-	case 3:
-		/* for todo list */
-		childWidget = GTK_WIDGET (gnome_calendar_get_task_pad (calendarWidget));
-		child = gtk_widget_get_accessible (childWidget);
-		break;
-	default:
-		break;
-	}
-	if (child)
-		g_object_ref(child);
-	return child;
-}
-
-static void
-ea_gcal_switch_view_cb (GtkNotebook *widget, GtkNotebookPage *page,
-			guint index, gpointer data)
-{
-	GtkWidget *new_widget;
-
-	new_widget = gtk_notebook_get_nth_page (widget, index);
-
-	/* views are always the second child in gnome calendar
-	 */
-	if (new_widget)
-		g_signal_emit_by_name (G_OBJECT(data), "children_changed::add",
-				       1, gtk_widget_get_accessible (new_widget), NULL);
-
-#ifdef ACC_DEBUG
-	printf ("AccDebug: view switch to widget %p (index=%d) \n",
-		(void *)new_widget, index);
-#endif
-}
-
-static void
-ea_gcal_dates_change_cb (GnomeCalendar *gcal, gpointer data)
-{
-	const gchar *new_name;
-
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-	g_return_if_fail (data);
-	g_return_if_fail (EA_IS_GNOME_CALENDAR (data));
-
-	new_name = calendar_get_text_for_folder_bar_label (gcal);
-	atk_object_set_name (ATK_OBJECT(data), new_name);
-	g_signal_emit_by_name (data, "visible_data_changed");
-
-#ifdef ACC_DEBUG
-	printf ("AccDebug: calendar dates changed, label=%s\n", new_name);
-#endif
-}
diff --git a/a11y/calendar/ea-gnome-calendar.h b/a11y/calendar/ea-gnome-calendar.h
deleted file mode 100644
index 2cb39219c4..0000000000
--- a/a11y/calendar/ea-gnome-calendar.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-gnome-calendar.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#ifndef __EA_GNOME_CALENDAR_H__
-#define __EA_GNOME_CALENDAR_H__
-
-#include <gtk/gtkaccessible.h>
-#include "gnome-cal.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define EA_TYPE_GNOME_CALENDAR            (ea_gnome_calendar_get_type ())
-#define EA_GNOME_CALENDAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_GNOME_CALENDAR, EaGnomeCalendar))
-#define EA_GNOME_CALENDAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_GNOME_CALENDAR, EaGnomeCalendarClass))
-#define EA_IS_GNOME_CALENDAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_GNOME_CALENDAR))
-#define EA_IS_GNOME_CALENDAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EA_TYPE_GNOME_CALENDAR))
-#define EA_GNOME_CALENDAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), EA_TYPE_GNOME_CALENDAR, EaGnomeCalendarClass))
-
-typedef struct _EaGnomeCalendar                   EaGnomeCalendar;
-typedef struct _EaGnomeCalendarClass              EaGnomeCalendarClass;
-
-struct _EaGnomeCalendar
-{
-	GtkAccessible parent;
-};
-
-GType ea_gnome_calendar_get_type (void);
-
-struct _EaGnomeCalendarClass
-{
-	GtkAccessibleClass parent_class;
-};
-
-AtkObject*     ea_gnome_calendar_new         (GtkWidget       *widget);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __EA_GNOME_CALENDAR_H__ */
diff --git a/a11y/calendar/ea-week-view.c b/a11y/calendar/ea-week-view.c
deleted file mode 100644
index 3c3e13a268..0000000000
--- a/a11y/calendar/ea-week-view.c
+++ /dev/null
@@ -1,305 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-week-view.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-week-view.h"
-#include "ea-cal-view.h"
-#include "ea-cal-view-event.h"
-#include "ea-calendar-helpers.h"
-#include "calendar-commands.h"
-#include <gal/e-text/e-text.h>
-
-static void ea_week_view_class_init (EaWeekViewClass *klass);
-
-static G_CONST_RETURN gchar* ea_week_view_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_week_view_get_description (AtkObject *accessible);
-static gint         ea_week_view_get_n_children      (AtkObject *obj);
-static AtkObject*   ea_week_view_ref_child           (AtkObject *obj,
-						      gint i);
-
-static gpointer parent_class = NULL;
-
-GType
-ea_week_view_get_type (void)
-{
-	static GType type = 0;
-	AtkObjectFactory *factory;
-	GTypeQuery query;
-	GType derived_atk_type;
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (EaWeekViewClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) ea_week_view_class_init, /* class init */
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (EaWeekView), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		/*
-		 * Figure out the size of the class and instance
-		 * we are run-time deriving from (EaCalView, in this case)
-		 *
-		 * Note: we must still use run-time deriving here, because
-		 * our parent class EaCalView is run-time deriving.
-		 */
-
-		factory = atk_registry_get_factory (atk_get_default_registry (),
-						    e_cal_view_get_type());
-		derived_atk_type = atk_object_factory_get_accessible_type (factory);
-		g_type_query (derived_atk_type, &query);
-
-		tinfo.class_size = query.class_size;
-		tinfo.instance_size = query.instance_size;
-
-		type = g_type_register_static (derived_atk_type,
-					       "EaWeekView", &tinfo, 0);
-
-	}
-
-	return type;
-}
-
-static void
-ea_week_view_class_init (EaWeekViewClass *klass)
-{
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	class->get_name = ea_week_view_get_name;
-	class->get_description = ea_week_view_get_description;
-
-	class->get_n_children = ea_week_view_get_n_children;
-	class->ref_child = ea_week_view_ref_child;
-}
-
-AtkObject* 
-ea_week_view_new (GtkWidget *widget)
-{
-	GObject *object;
-	AtkObject *accessible;
-
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
-
-	object = g_object_new (EA_TYPE_WEEK_VIEW, NULL);
-
-	accessible = ATK_OBJECT (object);
-	atk_object_initialize (accessible, widget);
-
-#ifdef ACC_DEBUG
-	printf ("EvoAcc: ea_week_view created %p\n", (void *)accessible);
-#endif
-
-	return accessible;
-}
-
-static G_CONST_RETURN gchar*
-ea_week_view_get_name (AtkObject *accessible)
-{
-	EWeekView *week_view;
-	GnomeCalendar *gcal;
-	const gchar *label_text;
-	GnomeCalendarViewType view_type;
-	gchar buffer[128] = "";
-	gint n_events;
-
-	g_return_val_if_fail (EA_IS_WEEK_VIEW (accessible), NULL);
-
-	if (!GTK_ACCESSIBLE (accessible)->widget)
-		return NULL;
-	week_view = E_WEEK_VIEW (GTK_ACCESSIBLE (accessible)->widget);
-
-	gcal = e_calendar_view_get_calendar (E_CALENDAR_VIEW (week_view));
-	label_text = calendar_get_text_for_folder_bar_label (gcal);
-
-	n_events = atk_object_get_n_accessible_children (accessible);
-	/* the child main item is always there */
-	--n_events;
-	if (n_events > 0)
-		g_snprintf (buffer, sizeof (buffer),
-			    ", %d events", n_events);
-
-	view_type = gnome_calendar_get_view (gcal);
-
-	if (view_type == GNOME_CAL_MONTH_VIEW)
-		accessible->name = g_strconcat ("month view :",
-						label_text, buffer,
-						NULL);
-
-	else
-		accessible->name = g_strconcat ("week view :",
-						label_text, buffer,
-						NULL);
-	return accessible->name;
-}
-
-static G_CONST_RETURN gchar*
-ea_week_view_get_description (AtkObject *accessible)
-{
-	EWeekView *week_view;
-
-	g_return_val_if_fail (EA_IS_WEEK_VIEW (accessible), NULL);
-
-	if (!GTK_ACCESSIBLE (accessible)->widget)
-		return NULL;
-	week_view = E_WEEK_VIEW (GTK_ACCESSIBLE (accessible)->widget);
-
-	if (accessible->description)
-		return accessible->description;
-	else {
-		GnomeCalendar *gcal;
-		GnomeCalendarViewType view_type;
-
-		gcal = e_calendar_view_get_calendar (E_CALENDAR_VIEW (week_view));
-		view_type = gnome_calendar_get_view (gcal);
-
-		if (view_type == GNOME_CAL_MONTH_VIEW)
-			return "calendar view for a month";
-		else
-			return "calendar view for one or more weeks";
-	}
-}
-
-static gint
-ea_week_view_get_n_children (AtkObject *accessible)
-{
-	EWeekView *week_view;
-	GnomeCanvasGroup *canvas_group;
-	gint i, count = 0;
-	gint event_index;
-
-	g_return_val_if_fail (EA_IS_WEEK_VIEW (accessible), -1);
-
-	if (!GTK_ACCESSIBLE (accessible)->widget)
-		return -1;
-	week_view = E_WEEK_VIEW (GTK_ACCESSIBLE (accessible)->widget);
-
-	for (event_index = 0; event_index < week_view->events->len;
-	     ++event_index) {
-		EWeekViewEvent *event;
-		EWeekViewEventSpan *span;
-
-		event = &g_array_index (week_view->events,
-					EWeekViewEvent, event_index);
-		if (!event)
-			continue;
-		span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-				       event->spans_index + 0);
-
-		if (!span)
-			continue;
-
-		/* at least one of the event spans is visible, count it */
-		if (span->text_item)
-			++count;
-	}
-
-	/* add the number of visible jump buttons */
-	for (i = 0; i < E_WEEK_VIEW_MAX_WEEKS * 7; i++) {
-		if (week_view->jump_buttons[i]->object.flags & GNOME_CANVAS_ITEM_VISIBLE)
-			++count;
-	}
-
-#ifdef ACC_DEBUG
-	printf("AccDebug: week view %p has %d children\n", (void *)week_view, count);
-#endif
-	return count;
-}
-
-static AtkObject *
-ea_week_view_ref_child (AtkObject *accessible, gint index)
-{
-	EWeekView *week_view;
-	gint child_num, max_count;
-	AtkObject *atk_object = NULL;
-	gint event_index;
-	gint jump_button = -1;
-	gint span_num = 0;
-	gint count = 0;
-
-	g_return_val_if_fail (EA_IS_WEEK_VIEW (accessible), NULL);
-
-	child_num = atk_object_get_n_accessible_children (accessible);
- 	if (child_num <= 0 || index < 0 || index >= child_num)
-		return NULL;
-
-	if (!GTK_ACCESSIBLE (accessible)->widget)
-		return NULL;
-	week_view = E_WEEK_VIEW (GTK_ACCESSIBLE (accessible)->widget);
-	max_count = week_view->events->len;
-
-	for (event_index = 0; event_index < max_count; ++event_index) {
-		EWeekViewEvent *event;
-		EWeekViewEventSpan *span;
-		gint current_day;
-
-		event = &g_array_index (week_view->events,
-					EWeekViewEvent, event_index);
-		if (!event)
-			continue;
-
-		span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-				       event->spans_index + span_num);
-
-		if (!span)
-			continue;
-
-		current_day = span->start_day;
-		if (span->text_item)
-			++count;
-		else if  (current_day != jump_button) {
-			/* we should go to the jump button */
-			jump_button = current_day;
-			++count;
-		}
-		else
-			continue;
-
-		if (count == (index + 1)) {
-			if (span->text_item) {
-				/* Not use atk_gobject_accessible_for_object for event
-				 * text_item we need to do special thing here
-				 */
-				atk_object = ea_calendar_helpers_get_accessible_for (span->text_item);
-			}
-			else {
-				atk_object = atk_gobject_accessible_for_object (G_OBJECT(week_view->jump_buttons[current_day == -1 ? 0 : current_day]));
-			}
-			g_object_ref (atk_object);
-			break;
-		}
-	}
-
-#ifdef ACC_DEBUG
-	printf ("EvoAcc: ea_week_view_ref_child [%d]=%p\n",
-		index, (void *)atk_object);
-#endif
-	return atk_object;
-}
diff --git a/a11y/calendar/ea-week-view.h b/a11y/calendar/ea-week-view.h
deleted file mode 100644
index f0ed117375..0000000000
--- a/a11y/calendar/ea-week-view.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-week-view.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#ifndef __EA_WEEK_VIEW_H__
-#define __EA_WEEK_VIEW_H__
-
-#include <gtk/gtkaccessible.h>
-#include "e-week-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define EA_TYPE_WEEK_VIEW                     (ea_week_view_get_type ())
-#define EA_WEEK_VIEW(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_WEEK_VIEW, EaWeekView))
-#define EA_WEEK_VIEW_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_WEEK_VIEW, EaWeekViewClass))
-#define EA_IS_WEEK_VIEW(obj)                  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_WEEK_VIEW))
-#define EA_IS_WEEK_VIEW_CLASS(klass)          (G_TYPE_CHECK_CLASS_TYPE ((klass), EA_TYPE_WEEK_VIEW))
-#define EA_WEEK_VIEW_GET_CLASS(obj)           (G_TYPE_INSTANCE_GET_CLASS ((obj), EA_TYPE_WEEK_VIEW, EaWeekViewClass))
-
-typedef struct _EaWeekView                   EaWeekView;
-typedef struct _EaWeekViewClass              EaWeekViewClass;
-
-struct _EaWeekView
-{
-	GtkAccessible parent;
-};
-
-GType ea_week_view_get_type (void);
-
-struct _EaWeekViewClass
-{
-	GtkAccessibleClass parent_class;
-};
-
-AtkObject*     ea_week_view_new         (GtkWidget       *widget);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __EA_WEEK_VIEW_H__ */
diff --git a/a11y/e-table/.cvsignore b/a11y/e-table/.cvsignore
deleted file mode 100644
index 5b48d3f593..0000000000
--- a/a11y/e-table/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-.libs
-Makefile.in
-Makefile
-*.la
diff --git a/a11y/e-table/gal-a11y-e-cell-popup.c b/a11y/e-table/gal-a11y-e-cell-popup.c
deleted file mode 100644
index 88325e726e..0000000000
--- a/a11y/e-table/gal-a11y-e-cell-popup.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: gal-a11y-e-cell-popup.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Yang Wu <yang.wu@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include <config.h>
-#include <gal/e-table/e-cell-popup.h>
-#include "gal-a11y-e-cell-popup.h"
-#include "gal-a11y-util.h"
-#include <atk/atkobject.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwidget.h>
-
-static AtkObjectClass *parent_class = NULL;
-#define PARENT_TYPE (gal_a11y_e_cell_get_type ())
-
-static void gal_a11y_e_cell_popup_class_init (GalA11yECellPopupClass *klass);
-static void popup_cell_action (GalA11yECell *cell);
-
-/**
- * gal_a11y_e_cell_popup_get_type:
- * @void: 
- * 
- * Registers the &GalA11yECellPopup class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &GalA11yECellPopup class.
- **/
-GType
-gal_a11y_e_cell_popup_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		GTypeInfo info = {
-			sizeof (GalA11yECellPopupClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) gal_a11y_e_cell_popup_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL, /* class_data */
-			sizeof (GalA11yECellPopup),
-			0,
-			(GInstanceInitFunc) NULL,
-			NULL /* value_cell_popup */
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "GalA11yECellPopup", &info, 0);
-		gal_a11y_e_cell_type_add_action_interface (type);
-	}
-
-	return type;
-}
-
-static void
-gal_a11y_e_cell_popup_class_init (GalA11yECellPopupClass *klass)
-{
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-
-	parent_class = g_type_class_ref (PARENT_TYPE);
-}
-
-AtkObject *
-gal_a11y_e_cell_popup_new (ETableItem *item,
-			  ECellView  *cell_view,
-			  AtkObject  *parent,
-			  int         model_col,
-			  int         view_col,
-			  int         row)
-{
-	AtkObject *a11y;
-	GalA11yECell *cell;
- 	ECellPopup *popupcell;
-	ECellView* child_view = NULL;
-
-	popupcell=  E_CELL_POPUP(cell_view->ecell);
-
-	if (popupcell && popupcell->popup_cell_view)
-	        child_view = popupcell->popup_cell_view->child_view;
-	
- 	if (child_view && child_view->ecell) {
-		a11y = gal_a11y_e_cell_registry_get_object (NULL,
-							    item,
-							    child_view,
-							    parent,
-							    model_col,
-							    view_col,
-							    row);
-	} else {
-		a11y = g_object_new (GAL_A11Y_TYPE_E_CELL_POPUP, NULL);
-		gal_a11y_e_cell_construct (a11y,
-					   item,
-					   cell_view,
-					   parent,
-					   model_col,
-					   view_col,
-					   row);
-	       	}
-	g_return_val_if_fail (a11y != NULL, NULL);
-	cell = GAL_A11Y_E_CELL(a11y);
-	gal_a11y_e_cell_add_action (cell, 
-				    "popup",	       /* action name*/
-				    "popup a child", /* action description */
-				    "<Alt>Down",              /* action keybinding */
-				    popup_cell_action);
-
-	a11y->role  = ATK_ROLE_TABLE_CELL;
-	return a11y;
-}
-
-static void
-popup_cell_action (GalA11yECell *cell)
-{
-	ECellPopup *ecp;
-	gint finished;
-	GdkEvent event;
-
-	event.key.type = GDK_KEY_PRESS; 
-	event.key.window = GTK_LAYOUT(GNOME_CANVAS_ITEM(cell->item)->canvas)->bin_window;;
-	event.key.send_event = TRUE;
-	event.key.time = GDK_CURRENT_TIME;
-	event.key.state = GDK_MOD1_MASK;
-	event.key.keyval = GDK_Down;
-  
-	g_signal_emit_by_name (cell->item, "event", &event, &finished);
-}
diff --git a/a11y/e-table/gal-a11y-e-cell-popup.h b/a11y/e-table/gal-a11y-e-cell-popup.h
deleted file mode 100644
index 5809f9b4f4..0000000000
--- a/a11y/e-table/gal-a11y-e-cell-popup.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: gal-a11y-e-cell-popup.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Yang Wu <yang.wu@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#ifndef __GAL_A11Y_E_CELL_POPUP_H__
-#define __GAL_A11Y_E_CELL_POPUP_H__
-
-#include <glib-object.h>
-#include <gal/e-table/e-table-item.h>
-#include <a11y/e-table/gal-a11y-e-cell.h>
-#include <atk/atkgobjectaccessible.h>
-
-#define GAL_A11Y_TYPE_E_CELL_POPUP            (gal_a11y_e_cell_popup_get_type ())
-#define GAL_A11Y_E_CELL_POPUP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_CELL_POPUP, GalA11yECellPopup))
-#define GAL_A11Y_E_CELL_POPUP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_A11Y_TYPE_E_CELL_POPUP, GalA11yECellPopupClass))
-#define GAL_A11Y_IS_E_CELL_POPUP(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_A11Y_TYPE_E_CELL_POPUP))
-#define GAL_A11Y_IS_E_CELL_POPUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAL_A11Y_TYPE_E_CELL_POPUP))
-
-typedef struct _GalA11yECellPopup GalA11yECellPopup;
-typedef struct _GalA11yECellPopupClass GalA11yECellPopupClass;
-
-/* This struct should actually be larger as this isn't what we derive from.
- * The GalA11yECellPopupPrivate comes right after the parent class structure.
- **/
-struct _GalA11yECellPopup {
-	GalA11yECell object;
-};
-
-struct _GalA11yECellPopupClass {
-	GalA11yECellClass parent_class;
-};
-
-
-/* Standard Glib function */
-GType      gal_a11y_e_cell_popup_get_type   (void);
-AtkObject *gal_a11y_e_cell_popup_new        (ETableItem *item,
-					    ECellView  *cell_view,
-					    AtkObject  *parent,
-					    int         model_col,
-					    int         view_col,
-					    int         row);
-
-#endif /* ! __GAL_A11Y_E_CELL_POPUP_H__ */
diff --git a/a11y/e-table/gal-a11y-e-cell-registry.c b/a11y/e-table/gal-a11y-e-cell-registry.c
deleted file mode 100644
index 7110179554..0000000000
--- a/a11y/e-table/gal-a11y-e-cell-registry.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2002 Ximian, Inc.
- */
-
-#include <config.h>
-#include "gal-a11y-e-cell-registry.h"
-#include "gal-a11y-e-cell.h"
-
-static GObjectClass *parent_class;
-static GalA11yECellRegistry *default_registry;
-#define PARENT_TYPE (G_TYPE_OBJECT)
-
-struct _GalA11yECellRegistryPrivate {
-	GHashTable *table;
-};
-
-/* Static functions */
-
-static void
-gal_a11y_e_cell_registry_finalize (GObject *obj)
-{
-	GalA11yECellRegistry *registry = GAL_A11Y_E_CELL_REGISTRY (obj);
-
-	g_hash_table_destroy (registry->priv->table);
-	g_free (registry->priv);
-}
-
-static void
-gal_a11y_e_cell_registry_class_init (GalA11yECellRegistryClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	parent_class = g_type_class_ref (PARENT_TYPE);
-
-	object_class->finalize = gal_a11y_e_cell_registry_finalize;
-}
-
-static void
-gal_a11y_e_cell_registry_init (GalA11yECellRegistry *registry)
-{
-	registry->priv = g_new (GalA11yECellRegistryPrivate, 1);
-	registry->priv->table = g_hash_table_new (NULL, NULL);
-}
-
-/**
- * gal_a11y_e_cell_registry_get_type:
- * @void: 
- * 
- * Registers the &GalA11yECellRegistry class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &GalA11yECellRegistry class.
- **/
-GType
-gal_a11y_e_cell_registry_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		GTypeInfo info = {
-			sizeof (GalA11yECellRegistryClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) gal_a11y_e_cell_registry_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL, /* class_data */
-			sizeof (GalA11yECellRegistry),
-			0,
-			(GInstanceInitFunc) gal_a11y_e_cell_registry_init,
-			NULL /* value_cell */
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "GalA11yECellRegistry", &info, 0);
-	}
-
-	return type;
-}
-
-static void
-init_default_registry (void)
-{
-	if (default_registry == NULL) {
-		default_registry = g_object_new (gal_a11y_e_cell_registry_get_type(), NULL);
-	}
-}
-
-
-AtkObject *
-gal_a11y_e_cell_registry_get_object     (GalA11yECellRegistry     *registry,
-					 ETableItem               *item,
-					 ECellView                *cell_view,
-					 AtkObject                *parent,
-					 int                       model_col,
-					 int                       view_col,
-					 int                       row)
-{
-	GalA11yECellRegistryFunc func = NULL;
-	GType type;
-
-	if (registry == NULL) {
-		init_default_registry ();
-		registry = default_registry;
-	}
-
-	type = GTK_OBJECT_TYPE (cell_view->ecell);
-	while (func == NULL && type != 0) {
-		func = g_hash_table_lookup (registry->priv->table, GINT_TO_POINTER (type));
-		type = g_type_parent (type);
-	}
-
-	if (func)
-		return func (item, cell_view, parent, model_col, view_col, row);
-	else
-		return gal_a11y_e_cell_new (item, cell_view, parent, model_col, view_col, row);
-}
-
-void
-gal_a11y_e_cell_registry_add_cell_type  (GalA11yECellRegistry     *registry,
-					 GType                     type,
-					 GalA11yECellRegistryFunc  func)
-{
-	if (registry == NULL) {
-		init_default_registry ();
-		registry = default_registry;
-	}
-
-	g_hash_table_insert (registry->priv->table, GINT_TO_POINTER (type), func);
-}
diff --git a/a11y/e-table/gal-a11y-e-cell-registry.h b/a11y/e-table/gal-a11y-e-cell-registry.h
deleted file mode 100644
index eecd41139c..0000000000
--- a/a11y/e-table/gal-a11y-e-cell-registry.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2001 Chris Lahey
- */
-
-#ifndef __GAL_A11Y_E_CELL_REGISTRY_H__
-#define __GAL_A11Y_E_CELL_REGISTRY_H__
-
-#include <glib-object.h>
-#include <atk/atkobject.h>
-#include <gal/e-table/e-table-item.h>
-#include <gal/e-table/e-cell.h>
-
-#define GAL_A11Y_TYPE_E_CELL_REGISTRY            (gal_a11y_e_cell_registry_get_type ())
-#define GAL_A11Y_E_CELL_REGISTRY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_CELL_REGISTRY, GalA11yECellRegistry))
-#define GAL_A11Y_E_CELL_REGISTRY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_A11Y_TYPE_E_CELL_REGISTRY, GalA11yECellRegistryClass))
-#define GAL_A11Y_IS_E_CELL_REGISTRY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_A11Y_TYPE_E_CELL_REGISTRY))
-#define GAL_A11Y_IS_E_CELL_REGISTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAL_A11Y_TYPE_E_CELL_REGISTRY))
-
-typedef struct _GalA11yECellRegistry GalA11yECellRegistry;
-typedef struct _GalA11yECellRegistryClass GalA11yECellRegistryClass;
-typedef struct _GalA11yECellRegistryPrivate GalA11yECellRegistryPrivate;
-
-typedef AtkObject *(*GalA11yECellRegistryFunc) (ETableItem *item,
-						ECellView  *cell_view,
-						AtkObject  *parent,
-						int         model_col,
-						int         view_col,
-						int         row);
-
-struct _GalA11yECellRegistry {
-	GObject object;
-
-	GalA11yECellRegistryPrivate *priv;
-};
-
-struct _GalA11yECellRegistryClass {
-	GObjectClass parent_class;
-};
-
-
-/* Standard Glib function */
-GType      gal_a11y_e_cell_registry_get_type       (void);
-AtkObject *gal_a11y_e_cell_registry_get_object     (GalA11yECellRegistry     *registry,
-						    ETableItem               *item,
-						    ECellView                *cell_view,
-						    AtkObject                *parent,
-						    int                       model_col,
-						    int                       view_col,
-						    int                       row);
-void       gal_a11y_e_cell_registry_add_cell_type  (GalA11yECellRegistry     *registry,
-						    GType                     type,
-						    GalA11yECellRegistryFunc  func);
-
-#endif /* ! __GAL_A11Y_E_CELL_REGISTRY_H__ */
diff --git a/a11y/e-table/gal-a11y-e-cell-text.c b/a11y/e-table/gal-a11y-e-cell-text.c
deleted file mode 100644
index e23d1f2feb..0000000000
--- a/a11y/e-table/gal-a11y-e-cell-text.c
+++ /dev/null
@@ -1,567 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2002 Ximian, Inc.
- */
-
-#include <config.h>
-#include "gal-a11y-e-cell-text.h"
-#include "gal-a11y-util.h"
-#include <gal/e-table/e-cell-text.h>
-#include <atk/atkobject.h>
-#include <atk/atktext.h>
-#include <atk/atkeditabletext.h>
-#include <atk/atkaction.h>
-
-#define CS_CLASS(a11y) (G_TYPE_INSTANCE_GET_CLASS ((a11y), C_TYPE_STREAM, GalA11yECellTextClass))
-static AtkObjectClass *parent_class;
-#define PARENT_TYPE (gal_a11y_e_cell_get_type ())
-
-/* Static functions */
-static G_CONST_RETURN gchar*
-ect_get_name (AtkObject * a11y)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (a11y);
-	ECellText *ect = E_CELL_TEXT (gaec->cell_view->ecell);
-	return e_cell_text_get_text (ect, gaec->item->table_model, gaec->model_col, gaec->row);
-}
-
-static gchar *
-ect_get_text (AtkText *text,
-	      gint start_offset,
-	      gint end_offset)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	ECellText *ect = E_CELL_TEXT (gaec->cell_view->ecell);
-	gchar *ret_val;
-	gchar *full_text = e_cell_text_get_text (ect, gaec->item->table_model, gaec->model_col, gaec->row);
-
-	if (end_offset == -1)
-		end_offset = strlen (full_text);
-	else
-		end_offset = g_utf8_offset_to_pointer (full_text, end_offset) - full_text;
-
-	start_offset = g_utf8_offset_to_pointer (full_text, start_offset) - full_text;
-
-	ret_val = g_strndup (full_text + start_offset, end_offset - start_offset);
-
-	e_cell_text_free_text (ect, full_text);
-
-	return ret_val;
-}
-
-static gchar *
-ect_get_text_after_offset (AtkText *text,
-			   gint offset,
-			   AtkTextBoundary boundary_type,
-			   gint *start_offset,
-			   gint *end_offset)
-{
-	/* Unimplemented */
-	return NULL;
-}
-
-static gchar *
-ect_get_text_at_offset (AtkText *text,
-			gint offset,
-			AtkTextBoundary boundary_type,
-			gint *start_offset,
-			gint *end_offset)
-{
-	/* Unimplemented */
-	return NULL;
-}
-
-static gunichar
-ect_get_character_at_offset (AtkText *text,
-			     gint offset)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	ECellText *ect = E_CELL_TEXT (gaec->cell_view->ecell);
-	gunichar ret_val;
-	gchar *at_offset;
-	gchar *full_text = e_cell_text_get_text (ect, gaec->item->table_model, gaec->model_col, gaec->row);
-	at_offset = g_utf8_offset_to_pointer (full_text, offset);
-	ret_val = g_utf8_get_char_validated (at_offset, -1);
-	e_cell_text_free_text (ect, full_text);
-
-	return ret_val;
-}
-
-
-static gchar*
-ect_get_text_before_offset (AtkText *text,
-			    gint offset,
-			    AtkTextBoundary boundary_type,
-			    gint *start_offset,
-			    gint *end_offset)
-{
-	/* Unimplemented */
-	return NULL;
-}
-
-
-static gint
-ect_get_caret_offset (AtkText *text)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	ECellText *ect = E_CELL_TEXT (gaec->cell_view->ecell);
-	gint start, end;
-
-	if (e_cell_text_get_selection (gaec->cell_view,
-				       gaec->view_col, gaec->row,
-				       &start, &end)) {
-		gchar *full_text = e_cell_text_get_text (ect, gaec->item->table_model, gaec->model_col, gaec->row);
-		end = g_utf8_pointer_to_offset (full_text, full_text + end);
-		e_cell_text_free_text (ect, full_text);
-		
-		return end;
-	}
-	else
-		return -1;
-}
-
-static AtkAttributeSet*
-ect_get_run_attributes (AtkText *text,
-			gint offset,
-			gint *start_offset,
-			gint *end_offset)
-{
-	/* Unimplemented */
-	return NULL;
-}
-
-
-static AtkAttributeSet*
-ect_get_default_attributes (AtkText *text)
-{
-	/* Unimplemented */
-	return NULL;
-}
-
-
-static void
-ect_get_character_extents (AtkText *text,
-			   gint offset,
-			   gint *x,
-			   gint *y,
-			   gint *width,
-			   gint *height,
-			   AtkCoordType coords)
-{
-	/* Unimplemented */
-}
-
-
-static gint
-ect_get_character_count (AtkText *text)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	ECellText *ect = E_CELL_TEXT (gaec->cell_view->ecell);
-	gint ret_val;
-
-	gchar *full_text = e_cell_text_get_text (ect, gaec->item->table_model, gaec->model_col, gaec->row);
-
-	ret_val = g_utf8_strlen (full_text, -1);
-	e_cell_text_free_text (ect, full_text);
-	return ret_val;
-}
-
-
-static gint
-ect_get_offset_at_point (AtkText *text,
-			 gint x,
-			 gint y,
-			 AtkCoordType coords)
-{
-	/* Unimplemented */
-	return 0;
-}
-
-
-static gint 
-ect_get_n_selections (AtkText *text)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	gint selection_start, selection_end;
-	if (e_cell_text_get_selection (gaec->cell_view,
-				       gaec->view_col, gaec->row,
-				       &selection_start,
-				       &selection_end)
-	    && selection_start != selection_end)
-		return 1;
-	return 0;
-}
-
-
-static gchar*
-ect_get_selection (AtkText *text,
-		   gint selection_num,
-		   gint *start_offset,
-		   gint *end_offset)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	ECellText *ect = E_CELL_TEXT (gaec->cell_view->ecell);
-	gchar *ret_val;
-	gint selection_start, selection_end;
-
-	if (selection_num == 0
-	    && e_cell_text_get_selection (gaec->cell_view,
-					  gaec->view_col, gaec->row,
-					  &selection_start,
-					  &selection_end)
-	    && selection_start != selection_end) {
-		gint real_start, real_end, len;
-		gchar *full_text = e_cell_text_get_text (ect, gaec->item->table_model, gaec->model_col, gaec->row);
-		len = strlen (full_text);
-		real_start = MIN (selection_start, selection_end);
-		real_end   = MAX (selection_start, selection_end);
-		real_start = MIN (MAX (0, real_start), len);
-		real_end   = MIN (MAX (0, real_end), len);
-
-		ret_val = g_strndup (full_text + real_start, real_end - real_start);
-
-		real_start = g_utf8_pointer_to_offset (full_text, full_text + real_start);
-		real_end   = g_utf8_pointer_to_offset (full_text, full_text + real_end);
-
-		if (start_offset)
-			*start_offset = real_start;
-		if (end_offset)
-			*end_offset = real_end;
-		e_cell_text_free_text (ect, full_text);
-	} else {
-		if (start_offset)
-			*start_offset = 0;
-		if (end_offset)
-			*end_offset = 0;
-		ret_val = NULL;
-	}
-
-	return ret_val;
-}
-
-
-static gboolean
-ect_add_selection (AtkText *text,
-		   gint start_offset,
-		   gint end_offset)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	ECellText *ect = E_CELL_TEXT (gaec->cell_view->ecell);
-
-	if (start_offset != end_offset) {
-		gint real_start, real_end, len;
-		gchar *full_text =
-			e_cell_text_get_text (ect, gaec->item->table_model, gaec->model_col, gaec->row);
-
-		len = g_utf8_strlen (full_text, -1);
-		if (end_offset == -1)
-			end_offset = len;
-
-		real_start = MIN (start_offset, end_offset);
-		real_end   = MAX (start_offset, end_offset);
-		
-		real_start = MIN (MAX (0, real_start), len);
-		real_end   = MIN (MAX (0, real_end), len);
-
-		real_start = g_utf8_offset_to_pointer (full_text, real_start) - full_text;
-		real_end   = g_utf8_offset_to_pointer (full_text, real_end) - full_text;
-		e_cell_text_free_text (ect, full_text);
-
-		if (e_cell_text_set_selection (gaec->cell_view,
-					       gaec->view_col, gaec->row,
-					       real_start, real_end)) {
-			g_signal_emit_by_name (ATK_OBJECT(text), "text_selection_changed");
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-
-static gboolean
-ect_remove_selection (AtkText *text,
-		      gint selection_num)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	ECellText *ect = E_CELL_TEXT (gaec->cell_view->ecell);
-	gint selection_start, selection_end;
-
-	if (selection_num == 0
-	    && e_cell_text_get_selection (gaec->cell_view,
-					  gaec->view_col, gaec->row,
-					  &selection_start,
-					  &selection_end)
-	    && selection_start != selection_end 
-	    && e_cell_text_set_selection (gaec->cell_view,
-					  gaec->view_col, gaec->row,
-					  selection_end, selection_end)) {
-		g_signal_emit_by_name (ATK_OBJECT(text), "text_selection_changed");
-		return TRUE;
-	}
-	else
-		return FALSE;
-}
-
-
-static gboolean
-ect_set_selection (AtkText *text,
-		   gint selection_num,
-		   gint start_offset,
-		   gint end_offset)
-{
-	if (selection_num == 0) {
-		atk_text_add_selection (text, start_offset, end_offset);
-		return TRUE;
-	}
-	else
-		return FALSE;
-}
-
-
-static gboolean
-ect_set_caret_offset (AtkText *text,
-		      gint offset)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	ECellText *ect = E_CELL_TEXT (gaec->cell_view->ecell);
-	gchar *full_text;
-	gint len;
-
-	full_text = e_cell_text_get_text (ect, gaec->item->table_model, gaec->model_col, gaec->row);
-
-	len = g_utf8_strlen (full_text, -1);
-	if (offset == -1)
-		offset = len;
-	else
-		offset = MIN (MAX (0, offset), len);
-	
-	offset = g_utf8_offset_to_pointer (full_text, offset) - full_text;
-
-	e_cell_text_free_text (ect, full_text);
-
-	return e_cell_text_set_selection (gaec->cell_view,
-					  gaec->view_col, gaec->row,
-					  offset, offset);
-}
-
-static gboolean
-ect_set_run_attributes (AtkEditableText *text,
-			AtkAttributeSet *attrib_set,
-			gint start_offset,
-			gint end_offset)
-{
-	/* Unimplemented */
-	return FALSE;
-}
-
-static void
-ect_set_text_contents (AtkEditableText *text,
-		       const gchar *string)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	ECellText *ect = E_CELL_TEXT (gaec->cell_view->ecell);
-
-	e_cell_text_set_value (ect, gaec->item->table_model, gaec->model_col, gaec->row, string);
-	e_table_item_enter_edit (gaec->item, gaec->view_col, gaec->row);
-}
-
-static void
-ect_insert_text (AtkEditableText *text,
-		 const gchar *string,
-		 gint length,
-		 gint *position)
-{
-	/* Utf8 unimplemented */
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	ECellText *ect = E_CELL_TEXT (gaec->cell_view->ecell);
-
-	gchar *full_text = e_cell_text_get_text (ect, gaec->item->table_model, gaec->model_col, gaec->row);
-	gchar *result = g_strdup_printf ("%.*s%.*s%s", *position, full_text, length, string, full_text + *position);
-
-	e_cell_text_set_value (ect, gaec->item->table_model, gaec->model_col, gaec->row, result);
-
-	*position += length;
-
-	g_free (result);
-	e_cell_text_free_text (ect, full_text);
-}
-
-static void
-ect_copy_text (AtkEditableText *text,
-	       gint start_pos,
-	       gint end_pos)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	if (start_pos != end_pos
-	    && atk_text_set_selection (text, 0, start_pos, end_pos))
-		e_cell_text_copy_clipboard (gaec->cell_view,
-					    gaec->view_col, gaec->row);
-}
-
-static void
-ect_delete_text (AtkEditableText *text,
-		 gint start_pos,
-		 gint end_pos)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	if (start_pos != end_pos
-	    && atk_text_set_selection (text, 0, start_pos, end_pos))
-		e_cell_text_delete_selection (gaec->cell_view,
-					      gaec->view_col, gaec->row);
-}
-
-static void
-ect_cut_text (AtkEditableText *text,
-	      gint start_pos,
-	      gint end_pos)
-{
-	ect_copy_text (text, start_pos, end_pos);
-	ect_delete_text (text, start_pos, end_pos);
-}
-
-static void
-ect_paste_text (AtkEditableText *text,
-		gint position)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-
-	e_table_item_enter_edit (gaec->item, gaec->view_col, gaec->row);
-
-	if (atk_text_set_caret_offset (text, position))
-		e_cell_text_paste_clipboard (gaec->cell_view,
-					     gaec->view_col, gaec->row);
-}
-
-static void
-ect_do_action_edit (AtkAction *action)
-{
-	GalA11yECell *a11y = GAL_A11Y_E_CELL (action);
-	e_table_item_enter_edit (a11y->item, a11y->view_col, a11y->row);
-}
-
-static void
-ect_atk_text_iface_init (AtkTextIface *iface)
-{
-	iface->get_text                = ect_get_text;
-	iface->get_text_after_offset   = ect_get_text_after_offset;
-	iface->get_text_at_offset      = ect_get_text_at_offset;
-	iface->get_character_at_offset = ect_get_character_at_offset;
-	iface->get_text_before_offset  = ect_get_text_before_offset;
-	iface->get_caret_offset        = ect_get_caret_offset;
-	iface->get_run_attributes      = ect_get_run_attributes;
-	iface->get_default_attributes  = ect_get_default_attributes;
-	iface->get_character_extents   = ect_get_character_extents;
-	iface->get_character_count     = ect_get_character_count;
-	iface->get_offset_at_point     = ect_get_offset_at_point;
-	iface->get_n_selections        = ect_get_n_selections;
-	iface->get_selection           = ect_get_selection;
-	iface->add_selection           = ect_add_selection;
-	iface->remove_selection        = ect_remove_selection;
-	iface->set_selection           = ect_set_selection;
-	iface->set_caret_offset        = ect_set_caret_offset;
-}
-
-static void
-ect_atk_editable_text_iface_init (AtkEditableTextIface *iface)
-{
-	iface->set_run_attributes = ect_set_run_attributes;
-	iface->set_text_contents  = ect_set_text_contents;
-	iface->insert_text        = ect_insert_text;
-	iface->copy_text          = ect_copy_text;
-	iface->cut_text           = ect_cut_text;
-	iface->delete_text        = ect_delete_text;
-	iface->paste_text         = ect_paste_text;
-}
-
-static void
-ect_class_init (GalA11yECellTextClass *klass)
-{
-	AtkObjectClass *a11y      = ATK_OBJECT_CLASS (klass);   
-	parent_class              = g_type_class_ref (PARENT_TYPE);
-	a11y->get_name            = ect_get_name;
-}
-
-static void
-ect_init (GalA11yECellText *a11y)
-{
-	gal_a11y_e_cell_add_action (a11y,
-				    "edit",
-				    "begin editing this cell",
-				    NULL,
-				    (ACTION_FUNC)ect_do_action_edit);
-}
-
-/**
- * gal_a11y_e_cell_text_get_type:
- * @void: 
- * 
- * Registers the &GalA11yECellText class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &GalA11yECellText class.
- **/
-GType
-gal_a11y_e_cell_text_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		GTypeInfo info = {
-			sizeof (GalA11yECellTextClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) ect_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL, /* class_data */
-			sizeof (GalA11yECellText),
-			0,
-			(GInstanceInitFunc) ect_init,
-			NULL /* value_cell_text */
-		};
-
-		static const GInterfaceInfo atk_text_info = {
-			(GInterfaceInitFunc) ect_atk_text_iface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		static const GInterfaceInfo atk_editable_text_info = {
-			(GInterfaceInitFunc) ect_atk_editable_text_iface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "GalA11yECellText", &info, 0);
-		g_type_add_interface_static (type, ATK_TYPE_TEXT, &atk_text_info);
-		g_type_add_interface_static (type, ATK_TYPE_EDITABLE_TEXT, &atk_editable_text_info);
-		gal_a11y_e_cell_type_add_action_interface (type);
-	}
-
-	return type;
-}
-
-AtkObject *
-gal_a11y_e_cell_text_new (ETableItem *item,
-			  ECellView  *cell_view,
-			  AtkObject  *parent,
-			  int         model_col,
-			  int         view_col,
-			  int         row)
-{
-	AtkObject *a11y;
-
-	a11y = g_object_new (gal_a11y_e_cell_text_get_type (), NULL);
-
-	gal_a11y_e_cell_construct (a11y,
-				   item,
-				   cell_view,
-				   parent,
-				   model_col,
-				   view_col,
-				   row);
-	return a11y;
-}
diff --git a/a11y/e-table/gal-a11y-e-cell-text.h b/a11y/e-table/gal-a11y-e-cell-text.h
deleted file mode 100644
index 3d9a4447be..0000000000
--- a/a11y/e-table/gal-a11y-e-cell-text.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2001 Chris Lahey
- */
-
-#ifndef __GAL_A11Y_E_CELL_TEXT_H__
-#define __GAL_A11Y_E_CELL_TEXT_H__
-
-#include <glib-object.h>
-#include <gal/e-table/e-table-item.h>
-#include <gal/e-table/e-cell-text.h>
-#include <a11y/e-table/gal-a11y-e-cell.h>
-
-#define GAL_A11Y_TYPE_E_CELL_TEXT            (gal_a11y_e_cell_text_get_type ())
-#define GAL_A11Y_E_CELL_TEXT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_CELL_TEXT, GalA11yECellText))
-#define GAL_A11Y_E_CELL_TEXT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_A11Y_TYPE_E_CELL_TEXT, GalA11yECellTextClass))
-#define GAL_A11Y_IS_E_CELL_TEXT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_A11Y_TYPE_E_CELL_TEXT))
-#define GAL_A11Y_IS_E_CELL_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAL_A11Y_TYPE_E_CELL_TEXT))
-
-typedef struct _GalA11yECellText GalA11yECellText;
-typedef struct _GalA11yECellTextClass GalA11yECellTextClass;
-typedef struct _GalA11yECellTextPrivate GalA11yECellTextPrivate;
-
-/* This struct should actually be larger as this isn't what we derive from.
- * The GalA11yECellTextPrivate comes right after the parent class structure.
- **/
-struct _GalA11yECellText {
-	GalA11yECell object;
-};
-
-struct _GalA11yECellTextClass {
-	GalA11yECellClass parent_class;
-};
-
-
-/* Standard Glib function */
-GType      gal_a11y_e_cell_text_get_type   (void);
-AtkObject *gal_a11y_e_cell_text_new        (ETableItem *item,
-					    ECellView  *cell_view,
-					    AtkObject  *parent,
-					    int         model_col,
-					    int         view_col,
-					    int         row);
-
-#endif /* ! __GAL_A11Y_E_CELL_TEXT_H__ */
diff --git a/a11y/e-table/gal-a11y-e-cell-toggle.c b/a11y/e-table/gal-a11y-e-cell-toggle.c
deleted file mode 100644
index f3b5bf2879..0000000000
--- a/a11y/e-table/gal-a11y-e-cell-toggle.c
+++ /dev/null
@@ -1,163 +0,0 @@
-#include <gtk/gtk.h>
-#include "gal-a11y-e-cell-toggle.h"
-#include <gal/e-table/e-cell-toggle.h>
-#include <gal/e-table/e-table-model.h>
-
-#define PARENT_TYPE  (gal_a11y_e_cell_get_type ())
-static GObjectClass *parent_class;
-
-static void gal_a11y_e_cell_toggle_class_init (GalA11yECellToggleClass *klass);
-
-static void
-gal_a11y_e_cell_toggle_dispose (GObject *object)
-{
-	GalA11yECellToggle *a11y = GAL_A11Y_E_CELL_TOGGLE (object);
-
-	ETableModel *e_table_model = GAL_A11Y_E_CELL (a11y)->item->table_model;
-
-	if (e_table_model)
-		g_signal_handler_disconnect (e_table_model, a11y->model_id);
-
-	if (parent_class->dispose)
-		parent_class->dispose (object);
-}
-
-GType
-gal_a11y_e_cell_toggle_get_type (void)
-{
-  static GType type = 0;
-
-  if (!type)
-    {
-      static const GTypeInfo tinfo =
-      {
-        sizeof (GalA11yECellToggleClass),
-        (GBaseInitFunc) NULL, /* base init */
-        (GBaseFinalizeFunc) NULL, /* base finalize */
-        (GClassInitFunc) gal_a11y_e_cell_toggle_class_init, /* class init */
-        (GClassFinalizeFunc) NULL, /* class finalize */
-        NULL, /* class data */
-        sizeof (GalA11yECellToggle), /* instance size */
-        0, /* nb preallocs */
-        NULL, /* instance init */
-        NULL /* value table */
-      };
-                                                                                
-
-      type = g_type_register_static (GAL_A11Y_TYPE_E_CELL,
-                                     "GalA11yECellToggle", &tinfo, 0);
-      gal_a11y_e_cell_type_add_action_interface (type);
-	
-    }
-  return type;
-}
-
-
-static void 
-gal_a11y_e_cell_toggle_class_init (GalA11yECellToggleClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	object_class->dispose      = gal_a11y_e_cell_toggle_dispose;
-	parent_class               = g_type_class_ref (PARENT_TYPE);
-}
-
-static void
-toggle_cell_action (GalA11yECell *cell)
-{
-	ECellToggle * ect;
-	gint finished;
-	GdkEventButton event;
-	gint x, y, width, height;
-	gint row, col;
-
-	row = cell->row;
-	col = cell->view_col;
-
-	e_table_item_get_cell_geometry (cell->item, &row, &col,
-					&x, &y, &width, &height);
-
-	event.x = x + width / 2 + (int)(GNOME_CANVAS_ITEM (cell->item)->x1);
-	event.y = y + height / 2 + (int)(GNOME_CANVAS_ITEM (cell->item)->y1);
-
-	event.type = GDK_BUTTON_PRESS;
-	event.window = GTK_LAYOUT(GNOME_CANVAS_ITEM(cell->item)->canvas)->bin_window;
-        event.button = 1;
-        event.send_event = TRUE;
-        event.time = GDK_CURRENT_TIME;
-        event.axes = NULL;
-
-	g_signal_emit_by_name (cell->item, "event", &event, &finished);
-}
-
-static void
-model_change_cb (ETableModel *etm,
-		 gint row,
-		 gint col,
-		 GalA11yECell *cell)
-{
-	gint value;
-
-	if (col == cell->model_col && row == cell->row) {
-
-	        value = GPOINTER_TO_INT (
-			e_table_model_value_at (cell->cell_view->e_table_model,
-						cell->model_col, cell->row));
-		if (value)
-			gal_a11y_e_cell_add_state (cell, ATK_STATE_CHECKED, TRUE);
-		else
-			gal_a11y_e_cell_remove_state (cell, ATK_STATE_CHECKED, TRUE);
-	}
-}
-
-
-AtkObject* 
-gal_a11y_e_cell_toggle_new (ETableItem *item,
-			    ECellView  *cell_view,
-			    AtkObject  *parent,
-			    int         model_col,
-			    int         view_col,
-			    int         row)
-{
-	AtkObject *a11y;
-	GalA11yECell *cell;
-	GalA11yECellToggle *toggle_cell;
-	gint value;
-
-	a11y = ATK_OBJECT(g_object_new (GAL_A11Y_TYPE_E_CELL_TOGGLE, NULL));
-
-	g_return_val_if_fail (a11y != NULL, NULL);
-
-	cell = GAL_A11Y_E_CELL(a11y);
-	toggle_cell = GAL_A11Y_E_CELL_TOGGLE(a11y);
-	a11y->role  = ATK_ROLE_TABLE_CELL;
-
-        gal_a11y_e_cell_construct (a11y,
-                                   item,
-                                   cell_view,
-                                   parent,
-                                   model_col,
-                                   view_col,
-                                   row);
-
-	gal_a11y_e_cell_add_action (cell, 
-				    "toggle",	       /* action name*/
-				    "toggle the cell", /* action description */
-				    NULL,              /* action keybinding */
-				    toggle_cell_action);
-
-	toggle_cell->model_id = g_signal_connect (item->table_model,
-						  "model_cell_changed",
-						  (GCallback) model_change_cb,
-						  a11y);
-
-	value = GPOINTER_TO_INT (
-			e_table_model_value_at (cell->cell_view->e_table_model,
-                                                cell->model_col, cell->row));
-	if (value)
-		gal_a11y_e_cell_add_state (cell, ATK_STATE_CHECKED, FALSE);
-	else
-		gal_a11y_e_cell_remove_state (cell, ATK_STATE_CHECKED, FALSE);
-
-	return a11y;
-}
diff --git a/a11y/e-table/gal-a11y-e-cell-toggle.h b/a11y/e-table/gal-a11y-e-cell-toggle.h
deleted file mode 100644
index 06f9448e02..0000000000
--- a/a11y/e-table/gal-a11y-e-cell-toggle.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef __GAL_A11Y_E_CELL_TOGGLE_H__
-#define __GAL_A11Y_E_CELL_TOGGLE_H__
-
-#include <atk/atk.h>
-#include "gal-a11y-e-cell.h"
-#include "gal-a11y-e-cell-toggle.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define GAL_A11Y_TYPE_E_CELL_TOGGLE            (gal_a11y_e_cell_toggle_get_type ())
-#define GAL_A11Y_E_CELL_TOGGLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_CELL_TOGGLE, GalA11yECellToggle))
-#define GAL_A11Y_E_CELL_TOGGLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_A11Y_E_CELL_TOGGLE, GalA11yECellToggleClass))
-#define GAL_A11Y_IS_E_CELL_TOGGLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_A11Y_TYPE_E_CELL_TOGGLE))
-#define GAL_A11Y_IS_E_CELL_TOGGLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAL_A11Y_TYPE_E_CELL_TOGGLE))
-#define GAL_A11Y_E_CELL_TOGGLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GAL_A11Y_TYPE_E_CELL_TOGGLE, GalA11yECellToggleClass))
-
-typedef struct _GalA11yECellToggle                  GalA11yECellToggle;
-typedef struct _GalA11yECellToggleClass             GalA11yECellToggleClass;
-
-struct _GalA11yECellToggle
-{
-  GalA11yECell parent;
-  gint         model_id;
-};
-
-GType gal_a11y_e_cell_toggle_get_type (void);
-
-struct _GalA11yECellToggleClass
-{
-  GalA11yECellClass parent_class;
-};
-
-AtkObject *gal_a11y_e_cell_toggle_new  (ETableItem *item,
-                                        ECellView  *cell_view,
-                                        AtkObject  *parent,
-                                        int         model_col,
-                                        int         view_col,
-                                        int         row);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __GAL_A11Y_E_CELL_TOGGLE_H__ */
diff --git a/a11y/e-table/gal-a11y-e-cell-tree.c b/a11y/e-table/gal-a11y-e-cell-tree.c
deleted file mode 100644
index e6ff75667b..0000000000
--- a/a11y/e-table/gal-a11y-e-cell-tree.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Tim Wo <tim.wo@sun.com>, Sun Microsystem Inc. 2003.
- *
- * Copyright (C) 2002 Ximian, Inc.
- */
-
-#include <config.h>
-#include <atk/atk.h>
-#include "gal-a11y-e-cell-tree.h"
-#include "gal-a11y-util.h"
-#include "gal/e-table/e-cell-tree.h"
-#include "gal/e-table/e-table.h"
-#include "gal/e-table/e-tree-table-adapter.h"
-
-#define CS_CLASS(a11y) (G_TYPE_INSTANCE_GET_CLASS ((a11y), C_TYPE_STREAM, GalA11yECellTreeClass))
-static AtkObjectClass *a11y_parent_class;
-#define A11Y_PARENT_TYPE (gal_a11y_e_cell_get_type ())
-
-static void
-ectr_model_row_changed_cb (ETableModel *etm,
-			   gint row,
-			   GalA11yECell *a11y)
-{
-	ETreePath node;
-	ETreeModel *tree_model;
-	ETreeTableAdapter *tree_table_adapter;
-
-	g_return_if_fail (a11y);
-	if (a11y->row != row)
-		return;
-
-	node = e_table_model_value_at (etm, -1, a11y->row);
-	tree_model = e_table_model_value_at (etm, -2, a11y->row);
-	tree_table_adapter = e_table_model_value_at (etm, -3, a11y->row);
-
-	if (e_tree_model_node_is_expandable (tree_model, node)) {
-		gboolean is_exp = e_tree_table_adapter_node_is_expanded (tree_table_adapter, node);
-		if (is_exp)
-			gal_a11y_e_cell_add_state (a11y, ATK_STATE_EXPANDED, TRUE);
-		else
-			gal_a11y_e_cell_remove_state (a11y, ATK_STATE_EXPANDED, TRUE);
-	}
-}
-
-static void
-ectr_subcell_weak_ref (GalA11yECellTree *a11y,
-		       GalA11yECell     *subcell_a11y)
-{
-	g_signal_handler_disconnect (GAL_A11Y_E_CELL (a11y)->item->table_model,
-				     a11y->model_row_changed_id);
-	g_object_unref (a11y);
-}
-
-static void
-ectr_do_action_expand (AtkAction *action)
-{
-	GalA11yECell *a11y;
-	ETableModel *table_model;
-        ETreePath node;
-	ETreeModel *tree_model;
-        ETreeTableAdapter *tree_table_adapter;
-        
-        a11y = GAL_A11Y_E_CELL (action);
-	table_model = a11y->item->table_model;
-	node = e_table_model_value_at (table_model, -1, a11y->row);
-	tree_model = e_table_model_value_at (table_model, -2, a11y->row);
-	tree_table_adapter = e_table_model_value_at (table_model, -3, a11y->row);
-
-	if (e_tree_model_node_is_expandable (tree_model, node)) {
-		e_tree_table_adapter_node_set_expanded (tree_table_adapter,
-							node,
-							TRUE);
-		gal_a11y_e_cell_add_state (a11y, ATK_STATE_EXPANDED, TRUE);
-	}
-}
-
-static void
-ectr_do_action_collapse (AtkAction *action)
-{
-	GalA11yECell *a11y;
-	ETableModel *table_model;
-        ETreePath node;
-	ETreeModel *tree_model;
-        ETreeTableAdapter *tree_table_adapter;
-        
-        a11y = GAL_A11Y_E_CELL (action);
-	table_model = a11y->item->table_model;
-        node = e_table_model_value_at (table_model, -1, a11y->row);
-	tree_model = e_table_model_value_at (table_model, -2, a11y->row);
-        tree_table_adapter = e_table_model_value_at (table_model, -3, a11y->row);
-
-	if (e_tree_model_node_is_expandable (tree_model, node)) {
-		e_tree_table_adapter_node_set_expanded (tree_table_adapter,
-							node,
-							FALSE);
-		gal_a11y_e_cell_remove_state (a11y, ATK_STATE_EXPANDED, TRUE);
-	}
-}
-
-static void
-ectr_class_init (GalA11yECellTreeClass *klass)
-{
-	a11y_parent_class        = g_type_class_ref (A11Y_PARENT_TYPE);
-}
-
-static void
-ectr_init (GalA11yECellTree *a11y)
-{
-}
-
-GType
-gal_a11y_e_cell_tree_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		GTypeInfo info = {
-			sizeof (GalA11yECellTreeClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) ectr_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL, /* class_data */
-			sizeof (GalA11yECellTree),
-			0,
-			(GInstanceInitFunc) ectr_init,
-			NULL /* value_cell_text */
-		};
-
-		type = g_type_register_static (A11Y_PARENT_TYPE, "GalA11yECellTree", &info, 0);
-		gal_a11y_e_cell_type_add_action_interface (type);
-	}
-
-	return type;
-}
-
-AtkObject *
-gal_a11y_e_cell_tree_new (ETableItem *item,
-			  ECellView  *cell_view,
-			  AtkObject  *parent,
-			  int         model_col,
-			  int         view_col,
-			  int         row)
-{
-	AtkObject *subcell_a11y;
-	GalA11yECellTree *a11y;
-        GtkWidget *e_table;
-
-        ETreePath node;
-        ETreeModel *tree_model;
-        ETreeTableAdapter *tree_table_adapter;
- 
-	ECellView *subcell_view;
-	subcell_view = e_cell_tree_view_get_subcell_view (cell_view);
-
-	if (subcell_view->ecell) {
-		subcell_a11y = gal_a11y_e_cell_registry_get_object (NULL,
-								    item,
-								    subcell_view,
-								    parent,
-								    model_col,
-								    view_col,
-								    row);
-		gal_a11y_e_cell_add_action (subcell_a11y,
-					    "expand",
-					    "expands the row in the ETree containing this cell",
-					    NULL,
-					    (ACTION_FUNC)ectr_do_action_expand);
-
-		gal_a11y_e_cell_add_action (subcell_a11y,
-					    "collapse",
-					    "collapses the row in the ETree containing this cell",
-					    NULL,
-					    (ACTION_FUNC)ectr_do_action_collapse);
-
-		/* init AtkStates for the cell's a11y object */
-		node = e_table_model_value_at (item->table_model, -1, row);
-		tree_model = e_table_model_value_at (item->table_model, -2, row);
-		tree_table_adapter = e_table_model_value_at (item->table_model, -3, row);
-		if (e_tree_model_node_is_expandable (tree_model, node)) {
-			gal_a11y_e_cell_add_state (subcell_a11y, ATK_STATE_EXPANDABLE, FALSE);
-			if (e_tree_table_adapter_node_is_expanded (tree_table_adapter, node))
-				gal_a11y_e_cell_add_state (subcell_a11y, ATK_STATE_EXPANDED, FALSE);
-		}
-	}
-	else
-		subcell_a11y = NULL;
-
-	/* create a companion a11y object, this object has type GalA11yECellTree
-	   and it connects to some signals to determine whether a tree cell is
-	   expanded or collapsed */
-	a11y = g_object_new (gal_a11y_e_cell_tree_get_type (), NULL);
-	gal_a11y_e_cell_construct (a11y,
-				   item,
-				   cell_view,
-				   parent,
-				   model_col,
-				   view_col,
-				   row);
-	a11y->model_row_changed_id =
-		g_signal_connect (item->table_model, "model_row_changed",
-				  G_CALLBACK (ectr_model_row_changed_cb),
-				  subcell_a11y);
-	g_object_weak_ref (subcell_a11y, ectr_subcell_weak_ref, a11y);
-
-	return subcell_a11y;
-}
diff --git a/a11y/e-table/gal-a11y-e-cell-tree.h b/a11y/e-table/gal-a11y-e-cell-tree.h
deleted file mode 100644
index 355670b5a4..0000000000
--- a/a11y/e-table/gal-a11y-e-cell-tree.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Tim Wo <tim.wo@sun.com>, Sun Microsystem Inc. 2003.
- *
- * Copyright (C) 2002 Ximian, Inc.
- */
-
-#ifndef __GAL_A11Y_E_CELL_TREE_H__
-#define __GAL_A11Y_E_CELL_TREE_H__
-
-#include <glib-object.h>
-#include <gal/e-table/e-table-item.h>
-#include <gal/e-table/e-cell-tree.h>
-#include "gal-a11y-e-cell.h"
-
-#define GAL_A11Y_TYPE_E_CELL_TREE            (gal_a11y_e_cell_tree_get_type ())
-#define GAL_A11Y_E_CELL_TREE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_CELL_TREE, GalA11yECellTree))
-#define GAL_A11Y_E_CELL_TREE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_A11Y_TYPE_E_CELL_TREE, GalA11yECellTreeClass))
-#define GAL_A11Y_IS_E_CELL_TREE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_A11Y_TYPE_E_CELL_TREE))
-#define GAL_A11Y_IS_E_CELL_TREE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAL_A11Y_TYPE_E_CELL_TREE))
-
-typedef struct _GalA11yECellTree GalA11yECellTree;
-typedef struct _GalA11yECellTreeClass GalA11yECellTreeClass;
-typedef struct _GalA11yECellTreePrivate GalA11yECellTreePrivate;
-
-/* This struct should actually be larger as this isn't what we derive from.
- * The GalA11yECellTreePrivate comes right after the parent class structure.
- **/
-struct _GalA11yECellTree {
-	GalA11yECell object;
-
-	int model_row_changed_id;
-};
-
-struct _GalA11yECellTreeClass {
-	GalA11yECellClass parent_class;
-};
-
-
-/* Standard Glib function */
-GType      gal_a11y_e_cell_tree_get_type   (void);
-AtkObject *gal_a11y_e_cell_tree_new	   (ETableItem *item,
-					    ECellView  *cell_view,
-					    AtkObject  *parent,
-					    int         model_col,
-					    int         view_col,
-					    int         row);
-
-#endif /* ! __GAL_A11Y_E_CELL_TREE_H__ */
diff --git a/a11y/e-table/gal-a11y-e-cell.c b/a11y/e-table/gal-a11y-e-cell.c
deleted file mode 100644
index 34a7429cd5..0000000000
--- a/a11y/e-table/gal-a11y-e-cell.c
+++ /dev/null
@@ -1,551 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2002 Ximian, Inc.
- */
-
-#include <config.h>
-#include "gal/e-table/e-table.h"
-#include "gal-a11y-e-cell.h"
-#include "gal-a11y-util.h"
-#include <atk/atkobject.h>
-#include <atk/atkcomponent.h>
-#include <atk/atkaction.h>
-
-#define CS_CLASS(a11y) (G_TYPE_INSTANCE_GET_CLASS ((a11y), C_TYPE_STREAM, GalA11yECellClass))
-static GObjectClass *parent_class;
-#define PARENT_TYPE (atk_object_get_type ())
-
-
-#if 0
-static void
-unref_item (gpointer user_data, GObject *obj_loc)
-{
-	GalA11yECell *a11y = GAL_A11Y_E_CELL (user_data);
-	a11y->item = NULL;
-	g_object_unref (a11y);
-}
-
-static void
-unref_cell (gpointer user_data, GObject *obj_loc)
-{
-	GalA11yECell *a11y = GAL_A11Y_E_CELL (user_data);
-	a11y->cell_view = NULL;
-	g_object_unref (a11y);
-}
-#endif 
-
-static void
-eti_dispose (GObject *object)
-{
-	GalA11yECell *a11y = GAL_A11Y_E_CELL (object);
-
-#if 0
-	if (a11y->item)
-		g_object_unref (G_OBJECT (a11y->item));  /*, unref_item, a11y); */
-	if (a11y->cell_view)
-		g_object_unref (G_OBJECT (a11y->cell_view)); /*, unref_cell, a11y); */
-	if (a11y->parent)
-		g_object_unref (a11y->parent);
-#endif
-
-	if (a11y->state_set)
-		g_object_unref (a11y->state_set);
-
-	if (parent_class->dispose)
-		parent_class->dispose (object);
-}
-
-/* Static functions */
-static AtkStateSet *
-eti_ref_state_set (AtkObject *accessible)
-{
-	GalA11yECell *cell = GAL_A11Y_E_CELL (accessible);
-	g_return_val_if_fail (cell->state_set, NULL);
-
-	g_object_ref(cell->state_set);
-	return cell->state_set;
-}
-
-static AtkObject*
-eti_get_parent (AtkObject *accessible)
-{
-	GalA11yECell *a11y = GAL_A11Y_E_CELL (accessible);
-	return a11y->parent;
-}
-
-static gint
-eti_get_index_in_parent (AtkObject *accessible)
-{
-	GalA11yECell *a11y = GAL_A11Y_E_CELL (accessible);
-
-	return a11y->row * a11y->item->cols + a11y->view_col;
-}
-
-
-/* Component IFace */
-static void
-eti_get_extents (AtkComponent *component,
-		gint *x,
-		gint *y,
-		gint *width,
-		gint *height,
-		AtkCoordType coord_type)
-{
-	GalA11yECell *a11y = GAL_A11Y_E_CELL (component);
-	int row;
-	int col;
-	int xval;
-	int yval;
-
-	row = a11y->row;
-	col = a11y->view_col;
-
-
-	e_table_item_get_cell_geometry (a11y->item,
-					&row, 
-					&col,
-					&xval,
-					&yval,
-					width,
-					height);
-
-	atk_component_get_position (ATK_COMPONENT (a11y->parent),
-				    x, y, coord_type);
-	if (x && *x != G_MININT)
-		*x += xval;
-	if (y && *y != G_MININT)
-		*y += yval;
-}
-
-static gboolean
-eti_grab_focus (AtkComponent *component)
-{
-	GalA11yECell *a11y;
-	gint view_row;
-	GtkWidget *e_table, *toplevel;
-
-	a11y = GAL_A11Y_E_CELL (component);
-	e_table = gtk_widget_get_parent (GNOME_CANVAS_ITEM (a11y->item)->canvas);
-	view_row = e_table_view_to_model_row (E_TABLE (e_table), a11y->row);
-
-	e_selection_model_select_single_row (a11y->item->selection, view_row);
-	e_selection_model_change_cursor (a11y->item->selection, view_row, a11y->view_col);
-
-	gtk_widget_grab_focus (e_table);
-	toplevel = gtk_widget_get_toplevel (e_table);
-	if (GTK_WIDGET_TOPLEVEL (toplevel))
-		gtk_window_present (toplevel);
-}
-
-/* Table IFace */
-
-static void
-eti_atk_component_iface_init (AtkComponentIface *iface)
-{
-	iface->get_extents = eti_get_extents;
-	iface->grab_focus  = eti_grab_focus;
-}
-
-static void
-eti_class_init (GalA11yECellClass *klass)
-{
-	AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass);
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	parent_class                          = g_type_class_ref (PARENT_TYPE);
-
-	object_class->dispose                 = eti_dispose;
-
-	atk_object_class->get_parent          = eti_get_parent;
-	atk_object_class->get_index_in_parent = eti_get_index_in_parent;
-	atk_object_class->ref_state_set       = eti_ref_state_set;
-}
-
-static void
-eti_init (GalA11yECell *a11y)
-{
-	a11y->item = NULL;
-	a11y->cell_view = NULL;
-	a11y->parent = NULL;
-	a11y->model_col = -1;
-	a11y->view_col = -1;
-	a11y->row = -1;
-
-	a11y->state_set = atk_state_set_new ();
-	atk_state_set_add_state (a11y->state_set, ATK_STATE_TRANSIENT);
-	atk_state_set_add_state (a11y->state_set, ATK_STATE_ENABLED);
-}
-
-
-static ActionInfo *
-_gal_a11y_e_cell_get_action_info (GalA11yECell *cell,
-                            gint     index)
-{
-	GList *list_node;
-                                                                                
-	g_return_val_if_fail (GAL_A11Y_IS_E_CELL (cell), NULL);
-	if (cell->action_list == NULL)
-		return NULL;
-	list_node = g_list_nth (cell->action_list, index);
-	if (!list_node)
-		return NULL;
-	return (ActionInfo *) (list_node->data);
-}
-
-static void
-_gal_a11y_e_cell_destroy_action_info (gpointer action_info,
-				      gpointer user_data)
-{
-	ActionInfo *info = (ActionInfo *)action_info;
-
-	g_return_if_fail (info != NULL);
-	g_free (info->name);
-	g_free (info->description);
-	g_free (info->keybinding);
-	g_free (info);
-}
-
-
-gboolean
-gal_a11y_e_cell_add_action ( GalA11yECell * cell,
-			     const gchar *action_name,
-			     const gchar *action_description,
-			     const gchar *action_keybinding,
-			     ACTION_FUNC action_func)
-{
-	ActionInfo *info;
-	g_return_val_if_fail (GAL_A11Y_IS_E_CELL (cell), FALSE);
-	info = g_new (ActionInfo, 1);
-                                                                              
-	if (action_name != NULL)
-		info->name = g_strdup (action_name);
-	else
-		info->name = NULL;
-
-	if (action_description != NULL)
-		info->description = g_strdup (action_description);
-	else
-		info->description = NULL;
-	if (action_keybinding != NULL)
-		info->keybinding = g_strdup (action_keybinding);
-	else
-		info->keybinding = NULL;
-	info->do_action_func = action_func;
-
-	cell->action_list = g_list_append (cell->action_list, (gpointer) info);
-	return TRUE;
-}
-
-gboolean
-gal_a11y_e_cell_remove_action (GalA11yECell *cell,
-			       gint     action_index)
-{
-	GList *list_node;
-
-	g_return_val_if_fail (GAL_A11Y_IS_E_CELL (cell), FALSE);
-	list_node = g_list_nth (cell->action_list, action_index);
-	if (!list_node)
-		return FALSE;
-	g_return_val_if_fail (list_node->data != NULL, FALSE);
-	_gal_a11y_e_cell_destroy_action_info (list_node->data, NULL);
-	cell->action_list = g_list_remove_link (cell->action_list, list_node);
-
-	return TRUE;
-}
-
-gboolean
-gal_a11y_e_cell_remove_action_by_name (GalA11yECell *cell,
-				       const gchar *action_name)
-{
-	GList *list_node;
-	gboolean action_found= FALSE;
-                                                                               
-	g_return_val_if_fail (GAL_A11Y_IS_E_CELL (cell), FALSE);
-	for (list_node = cell->action_list; list_node && !action_found;
-          	          list_node = list_node->next) {
-		if (!g_strcasecmp (((ActionInfo *)(list_node->data))->name, action_name)) {
-			action_found = TRUE;
-			break;
-		}
-	}
-
-	g_return_val_if_fail (action_found, FALSE);
-	_gal_a11y_e_cell_destroy_action_info (list_node->data, NULL);
-	cell->action_list = g_list_remove_link (cell->action_list, list_node);
-
-	return TRUE;
-}
-
-static gint
-gal_a11y_e_cell_action_get_n_actions (AtkAction *action)
-{
-	GalA11yECell *cell = GAL_A11Y_E_CELL(action);
-	if (cell->action_list != NULL)
-		return g_list_length (cell->action_list);
-	else
-		return 0;
-}
-
-static G_CONST_RETURN gchar *
-gal_a11y_e_cell_action_get_name (AtkAction *action,
-                           gint      index)
-{
-	GalA11yECell *cell = GAL_A11Y_E_CELL(action);
-	ActionInfo *info = _gal_a11y_e_cell_get_action_info (cell, index);
-                                                                                
-	if (info == NULL)
-		return NULL;
-	return info->name;
-}
-
-static G_CONST_RETURN gchar *
-gal_a11y_e_cell_action_get_description (AtkAction *action,
-					gint      index)
-{
-	GalA11yECell *cell = GAL_A11Y_E_CELL(action);
-	ActionInfo *info = _gal_a11y_e_cell_get_action_info (cell, index);
-
-	if (info == NULL)
-		return NULL;
-	return info->description;
-}
-
-static gboolean
-gal_a11y_e_cell_action_set_description (AtkAction   *action,
-					gint        index,
-					const gchar *desc)
-{
-	GalA11yECell *cell = GAL_A11Y_E_CELL(action);
-	ActionInfo *info = _gal_a11y_e_cell_get_action_info (cell, index);
-                                                                                
-	if (info == NULL)
-		return FALSE;
-	g_free (info->description);
-	info->description = g_strdup (desc);
-	return TRUE;
-}
-
-static G_CONST_RETURN gchar *
-gal_a11y_e_cell_action_get_keybinding (AtkAction *action,
-				       gint      index)
-{
-	GalA11yECell *cell = GAL_A11Y_E_CELL(action);
-	ActionInfo *info = _gal_a11y_e_cell_get_action_info (cell, index);
-	if (info == NULL)
-		return NULL;
-
-	return info->keybinding;
-}
-                                                                                
-static gboolean
-idle_do_action (gpointer data)
-{
-	GalA11yECell *cell;
-
-	cell = GAL_A11Y_E_CELL (data);
-	cell->action_idle_handler = 0;
-	cell->action_func (cell);
-                                                                                
-	return FALSE;
-}
-
-static gboolean
-gal_a11y_e_cell_action_do_action (AtkAction *action,
-				  gint      index)
-{
-	GalA11yECell *cell = GAL_A11Y_E_CELL(action);
-	ActionInfo *info = _gal_a11y_e_cell_get_action_info (cell, index);
-
-	if (info == NULL)
-		return FALSE;
-	g_return_val_if_fail (info->do_action_func, FALSE);
-	if (cell->action_idle_handler)
-		return FALSE;
-	cell->action_func = info->do_action_func;
-	cell->action_idle_handler = g_idle_add (idle_do_action, cell);
-
-	return TRUE;
-}
-
-static void
-gal_a11y_e_cell_atk_action_interface_init (AtkActionIface *iface)
-{
-  g_return_if_fail (iface != NULL);
-                                                                                
-  iface->get_n_actions = gal_a11y_e_cell_action_get_n_actions;
-  iface->do_action = gal_a11y_e_cell_action_do_action;
-  iface->get_name = gal_a11y_e_cell_action_get_name;
-  iface->get_description = gal_a11y_e_cell_action_get_description;
-  iface->set_description = gal_a11y_e_cell_action_set_description;
-  iface->get_keybinding = gal_a11y_e_cell_action_get_keybinding;
-}
-
-void
-gal_a11y_e_cell_type_add_action_interface (GType type)
-{
-	static const GInterfaceInfo atk_action_info =
-	{
-	(GInterfaceInitFunc) gal_a11y_e_cell_atk_action_interface_init,
-	(GInterfaceFinalizeFunc) NULL,
-	NULL
-	};
-
-	g_type_add_interface_static (type, ATK_TYPE_ACTION,
-				     &atk_action_info);
-}
-
-gboolean
-gal_a11y_e_cell_add_state (GalA11yECell     *cell,
-			   AtkStateType state_type,
-			   gboolean     emit_signal)
-{
-	if (!atk_state_set_contains_state (cell->state_set, state_type)) {
-		gboolean rc;
-                                                                                
-		rc = atk_state_set_add_state (cell->state_set, state_type);
-		/*
-		 * The signal should only be generated if the value changed,
-		 * not when the cell is set up.  So states that are set
-		 * initially should pass FALSE as the emit_signal argument.
-		 */
-                                                                                
-		if (emit_signal) {
-			atk_object_notify_state_change (ATK_OBJECT (cell), state_type, TRUE);
-			/* If state_type is ATK_STATE_VISIBLE, additional 
-			   notification */
-			if (state_type == ATK_STATE_VISIBLE)
-				g_signal_emit_by_name (cell, "visible_data_changed");
-		}
-
-		return rc;
-	}
-	else
-		return FALSE;
-}
-
-gboolean
-gal_a11y_e_cell_remove_state (GalA11yECell     *cell,
-			      AtkStateType state_type,
-			      gboolean     emit_signal)
-{
-	if (atk_state_set_contains_state (cell->state_set, state_type)) {
-		gboolean rc;
-                                                                                                                              
-		rc = atk_state_set_remove_state (cell->state_set, state_type);
-		/*
-		 * The signal should only be generated if the value changed,
-		 * not when the cell is set up.  So states that are set
-		 * initially should pass FALSE as the emit_signal argument.
-		 */
-
-		if (emit_signal) {
-			atk_object_notify_state_change (ATK_OBJECT (cell), state_type, FALSE);
-			/* If state_type is ATK_STATE_VISIBLE, additional notification */
-			if (state_type == ATK_STATE_VISIBLE)
-				g_signal_emit_by_name (cell, "visible_data_changed");
-		}
-
-		return rc;
-	}
-	else
-		return FALSE;
-}
-
-/**
- * gal_a11y_e_cell_get_type:
- * @void: 
- * 
- * Registers the &GalA11yECell class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &GalA11yECell class.
- **/
-GType
-gal_a11y_e_cell_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		GTypeInfo info = {
-			sizeof (GalA11yECellClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) eti_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL, /* class_data */
-			sizeof (GalA11yECell),
-			0,
-			(GInstanceInitFunc) eti_init,
-			NULL /* value_cell */
-		};
-
-		static const GInterfaceInfo atk_component_info = {
-			(GInterfaceInitFunc) eti_atk_component_iface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "GalA11yECell", &info, 0);
-		g_type_add_interface_static (type, ATK_TYPE_COMPONENT, &atk_component_info);
-	}
-
-	return type;
-}
-
-AtkObject *
-gal_a11y_e_cell_new (ETableItem *item,
-		     ECellView  *cell_view,
-		     AtkObject  *parent,
-		     int         model_col,
-		     int         view_col,
-		     int         row)
-{
-	AtkObject *a11y;
-
-	a11y = g_object_new (gal_a11y_e_cell_get_type (), NULL);
-
-	gal_a11y_e_cell_construct (a11y,
-				   item,
-				   cell_view,
-				   parent,
-				   model_col,
-				   view_col,
-				   row);
-	return a11y;
-}
-
-void
-gal_a11y_e_cell_construct (AtkObject  *object,
-			   ETableItem *item,
-			   ECellView  *cell_view,
-			   AtkObject  *parent,
-			   int         model_col,
-			   int         view_col,
-			   int         row)
-{
-	GalA11yECell *a11y = GAL_A11Y_E_CELL (object);
-	a11y->item      = item;
-	a11y->cell_view = cell_view;
-	a11y->parent    = parent;
-	a11y->model_col = model_col;
-	a11y->view_col  = view_col;
-	a11y->row       = row;
-	ATK_OBJECT (a11y) ->role	= ATK_ROLE_TABLE_CELL;
-
-#if 0
-	if (parent)
-		g_object_ref (parent);
-
-	if (item)
-		g_object_ref (G_OBJECT (item)); /*,
-						  unref_item,
-						  a11y);*/
-	if (cell_view)
-		g_object_ref (G_OBJECT (cell_view)); /*,
-						  unref_cell,
-						  a11y);*/
-#endif
-}
diff --git a/a11y/e-table/gal-a11y-e-cell.h b/a11y/e-table/gal-a11y-e-cell.h
deleted file mode 100644
index 53a6c0089d..0000000000
--- a/a11y/e-table/gal-a11y-e-cell.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2001 Chris Lahey
- */
-
-#ifndef __GAL_A11Y_E_CELL_H__
-#define __GAL_A11Y_E_CELL_H__
-
-#include <glib-object.h>
-#include <gal/e-table/e-table-item.h>
-#include <gal/e-table/e-cell.h>
-
-#define GAL_A11Y_TYPE_E_CELL            (gal_a11y_e_cell_get_type ())
-#define GAL_A11Y_E_CELL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_CELL, GalA11yECell))
-#define GAL_A11Y_E_CELL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_A11Y_TYPE_E_CELL, GalA11yECellClass))
-#define GAL_A11Y_IS_E_CELL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_A11Y_TYPE_E_CELL))
-#define GAL_A11Y_IS_E_CELL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAL_A11Y_TYPE_E_CELL))
-
-typedef struct _GalA11yECell GalA11yECell;
-typedef struct _GalA11yECellClass GalA11yECellClass;
-typedef struct _GalA11yECellPrivate GalA11yECellPrivate;
-typedef struct _ActionInfo ActionInfo;
-typedef void (*ACTION_FUNC) (GalA11yECell *cell);
-
-
-/* This struct should actually be larger as this isn't what we derive from.
- * The GalA11yECellPrivate comes right after the parent class structure.
- **/
-struct _GalA11yECell {
-	AtkObject object;
-
-	ETableItem *item;
-	ECellView  *cell_view;
-	AtkObject  *parent;
-	int         model_col;
-	int         view_col;
-	int         row;
-	AtkStateSet *state_set;
-	GList       *action_list;
-	gint         action_idle_handler;
-	ACTION_FUNC  action_func;
-};
-
-struct _GalA11yECellClass {
-	AtkObjectClass parent_class;
-};
-
-struct _ActionInfo {
-	gchar *name;
-	gchar *description;
-	gchar *keybinding;
-	ACTION_FUNC do_action_func;
-};
-
-
-
-/* Standard Glib function */
-GType      gal_a11y_e_cell_get_type   (void);
-AtkObject *gal_a11y_e_cell_new        (ETableItem *item,
-				       ECellView  *cell_view,
-				       AtkObject  *parent,
-				       int         model_col,
-				       int         view_col,
-				       int         row);
-void       gal_a11y_e_cell_construct  (AtkObject  *object,
-				       ETableItem *item,
-				       ECellView  *cell_view,
-				       AtkObject  *parent,
-				       int         model_col,
-				       int         view_col,
-				       int         row);
-
-void	gal_a11y_e_cell_type_add_action_interface (GType type);
-                                                                                
-gboolean gal_a11y_e_cell_add_action	(GalA11yECell	*cell,
-				         const gchar     *action_name,
-					 const gchar     *action_description,
-					 const gchar     *action_keybinding,
-					 ACTION_FUNC     action_func);
-                                                                                
-gboolean gal_a11y_e_cell_remove_action	(GalA11yECell	*cell,
-                                         gint           action_id);
-                                                                                
-gboolean gal_a11y_e_cell_remove_action_by_name (GalA11yECell        *cell,
-                                          	const gchar     *action_name);
-
-gboolean gal_a11y_e_cell_add_state     (GalA11yECell *cell,
-					AtkStateType state_type,
-					gboolean     emit_signal);
-
-gboolean gal_a11y_e_cell_remove_state  (GalA11yECell *cell,
-					AtkStateType state_type,
-					gboolean     emit_signal);
-
-
-#endif /* ! __GAL_A11Y_E_CELL_H__ */
diff --git a/a11y/e-table/gal-a11y-e-table-factory.c b/a11y/e-table/gal-a11y-e-table-factory.c
deleted file mode 100644
index 14eaca3d19..0000000000
--- a/a11y/e-table/gal-a11y-e-table-factory.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2002 Ximian, Inc.
- */
-
-#include <config.h>
-#include "gal-a11y-e-table-factory.h"
-#include "gal-a11y-e-table.h"
-
-#define CS_CLASS(factory) (G_TYPE_INSTANCE_GET_CLASS ((factory), C_TYPE_STREAM, GalA11yETableFactoryClass))
-static AtkObjectFactoryClass *parent_class;
-#define PARENT_TYPE (ATK_TYPE_OBJECT_FACTORY)
-
-/* Static functions */
-
-static GType
-gal_a11y_e_table_factory_get_accessible_type (void)
-{
-        return GAL_A11Y_TYPE_E_TABLE;
-}
-
-static AtkObject*
-gal_a11y_e_table_factory_create_accessible (GObject *obj)
-{
-	AtkObject *accessible;
-
-	accessible = gal_a11y_e_table_new (obj);
-
-	return accessible;
-}
-
-static void
-gal_a11y_e_table_factory_class_init (GalA11yETableFactoryClass *klass)
-{
-	AtkObjectFactoryClass *factory_class = ATK_OBJECT_FACTORY_CLASS (klass);
-
-	parent_class = g_type_class_ref (PARENT_TYPE);
-
-	factory_class->create_accessible   = gal_a11y_e_table_factory_create_accessible;
-	factory_class->get_accessible_type = gal_a11y_e_table_factory_get_accessible_type;
-}
-
-static void
-gal_a11y_e_table_factory_init (GalA11yETableFactory *factory)
-{
-}
-
-/**
- * gal_a11y_e_table_factory_get_type:
- * @void: 
- * 
- * Registers the &GalA11yETableFactory class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &GalA11yETableFactory class.
- **/
-GType
-gal_a11y_e_table_factory_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		GTypeInfo info = {
-			sizeof (GalA11yETableFactoryClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) gal_a11y_e_table_factory_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL, /* class_data */
-			sizeof (GalA11yETableFactory),
-			0,
-			(GInstanceInitFunc) gal_a11y_e_table_factory_init,
-			NULL /* value_table */
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "GalA11yETableFactory", &info, 0);
-	}
-
-	return type;
-}
diff --git a/a11y/e-table/gal-a11y-e-table-factory.h b/a11y/e-table/gal-a11y-e-table-factory.h
deleted file mode 100644
index eb8eb55414..0000000000
--- a/a11y/e-table/gal-a11y-e-table-factory.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2001 Chris Lahey
- */
-
-#ifndef __GAL_A11Y_E_TABLE_FACTORY_H__
-#define __GAL_A11Y_E_TABLE_FACTORY_H__
-
-#include <glib-object.h>
-#include <atk/atkobjectfactory.h>
-
-#define GAL_A11Y_TYPE_E_TABLE_FACTORY            (gal_a11y_e_table_factory_get_type ())
-#define GAL_A11Y_E_TABLE_FACTORY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_TABLE_FACTORY, GalA11yETableFactory))
-#define GAL_A11Y_E_TABLE_FACTORY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_A11Y_TYPE_E_TABLE_FACTORY, GalA11yETableFactoryClass))
-#define GAL_A11Y_IS_E_TABLE_FACTORY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_A11Y_TYPE_E_TABLE_FACTORY))
-#define GAL_A11Y_IS_E_TABLE_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAL_A11Y_TYPE_E_TABLE_FACTORY))
-
-typedef struct _GalA11yETableFactory GalA11yETableFactory;
-typedef struct _GalA11yETableFactoryClass GalA11yETableFactoryClass;
-
-struct _GalA11yETableFactory {
-	AtkObject object;
-};
-
-struct _GalA11yETableFactoryClass {
-	AtkObjectClass parent_class;
-};
-
-
-/* Standard Glib function */
-GType              gal_a11y_e_table_factory_get_type         (void);
-
-#endif /* ! __GAL_A11Y_E_TABLE_FACTORY_H__ */
diff --git a/a11y/e-table/gal-a11y-e-table-item-factory.c b/a11y/e-table/gal-a11y-e-table-item-factory.c
deleted file mode 100644
index c5fd5c410c..0000000000
--- a/a11y/e-table/gal-a11y-e-table-item-factory.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Authors: Yuedong Du <yuedong.du@sun.com>
- *
- * Copyright (C) 2003 Ximian, Inc.
- */
-
-#include <config.h>
-#include "gal-a11y-e-table-item-factory.h"
-#include "gal-a11y-e-table-item.h"
-#include "gal-a11y-e-table.h"
-#include <gal/e-table/e-table.h>
-#include <gal/e-table/e-tree.h>
-#include <atk/atk.h>
-
-
-#define CS_CLASS(factory) (G_TYPE_INSTANCE_GET_CLASS ((factory), C_TYPE_STREAM, GalA11yETableItemFactoryClass))
-static AtkObjectFactoryClass *parent_class;
-#define PARENT_TYPE (ATK_TYPE_OBJECT_FACTORY)
-
-/* Static functions */
-
-static GType
-gal_a11y_e_table_item_factory_get_accessible_type (void)
-{
-        return GAL_A11Y_TYPE_E_TABLE_ITEM;
-}
-
-static AtkObject*
-gal_a11y_e_table_item_factory_create_accessible (GObject *obj)
-{
-	AtkObject * accessible;
-	ETableItem * eti;
-	GnomeCanvas * gc;
-	GtkWidget * table;
-
-	g_return_if_fail (E_IS_TABLE_ITEM(obj));
-	eti = E_TABLE_ITEM(obj);
-	gc = GNOME_CANVAS_ITEM(eti)->canvas;
-
-	table = gtk_widget_get_parent(GTK_WIDGET(gc));
-
-	accessible = gtk_widget_get_accessible (table);
-	accessible = atk_object_ref_accessible_child (accessible, 0);
-
-	return accessible;
-}
-
-static void
-gal_a11y_e_table_item_factory_class_init (GalA11yETableItemFactoryClass *klass)
-{
-	AtkObjectFactoryClass *factory_class = ATK_OBJECT_FACTORY_CLASS (klass);
-
-	parent_class = g_type_class_ref (PARENT_TYPE);
-
-	factory_class->create_accessible   = gal_a11y_e_table_item_factory_create_accessible;
-	factory_class->get_accessible_type = gal_a11y_e_table_item_factory_get_accessible_type;
-}
-
-static void
-gal_a11y_e_table_item_factory_init (GalA11yETableItemFactory *factory)
-{
-}
-
-/**
- * gal_a11y_e_table_factory_get_type:
- * @void: 
- * 
- * Registers the &GalA11yETableFactory class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &GalA11yETableFactory class.
- **/
-GType
-gal_a11y_e_table_item_factory_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		GTypeInfo info = {
-			sizeof (GalA11yETableItemFactoryClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) gal_a11y_e_table_item_factory_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL, /* class_data */
-			sizeof (GalA11yETableItemFactory),
-			0,
-			(GInstanceInitFunc) gal_a11y_e_table_item_factory_init,
-			NULL /* value_table */
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "GalA11yETableItemFactory", &info, 0);
-	}
-
-	return type;
-}
diff --git a/a11y/e-table/gal-a11y-e-table-item-factory.h b/a11y/e-table/gal-a11y-e-table-item-factory.h
deleted file mode 100644
index cbbff9fb18..0000000000
--- a/a11y/e-table/gal-a11y-e-table-item-factory.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Authors: *   Yuedong Du <yuedong.du@sun.com>
- *
- * Copyright (C) 2003 Ximian, Inc.
- */
-
-#ifndef __GAL_A11Y_E_TABLE_ITEM_FACTORY_H__
-#define __GAL_A11Y_E_TABLE_ITEM_FACTORY_H__
-
-#include <glib-object.h>
-#include <atk/atkobjectfactory.h>
-
-#define GAL_A11Y_TYPE_E_TABLE_ITEM_FACTORY            (gal_a11y_e_table_item_factory_get_type ())
-#define GAL_A11Y_E_TABLE_ITEM_FACTORY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_TABLE_ITEM_FACTORY, GalA11yETableItemFactory))
-#define GAL_A11Y_E_TABLE_ITEM_FACTORY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_A11Y_TYPE_E_TABLE_ITEM_FACTORY, GalA11yETableItemFactoryClass))
-#define GAL_A11Y_IS_E_TABLE_ITEM_FACTORY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_A11Y_TYPE_E_TABLE_ITEM_FACTORY))
-#define GAL_A11Y_IS_E_TABLE_ITEM_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAL_A11Y_TYPE_E_TABLE_ITEM_FACTORY))
-
-typedef struct _GalA11yETableItemFactory GalA11yETableItemFactory;
-typedef struct _GalA11yETableItemFactoryClass GalA11yETableItemFactoryClass;
-
-struct _GalA11yETableItemFactory {
-	AtkObject object;
-};
-
-struct _GalA11yETableItemFactoryClass {
-	AtkObjectClass parent_class;
-};
-
-
-/* Standard Glib function */
-GType              gal_a11y_e_table_item_factory_get_type         (void);
-
-#endif /* ! __GAL_A11Y_E_TABLE_FACTORY_H__ */
diff --git a/a11y/e-table/gal-a11y-e-table-item.c b/a11y/e-table/gal-a11y-e-table-item.c
deleted file mode 100644
index fcfa1cc0e6..0000000000
--- a/a11y/e-table/gal-a11y-e-table-item.c
+++ /dev/null
@@ -1,1285 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Christopher James Lahey <clahey@ximian.com>
- *   Bolian Yin <bolian.yin@sun.com>
- *
- * Copyright (C) 2002 Ximian, Inc.
- */
-
-#include <config.h>
-#include "gal-a11y-e-table-item.h"
-#include "gal-a11y-e-cell-registry.h"
-#include "gal-a11y-e-cell.h"
-#include "gal-a11y-util.h"
-#include <gal/e-table/e-table-subset.h>
-
-#include <atk/atkobject.h>
-#include <atk/atktable.h>
-#include <atk/atkcomponent.h>
-#include <atk/atkobjectfactory.h>
-#include <atk/atkregistry.h>
-#include <atk/atkgobjectaccessible.h>
-
-#define CS_CLASS(a11y) (G_TYPE_INSTANCE_GET_CLASS ((a11y), C_TYPE_STREAM, GalA11yETableItemClass))
-static GObjectClass *parent_class;
-static AtkComponentIface *component_parent_iface;
-static GType parent_type;
-static gint priv_offset;
-static GQuark		quark_accessible_object = 0;
-#define GET_PRIVATE(object) ((GalA11yETableItemPrivate *) (((char *) object) + priv_offset))
-#define PARENT_TYPE (parent_type)
-
-struct _GalA11yETableItemPrivate {
-	AtkObject *parent;
-	gint index_in_parent;
-	gint cols;
-	gint rows;
-	gpointer *cell_data;
-	int selection_change_id;
-	int cursor_change_id;
-	ETableCol ** columns;
-	ESelectionModel *selection;
-};
-
-static gboolean gal_a11y_e_table_item_ref_selection (GalA11yETableItem *a11y,
-						     ESelectionModel *selection);
-static gboolean gal_a11y_e_table_item_unref_selection (GalA11yETableItem *a11y);
-
-#if 0
-static void
-unref_accessible (gpointer user_data, GObject *obj_loc)
-{
-	GalA11yETableItem *a11y = GAL_A11Y_E_TABLE_ITEM (user_data);
-	GET_PRIVATE (a11y)->item = NULL;
-	g_object_unref (a11y);
-}
-#endif
-
-inline static gint
-view_to_model_row(ETableItem *eti, int row)
-{
-	if (eti->uses_source_model) {
-		ETableSubset *etss = E_TABLE_SUBSET(eti->table_model);
-		if (row >= 0 && row < etss->n_map) {
-			eti->row_guess = row;
-			return etss->map_table[row];
-		} else
-			return -1;
-	} else
-		return row;
-}
-
-inline static gint
-view_to_model_col(ETableItem *eti, int col)
-{
-	ETableCol *ecol = e_table_header_get_column (eti->header, col);
-	return ecol ? ecol->col_idx : -1;
-}
-
-inline static GObject *
-eti_a11y_get_gobject (AtkObject *accessible)
-{
-	return atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (accessible));
-}
-
-static void
-eti_dispose (GObject *object)
-{
-	gint i,j;
-	GalA11yETableItem *a11y = GAL_A11Y_E_TABLE_ITEM (object);
-	GalA11yETableItemPrivate *priv = GET_PRIVATE (a11y);
-
-	priv->parent = NULL;
-
-	if ( priv->cell_data != NULL ) {
-		g_free(priv->cell_data);
-		priv->cell_data = NULL;
-	}
-
-	if (priv->columns) {
-		g_free(priv->columns);
-		priv->columns = NULL;
-	}
-
-	if (parent_class->dispose)
-		parent_class->dispose (object);
-	if (priv->selection)
-		gal_a11y_e_table_item_unref_selection (a11y);
-}
-
-/* Static functions */
-static AtkObject *
-eti_get_parent (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GalA11yETableItem *a11y;
-
-	g_return_val_if_fail (GAL_A11Y_IS_E_TABLE_ITEM (accessible), NULL);
-	if (!eti_a11y_get_gobject (accessible))
-		/* defunct */
-		return NULL;
-
-	a11y = GAL_A11Y_E_TABLE_ITEM (accessible);
-	return GET_PRIVATE (a11y)->parent;
-}
-
-static gint
-eti_get_n_children (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-
-	g_return_val_if_fail (GAL_A11Y_IS_E_TABLE_ITEM (accessible), 0);
-	if (!eti_a11y_get_gobject (accessible))
-		return 0;
-
-	return atk_table_get_n_columns (ATK_TABLE (accessible)) *
-		atk_table_get_n_rows (ATK_TABLE (accessible));
-}
-
-static AtkObject*
-eti_ref_child (AtkObject *accessible, gint index)
-{
-	AtkGObjectAccessible *atk_gobj;
-	ETableItem *item;
-	gint col, row;
-
-	g_return_val_if_fail (GAL_A11Y_IS_E_TABLE_ITEM (accessible), NULL);
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (accessible));
-	if (!item)
-		return NULL;
-
-	if (index < item->cols) {
-		AtkObject *child;
-
-		/* A column header is required */
-		child = atk_table_get_column_header (ATK_TABLE (accessible), index);
-		if (child)
-			g_object_ref (child);
-		return child;
-	}
-
-	index -= item->cols;
-	col = index % item->cols;
-	row = index / item->cols;
-
-	return atk_table_ref_at (ATK_TABLE (accessible), row, col);
-}
-
-static gint
-eti_get_index_in_parent (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GalA11yETableItem *a11y;
-
-	g_return_val_if_fail (GAL_A11Y_IS_E_TABLE_ITEM (accessible), -1);
-	if (!eti_a11y_get_gobject (accessible))
-		return -1;
-
-	a11y = GAL_A11Y_E_TABLE_ITEM (accessible);
-	return GET_PRIVATE (a11y)->index_in_parent;
-}
-
-static void
-eti_get_extents (AtkComponent *component,
-		 gint *x,
-		 gint *y,
-		 gint *width,
-		 gint *height,
-		 AtkCoordType coord_type)
-{
-	ETableItem *item;
-	double real_width;
-	double real_height;
-	int fake_width;
-	int fake_height;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (component)));
-	if (!item)
-		return;
-
-	if (component_parent_iface &&
-	    component_parent_iface->get_extents)
-		component_parent_iface->get_extents (component,
-						     x,
-						     y,
-						     &fake_width,
-						     &fake_height,
-						     coord_type);
-
-	gtk_object_get (GTK_OBJECT (item),
-			"width", &real_width,
-			"height", &real_height,
-			NULL);
-
-	if (width)
-		*width = real_width;
-	if (height) 
-		*height = real_height;
-}
-
-static AtkObject*
-eti_ref_accessible_at_point (AtkComponent *component,
-			     gint x,
-			     gint y,
-			     AtkCoordType coord_type)
-{
-	int row = -1;
-	int col = -1;
-	int x_origin, y_origin;
-	ETableItem *item;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (component)));
-	if (!item)
-		return;
-
-	atk_component_get_position (component,
-				    &x_origin,
-				    &y_origin,
-				    coord_type);
-	x -= x_origin;
-	y -= y_origin;
-
-	e_table_item_compute_location (item, &x, &y,
-				       &row, &col);
-
-	if (row != -1 && col != -1) {
-		return atk_table_ref_at (ATK_TABLE (component), row, col);
-	} else {
-		return NULL;
-	}
-}
-
-
-static void
-cell_destroyed (gpointer data)
-{
-	AtkObject *parent;
-	gint index, n_cols;
-	GalA11yETableItem * item;
-	GalA11yECell * cell;
-
-	g_return_if_fail (GAL_A11Y_IS_E_CELL (data));
-	cell = GAL_A11Y_E_CELL (data);
-		
-	item =	atk_gobject_accessible_for_object (GAL_A11Y_E_CELL(data)->item);
-
-	g_return_if_fail (item && GAL_A11Y_IS_E_TABLE_ITEM (item));
-
-	g_return_if_fail (cell->row < GET_PRIVATE(item)->rows && cell->view_col < GET_PRIVATE(item)->cols);
-
-	index = cell->row * cell->item->cols + cell->view_col;
-                                                                   
-	if (GET_PRIVATE (item)->cell_data && GET_PRIVATE (item)->cell_data [index] == data)
-		GET_PRIVATE (item)->cell_data [index] = NULL;
-}
-
-/* atk table */
-static AtkObject*
-eti_ref_at (AtkTable *table, gint row, gint column)
-{
-	ETableItem *item;
-	AtkObject* ret;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (table)));
-	if (!item)
-		return NULL;
-
-	if (column >= 0 &&
-	    column < item->cols &&
-	    row >= 0 &&
-	    row < item->rows &&
-	    item->cell_views_realized) {
-		ECellView *cell_view = item->cell_views[column];
-		ETableCol *ecol = e_table_header_get_column (item->header, column);
-		gpointer * cell_data;
-
-		cell_data = GET_PRIVATE (table)->cell_data;
-
-		if (cell_data[row*item->cols + column] == NULL) {
-			ret = gal_a11y_e_cell_registry_get_object (NULL,
-							    item,
-							    cell_view,
-							    ATK_OBJECT (table),
-							    ecol->col_idx,
-							    column,
-							    row);
-			cell_data[row*item->cols + column] = ret;
-			if (ATK_IS_OBJECT (ret))
-				g_object_weak_ref (G_OBJECT (ret),
-						   (GWeakNotify) cell_destroyed,
-						   ret);
-
-			else
-				ret = NULL;
-		} else {
-			ret = (AtkObject *) cell_data[row*item->cols + column];
-			if (ATK_IS_OBJECT (ret)) {
-				g_object_ref (ret);
-			} else { 
-				ret = NULL;
-			}
-		}
-
-
-		return ret;
-	}
-
-	return NULL;
-}
-
-static gint
-eti_get_index_at (AtkTable *table, gint row, gint column)
-{
-	ETableItem *item;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (table)));
-	if (!item)
-		return -1;
-
-	return column + row * item->cols;
-}
-
-static gint
-eti_get_column_at_index (AtkTable *table, gint index)
-{
-	ETableItem *item;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (table)));
-	if (!item)
-		return -1;
-
-	return index % item->cols;
-}
-
-static gint
-eti_get_row_at_index (AtkTable *table, gint index)
-{
-	ETableItem *item;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (table)));
-	if (!item)
-		return -1;
-
-	return index / item->cols;
-}
-
-static gint
-eti_get_n_columns (AtkTable *table)
-{
-	ETableItem *item;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (table)));
-	if (!item)
-		return -1;
-
-	return item->cols;
-}
-
-static gint
-eti_get_n_rows (AtkTable *table)
-{
-	ETableItem *item;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (table)));
-	if (!item)
-		return -1;
-
-	return item->rows;
-}
-
-static gint
-eti_get_column_extent_at (AtkTable *table,
-			  gint row,
-			  gint column)
-{
-	ETableItem *item;
-	int width;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (table)));
-	if (!item)
-		return -1;
-
-	e_table_item_get_cell_geometry (item,
-					&row, 
-					&column,
-					NULL,
-					NULL,
-					&width,
-					NULL);
-
-	return width;
-}
-
-static gint
-eti_get_row_extent_at (AtkTable *table,
-		       gint row,
-		       gint column)
-{
-	ETableItem *item;
-	int height;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (table)));
-	if (!item)
-		return -1;
-
-	e_table_item_get_cell_geometry (item,
-					&row, 
-					&column,
-					NULL,
-					NULL,
-					NULL,
-					&height);
-
-	return height;
-}
-
-static AtkObject *
-eti_get_caption (AtkTable *table)
-{
-	/* Unimplemented */
-	return NULL;
-}
-
-static G_CONST_RETURN gchar *
-eti_get_column_description (AtkTable *table,
-			    gint column)
-{
-	ETableItem *item;
-	ETableCol *ecol;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (table)));
-	if (!item)
-		return NULL;
-
-	ecol = e_table_header_get_column (item->header, column);
-
-	return ecol->text;
-}
-
-static AtkObject *
-eti_get_column_header (AtkTable *table, gint column)
-{
-	ETableItem *item;
-	ETableCol *ecol;
-	AtkObject *atk_obj = NULL;
-	ECell *ecell;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (table)));
-	if (!item)
-		return NULL;
-
-	ecol = e_table_header_get_column (item->header, column);
-	ecell = ecol->ecell;
-	if (ecell)
-		atk_obj = atk_gobject_accessible_for_object (G_OBJECT (ecell));
-	return atk_obj;
-}
-
-static G_CONST_RETURN gchar *
-eti_get_row_description (AtkTable *table,
-			 gint row)
-{
-	/* Unimplemented */
-	return NULL;
-}
-
-static AtkObject *
-eti_get_row_header (AtkTable *table,
-		    gint row)
-{
-	/* Unimplemented */
-	return NULL;
-}
-
-static AtkObject *
-eti_get_summary (AtkTable *table)
-{
-	/* Unimplemented */
-	return NULL;
-}
-
-static gboolean 
-table_is_row_selected (AtkTable *table, gint row)
-{
-	ETableItem *item;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (table)));
-	if (!item)
-		return FALSE;
-
-	return e_selection_model_is_row_selected(item->selection, row);
-}
-
-static gboolean 
-table_is_selected (AtkTable *table, gint row, gint column)
-{
-	return table_is_row_selected (table, row);
-}
-
-static gint
-table_get_selected_rows (AtkTable *table, gint **rows_selected)
-{
-	ETableItem *item;
-	gint n_selected, row, index_selected;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (table)));
-	if (!item)
-		return 0;
-
-	n_selected = e_selection_model_selected_count (item->selection);
-	if (rows_selected) {
-		*rows_selected = (gint *) g_malloc (n_selected * sizeof (gint));
-
-		index_selected = 0;
-		for (row = 0; row < item->rows && index_selected < n_selected; ++row) {
-			if (atk_table_is_row_selected (table, row)) {
-				(*rows_selected)[index_selected] = row;
-				++index_selected;
-			}
-		}
-	}
-	return n_selected;
-}
-
-static gboolean 
-table_add_row_selection (AtkTable *table, gint row)
-{
-	ETableItem *item;
-	gint cursor_row, cursor_col, row_count;
-	GdkModifierType state = GDK_CONTROL_MASK;
-	ESelectionModel *selection;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (table)));
-	if (!item)
-		return FALSE;
-
-	if (table_is_row_selected (table, row))
-		return TRUE;
-	e_selection_model_toggle_single_row (item->selection,
-					     view_to_model_row (item, row));
-
-	return TRUE;
-}
-
-static gboolean 
-table_remove_row_selection (AtkTable *table, gint row)
-{
-	ETableItem *item;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (table)));
-	if (!item)
-		return FALSE;
-
-	if (!atk_table_is_row_selected (table, row))
-		return TRUE;
-	e_selection_model_toggle_single_row (item->selection, row);
-	return TRUE;
-}
-
-static void
-eti_atk_table_iface_init (AtkTableIface *iface)
-{
-	iface->ref_at = eti_ref_at;
-	iface->get_index_at = eti_get_index_at;
-	iface->get_column_at_index = eti_get_column_at_index;
-	iface->get_row_at_index = eti_get_row_at_index;
-	iface->get_n_columns = eti_get_n_columns;
-	iface->get_n_rows = eti_get_n_rows;
-	iface->get_column_extent_at = eti_get_column_extent_at;
-	iface->get_row_extent_at = eti_get_row_extent_at;
-	iface->get_caption = eti_get_caption;
-	iface->get_column_description = eti_get_column_description;
-	iface->get_column_header = eti_get_column_header;
-	iface->get_row_description = eti_get_row_description;
-	iface->get_row_header = eti_get_row_header;
-	iface->get_summary = eti_get_summary;
-
-	iface->is_row_selected = table_is_row_selected;
-	iface->is_selected = table_is_selected;
-	iface->get_selected_rows = table_get_selected_rows;
-	iface->add_row_selection = table_add_row_selection;
-	iface->remove_row_selection = table_remove_row_selection;
-}
-
-static void
-eti_atk_component_iface_init (AtkComponentIface *iface)
-{
-	component_parent_iface         = g_type_interface_peek_parent (iface);
-
-	iface->ref_accessible_at_point = eti_ref_accessible_at_point;
-	iface->get_extents             = eti_get_extents;
-}
-
-static void
-eti_rows_inserted (ETableModel * model, int row, int count, 
-		   AtkObject * table_item)
-{
-	gint n_cols,n_rows,i,j;
-	gint size;
-	gpointer *cell_data;
-	ETableItem *item = E_TABLE_ITEM (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (table_item)));
-	GalA11yETableItem * item_a11y;
-	gint old_nrows;
-
-	g_return_if_fail (table_item);
- 	item_a11y = GAL_A11Y_E_TABLE_ITEM (table_item);
-
-        n_cols = atk_table_get_n_columns (ATK_TABLE(table_item));
-	n_rows = atk_table_get_n_rows (ATK_TABLE(table_item));
-
-	old_nrows = GET_PRIVATE(item_a11y)->rows;
-	
-	g_return_if_fail (n_cols > 0 && n_rows > 0);
-	g_return_if_fail (old_nrows == n_rows - count);
-
-	cell_data = GET_PRIVATE(table_item)->cell_data;
-	GET_PRIVATE(table_item)->cell_data = g_realloc (cell_data, (n_rows*n_cols) * sizeof(gpointer));
-	cell_data = GET_PRIVATE(table_item)->cell_data;
-
-	GET_PRIVATE(table_item)->rows = n_rows; 
-
-	/* If rows are insert in the middle of a table. */
-	if (row + count < n_rows ) {
-		memmove(&cell_data[(row+count)*n_cols], &cell_data[row*n_cols],
-			(old_nrows-row)*n_cols*sizeof(gpointer));
-
-		/* Update cell's index. */
-		for (i = row + count; i < n_rows; i ++) {
-			for (j = 0; j < n_cols; j ++)
-				if (cell_data[i*n_cols + j] != NULL) {
-					AtkObject * a11y;
-
-					a11y = ATK_OBJECT(cell_data[i*n_cols + j]);
-                                        GAL_A11Y_E_CELL(a11y)->row = i;
-				}
-		}
-	}
-
-	/* Clear cache for the new added rows. */
-	for (i = row ; i < row+count; i ++)
-		for (j = 0 ;  j < n_cols; j ++)
-			cell_data [i*n_cols + j] = NULL;
-
-	g_signal_emit_by_name (table_item, "row-inserted", row,
-			       count, NULL);
-
-        for (i = row; i < (row + count); i ++) {
-                for (j = 0; j < n_cols; j ++) {
-			g_signal_emit_by_name (table_item,
-					       "children_changed::add",
-                                               ( (i*n_cols) + j), NULL, NULL);
-		}
-        }
-
-	g_signal_emit_by_name (table_item, "visible-data-changed");
-}
-
-static void
-eti_rows_deleted (ETableModel * model, int row, int count, 
-		  AtkObject * table_item)
-{
-	gint i,j, n_rows, n_cols, old_nrows;
-	gpointer *cell_data;
-	ETableItem *item = E_TABLE_ITEM (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (table_item)));
-	
-	n_rows = atk_table_get_n_rows (ATK_TABLE(table_item));
-        n_cols = atk_table_get_n_columns (ATK_TABLE(table_item));
-
-	cell_data = GET_PRIVATE(table_item)->cell_data;
-	old_nrows = GET_PRIVATE(table_item)->rows;
-
-	g_return_if_fail ( row+count <= old_nrows);
-	g_return_if_fail (old_nrows == n_rows + count);
-	GET_PRIVATE(table_item)->rows = n_rows;
-
-	/* DEFUNCT the deleted cells. */
-	for (i = row; i < row+count; i ++) {
-		for (j = 0; j < n_cols; j ++) {
-			if (cell_data[i*n_cols + j] != NULL) {
-				AtkObject * a11y;
-
-				a11y = ATK_OBJECT(cell_data[i*n_cols + j]);
-				gal_a11y_e_cell_add_state (GAL_A11Y_E_CELL(a11y), ATK_STATE_DEFUNCT, TRUE);
-				cell_data[i*n_cols + j] = NULL;
-			}
-		}
-	}
-
-	/* If more rows left, update the a11y object. */
-	if (old_nrows > row + count) {
-
-		/* Remove the defunct cells in cache. */
-		memmove (&cell_data[row*n_cols], &cell_data[(row+count)*n_cols],
-			( old_nrows-row-count)*n_cols*sizeof(gpointer));
-
-		GET_PRIVATE(table_item)->cell_data = g_realloc (cell_data, n_rows*n_cols*sizeof(gpointer));
-		cell_data = GET_PRIVATE(table_item)->cell_data;
-
-		/* Update index of cells below the deleted rows. */
-		for (i = row; i < n_rows; i ++) {
-			for (j = 0; j < n_cols; j ++) {
-				if (cell_data[i*n_cols + j] != NULL) {
-					AtkObject * a11y;
-
-					a11y = ATK_OBJECT(cell_data[i*n_cols + j]);
-					GAL_A11Y_E_CELL(a11y)->row = i;
-				}
-			}
-		}
-	}
-
-	g_signal_emit_by_name (table_item, "row-deleted", row,
-			       count, NULL);
-
-        for (i = row; i < (row + count); i ++) {
-                for (j = 0; j < n_cols; j ++) {
-			g_signal_emit_by_name (table_item,
-					       "children_changed::remove",
-                                               ( (i*n_cols) + j), NULL, NULL);
-		}
-        }
-	g_signal_emit_by_name (table_item, "visible-data-changed");
-}
-
-enum {
-        ETI_HEADER_UNCHANGED = 0,
-        ETI_HEADER_REORDERED,
-        ETI_HEADER_NEW_ADDED,
-        ETI_HEADER_REMOVED,
-};
-                                                                                
-/*
- * 1. Check what actually happened: column reorder, remove or add
- * 2. Update cache
- * 3. Emit signals
- */
-static void
-eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y)
-{
-                                                                                
-        gboolean reorder_found=FALSE, added_found=FALSE, removed_found=FALSE;
-        GalA11yETableItem * a11y_item;
-        ETableCol ** cols, **prev_cols;
-        GalA11yETableItemPrivate *priv;
-        gint *state = NULL, *prev_state = NULL, *reorder = NULL;
-        gint i,j,n_rows,n_cols, prev_n_cols;
-        gpointer * cell_data, * tmp;
-                                                                                
-        a11y_item = GAL_A11Y_E_TABLE_ITEM (a11y);
-        priv = GET_PRIVATE (a11y_item);
-                                                                                
-	g_return_if_fail (priv && priv->cell_data);
-	cell_data = priv->cell_data ;
-
-	/* Assume rows do not changed. */
-        n_rows = priv->rows;
-
-        prev_n_cols = priv->cols;
-        prev_cols = priv->columns;
-
-        cols = e_table_header_get_columns (eth);
-	n_cols = eth->col_count;
-                                                                                
-        g_return_if_fail (cols && prev_cols && n_cols > 0);
-                                                                                
-        /* Init to ETI_HEADER_UNCHANGED. */
-        state = g_malloc0 (sizeof (gint) * n_cols);
-        prev_state = g_malloc0 (sizeof (gint) * prev_n_cols);
-        reorder = g_malloc0 (sizeof (gint) * n_cols);
-
-        /* Compare with previously saved column headers. */
-        for ( i = 0 ; i < n_cols && cols[i]; i ++ ) {
-                for ( j = 0 ; j < prev_n_cols && prev_cols[j]; j ++ ) {
-                        if ( prev_cols [j] == cols[i] && i != j ) {
-
-                                reorder_found = TRUE;
-                                state [i] = ETI_HEADER_REORDERED;
-				reorder [i] = j;
-
-                                break;
-                        } else if (prev_cols[j] == cols[i]) {
-                                /* OK, this column is not changed. */
-                                break;
-                        }
-                }
-                                                                                
-                /* cols[i] is new added column. */
-                if ( j == prev_n_cols ) {
-			gint row;
-
-			added_found = TRUE;
-                        state[i] = ETI_HEADER_NEW_ADDED;
-                }
-        }
-
-        /* Now try to find if there are removed columns. */
-        for (i = 0 ; i < prev_n_cols && prev_cols[i]; i ++) {
-                for (j = 0 ; j < n_cols && cols[j]; j ++)
-                        if ( prev_cols [j] == cols[i] )
-				break;
-                                                                                
-                /* Removed columns found. */
-                if ( j == n_cols ) {
-			removed_found = TRUE;
-			prev_state[j] = ETI_HEADER_REMOVED;
-                }
-        }
-
-	/* If nothing interesting just return. */
-	if (!reorder_found && !added_found && !removed_found)
-		return;
-
-	/* Now update our cache. */
-	tmp = g_malloc0 (n_rows*n_cols*sizeof(gpointer));
-	g_return_if_fail (tmp);
-
-	for (i = 0 ; i < n_rows; i ++) {
-		for ( j = 0 ; j < n_cols; j ++ ) {
-			if ( state[j] == ETI_HEADER_REORDERED ) {
-				tmp [i*n_cols+j] = cell_data[i*prev_n_cols+reorder[j]];
-				if (tmp[i*n_cols+j] &&  ATK_IS_OBJECT(tmp[i*n_cols+j])) {
-					GAL_A11Y_E_CELL(tmp[i*n_cols+j])->view_col = j;
-				}
-			} else if (state[j] == ETI_HEADER_UNCHANGED) {
-				tmp [i*n_cols+j] = cell_data[i*prev_n_cols+j];
-			} /* else: new added, keep NULL. */
-		}
-	}
-
-	g_free (cell_data);
-	priv->cell_data = tmp;
-
-	/* Emit signals */
-	if (reorder_found)
-        	g_signal_emit_by_name (G_OBJECT(a11y_item), "column_reordered");
-
-
-	if (removed_found) {
-		for (i = 0; i < prev_n_cols; i ++ ) {
-			if (prev_state[i] == ETI_HEADER_REMOVED) {
-				g_signal_emit_by_name (G_OBJECT(a11y_item), "column-deleted", i, 1);
-				for (j = 0 ; j < n_rows; j ++)
-					g_signal_emit_by_name (G_OBJECT(a11y_item), "children_changed::remove", (j*prev_n_cols+i), NULL, NULL);
-			}
-		}
-	}
-
-	if (added_found) {
-		for ( i = 0; i < n_cols; i ++ ) {
-			if (state[i] == ETI_HEADER_NEW_ADDED) {
-				g_signal_emit_by_name (G_OBJECT(a11y_item), "column-inserted", i, 1);
-				for (j = 0 ; j < n_rows; j ++)
-					g_signal_emit_by_name (G_OBJECT(a11y_item), "children_changed::add", (j*n_cols+i), NULL, NULL);
-			}
-		}
-	}
-
-	priv->cols = n_cols;
-
-	g_free (state);
-	g_free (reorder);
-	g_free (prev_state);
-
-	g_free (priv->columns);
-	priv->columns = cols;
-}
-
-
-static void
-eti_real_initialize (AtkObject *obj, 
-		     gpointer data)
-{
-	ETableItem * eti;
-	ETableModel * model;
-
-	ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
-	eti = E_TABLE_ITEM (data);
-
-	model = eti->table_model;
-
-	g_signal_connect (model, "model-rows-inserted",
-			  G_CALLBACK (eti_rows_inserted),
-			  obj);
-	g_signal_connect (model, "model-rows-deleted",
-			  G_CALLBACK (eti_rows_deleted),
-			  obj);
-	g_signal_connect (G_OBJECT (eti->header), "structure_change",
-			  G_CALLBACK (eti_header_structure_changed), obj);
-
-}
-
-static void
-eti_class_init (GalA11yETableItemClass *klass)
-{
-	AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass);
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	quark_accessible_object               = g_quark_from_static_string ("gtk-accessible-object");
-
-	parent_class                          = g_type_class_ref (PARENT_TYPE);
-
-	object_class->dispose                 = eti_dispose;
-
-	atk_object_class->get_parent          = eti_get_parent;
-	atk_object_class->get_n_children      = eti_get_n_children;
-	atk_object_class->ref_child           = eti_ref_child;
-	atk_object_class->get_index_in_parent = eti_get_index_in_parent;
-	atk_object_class->initialize	      = eti_real_initialize;
-}
-
-static void
-eti_init (GalA11yETableItem *a11y)
-{
-	GalA11yETableItemPrivate *priv;
-
-	priv = GET_PRIVATE (a11y);
-
-	priv->parent = NULL;
-	priv->index_in_parent = -1;
-	priv->selection_change_id = 0;
-	priv->cursor_change_id = 0;
-	priv->selection = NULL;
-}
-
-/* atk selection */
-
-static void             atk_selection_interface_init    (AtkSelectionIface      *iface);
-static gboolean         selection_add_selection    (AtkSelection           *selection,
-						    gint                   i);
-static gboolean         selection_clear_selection  (AtkSelection           *selection);
-static AtkObject*       selection_ref_selection    (AtkSelection           *selection,
-						    gint                   i);
-static gint             selection_get_selection_count (AtkSelection           *selection);
-static gboolean         selection_is_child_selected (AtkSelection           *selection,
-						     gint                   i);
-
-/* callbacks */
-static void eti_a11y_selection_model_removed_cb (ETableItem *eti,
-						 ESelectionModel *selection,
-						 gpointer data);
-static void eti_a11y_selection_model_added_cb (ETableItem *eti,
-					       ESelectionModel *selection,
-					       gpointer data);
-static void eti_a11y_selection_changed_cb (ESelectionModel *selection,
-					   GalA11yETableItem *a11y);
-static void eti_a11y_cursor_changed_cb (ESelectionModel *selection,
-					int row, int col,
-					GalA11yETableItem *a11y);
-
-/**
- * gal_a11y_e_table_item_get_type:
- * @void: 
- * 
- * Registers the &GalA11yETableItem class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &GalA11yETableItem class.
- **/
-GType
-gal_a11y_e_table_item_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		AtkObjectFactory *factory;
-
-		GTypeInfo info = {
-			sizeof (GalA11yETableItemClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) eti_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL, /* class_data */
-			sizeof (GalA11yETableItem),
-			0,
-			(GInstanceInitFunc) eti_init,
-			NULL /* value_table_item */
-		};
-
-		static const GInterfaceInfo atk_component_info = {
-			(GInterfaceInitFunc) eti_atk_component_iface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-		static const GInterfaceInfo atk_table_info = {
-			(GInterfaceInitFunc) eti_atk_table_iface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		static const GInterfaceInfo atk_selection_info = {
-			(GInterfaceInitFunc) atk_selection_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-
-		factory = atk_registry_get_factory (atk_get_default_registry (), GNOME_TYPE_CANVAS_ITEM);
-		parent_type = atk_object_factory_get_accessible_type (factory);
-
-		type = gal_a11y_type_register_static_with_private (PARENT_TYPE, "GalA11yETableItem", &info, 0,
-								   sizeof (GalA11yETableItemPrivate), &priv_offset);
-
-		g_type_add_interface_static (type, ATK_TYPE_COMPONENT, &atk_component_info);
-		g_type_add_interface_static (type, ATK_TYPE_TABLE, &atk_table_info);
-		g_type_add_interface_static (type, ATK_TYPE_SELECTION, &atk_selection_info);
-	}
-
-	return type;
-}
-
-AtkObject *
-gal_a11y_e_table_item_new (AtkObject *parent,
-			   ETableItem *item,
-			   int index_in_parent)
-{
-	GalA11yETableItem *a11y;
-	int n;
-
-	a11y = g_object_new (gal_a11y_e_table_item_get_type (), NULL);
-
-	atk_object_initialize (ATK_OBJECT (a11y), item);
-
-	GET_PRIVATE (a11y)->parent = parent;
-	GET_PRIVATE (a11y)->index_in_parent = index_in_parent;
-
-	g_return_val_if_fail (item->cols >= 0 && item->rows >= 0, NULL);
-	/* Initialize cell data. */
-	n = item->cols * item->rows;
-	GET_PRIVATE (a11y)->cols = item->cols;
-	GET_PRIVATE (a11y)->rows = item->rows;
-	if (n > 0) {
-		GET_PRIVATE (a11y)->cell_data = g_malloc0(n*sizeof(gpointer));
-		/* memory error. */
-		if ( GET_PRIVATE (a11y)->cell_data == NULL)
-			return NULL;
-	} else
-		GET_PRIVATE (a11y)->cell_data = NULL;
-		
-
-        GET_PRIVATE (a11y)->columns = e_table_header_get_columns (item->header);                                                                                
-        if ( GET_PRIVATE (a11y)->columns == NULL)
-                return NULL;
-
-	if (item) {
-		g_signal_connect (G_OBJECT(item), "selection_model_removed",
-				  G_CALLBACK (eti_a11y_selection_model_removed_cb), NULL);
-		g_signal_connect (G_OBJECT(item), "selection_model_added",
-				  G_CALLBACK (eti_a11y_selection_model_added_cb), NULL);
-		if (item->selection)
-			gal_a11y_e_table_item_ref_selection (a11y,
-							     item->selection);
-	}
-	if (parent)
-		g_object_ref (parent);
-
-#if 0
-	if (item)
-		g_object_weak_ref (G_OBJECT (item),
-				   unref_accessible,
-				   a11y);
-#endif
-
-	return ATK_OBJECT (a11y);
-}
-
-static gboolean
-gal_a11y_e_table_item_ref_selection (GalA11yETableItem *a11y,
-				     ESelectionModel *selection)
-{
-	GalA11yETableItemPrivate *priv;
-
-	g_return_val_if_fail (a11y && selection, FALSE);
-
-	priv = GET_PRIVATE (a11y);
-	priv->selection_change_id = g_signal_connect (
-	    G_OBJECT(selection), "selection_changed",
-	    G_CALLBACK (eti_a11y_selection_changed_cb), a11y);
-	priv->cursor_change_id = g_signal_connect (
-            G_OBJECT(selection), "cursor_changed",
-	    G_CALLBACK (eti_a11y_cursor_changed_cb), a11y);
-
-	priv->selection = selection;
-	g_object_ref (selection);
-
-	return TRUE;
-}
-
-static gboolean
-gal_a11y_e_table_item_unref_selection (GalA11yETableItem *a11y)
-{
-	GalA11yETableItemPrivate *priv;
-
-	g_return_val_if_fail (a11y, FALSE);
-
-	priv = GET_PRIVATE (a11y);
-
-	g_return_val_if_fail (priv->selection_change_id != 0, FALSE);
-	g_return_val_if_fail (priv->cursor_change_id != 0, FALSE);
-
-
-	g_signal_handler_disconnect (priv->selection,
-				     priv->selection_change_id);
-	g_signal_handler_disconnect (priv->selection,
-				     priv->cursor_change_id);
-	priv->cursor_change_id = 0;
-	priv->selection_change_id = 0;
-
-	g_object_unref (priv->selection);
-	priv->selection = NULL;
-
-	return TRUE;
-}
-
-/* callbacks */
-
-static void
-eti_a11y_selection_model_removed_cb (ETableItem *eti, ESelectionModel *selection,
-				     gpointer data)
-{
-	AtkObject *atk_obj;
-	GalA11yETableItem *a11y;
-
-	g_return_if_fail (E_IS_TABLE_ITEM (eti));
-	g_return_if_fail (E_IS_SELECTION_MODEL (selection));
-
-	atk_obj = atk_gobject_accessible_for_object (G_OBJECT (eti));
-	a11y = GAL_A11Y_E_TABLE_ITEM (atk_obj);
-
-	if (selection == GET_PRIVATE (a11y)->selection)
-		gal_a11y_e_table_item_unref_selection (a11y);
-}
-
-static void
-eti_a11y_selection_model_added_cb (ETableItem *eti, ESelectionModel *selection,
-				   gpointer data)
-{
-	AtkObject *atk_obj;
-	GalA11yETableItem *a11y;
-
-	g_return_if_fail (E_IS_TABLE_ITEM (eti));
-	g_return_if_fail (E_IS_SELECTION_MODEL (selection));
-
-	atk_obj = atk_gobject_accessible_for_object (G_OBJECT (eti));
-	a11y = GAL_A11Y_E_TABLE_ITEM (atk_obj);
-
-	if (GET_PRIVATE (a11y)->selection)
-		gal_a11y_e_table_item_unref_selection (a11y);
-	gal_a11y_e_table_item_ref_selection (a11y, selection);
-}
-
-static void
-eti_a11y_selection_changed_cb (ESelectionModel *selection, GalA11yETableItem *a11y)
-{
-	g_return_if_fail (GAL_A11Y_IS_E_TABLE_ITEM (a11y));
-
-	g_signal_emit_by_name (a11y, "selection_changed");
-}
-
-static void
-eti_a11y_cursor_changed_cb (ESelectionModel *selection,
-			    int row, int col,  GalA11yETableItem *a11y)
-{
-	AtkObject * cell;
-	g_return_if_fail (GAL_A11Y_IS_E_TABLE_ITEM (a11y));
-
-	g_signal_emit_by_name (a11y, "selection_changed");
-
-        cell = atk_table_ref_at (ATK_TABLE (a11y), row, col);
-        if (ATK_IS_OBJECT (cell))
-                g_signal_emit_by_name  (a11y,
-                                        "active-descendant-changed",
-                                        cell);
-}
-
-/* atk selection */
-
-static void atk_selection_interface_init (AtkSelectionIface *iface)
-{
-	g_return_if_fail (iface != NULL);
-	iface->add_selection = selection_add_selection;
-	iface->clear_selection = selection_clear_selection;
-	iface->ref_selection = selection_ref_selection;
-	iface->get_selection_count = selection_get_selection_count;
-	iface->is_child_selected = selection_is_child_selected;
-}
-
-static gboolean
-selection_add_selection (AtkSelection *selection, gint index)
-{
-	AtkTable *table;
-	gint row, col;
-	ETableItem *item;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (selection)));
-	if (!item)
-		return FALSE;
-
-	table = ATK_TABLE (selection);
-
-	row = atk_table_get_row_at_index (table, index);
-	atk_table_add_row_selection (table, row);
-
-	col = atk_table_get_column_at_index (table, index);
-	e_selection_model_change_cursor (item->selection,
-					 view_to_model_row (item, row),
-					 view_to_model_col (item, col));
-	e_selection_model_cursor_changed (item->selection,
-					  view_to_model_row (item, row),
-					  view_to_model_col (item, col));
-	e_selection_model_cursor_activated (item->selection,
-					    view_to_model_row (item, row),
-					    view_to_model_col (item, col));
-	return TRUE;
-}
-
-static gboolean
-selection_clear_selection (AtkSelection *selection)
-{
-	ETableItem *item;
-
-	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (selection)));
-	if (!item)
-		return FALSE;
-
-	e_selection_model_clear (item->selection);
-	return TRUE;
-}
-
-static AtkObject *
-selection_ref_selection (AtkSelection *selection, gint index)
-{
-	AtkTable *table;
-	gint row, col;
-
-	table = ATK_TABLE (selection);
-	row = atk_table_get_row_at_index (table, index);
-	col = atk_table_get_column_at_index (table, index);
-	if (!atk_table_is_row_selected (table, row))
-		return NULL;
-
-	return atk_table_ref_at (table, row, col);
-}
-
-static gint
-selection_get_selection_count (AtkSelection *selection)
-{
-	AtkTable *table;
-	gint n_selected;
-
-	table = ATK_TABLE (selection);
-	n_selected = atk_table_get_selected_rows (table, NULL);
-	if (n_selected > 0)
-		n_selected *= atk_table_get_n_columns (table);
-	return n_selected;
-}
-
-static gboolean
-selection_is_child_selected (AtkSelection *selection, gint i)
-{
-	gint row;
-
-	row = atk_table_get_row_at_index (ATK_TABLE (selection), i);
-	return atk_table_is_row_selected (ATK_TABLE (selection), row);
-}
diff --git a/a11y/e-table/gal-a11y-e-table-item.h b/a11y/e-table/gal-a11y-e-table-item.h
deleted file mode 100644
index f3a447131d..0000000000
--- a/a11y/e-table/gal-a11y-e-table-item.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2001 Chris Lahey
- */
-
-#ifndef __GAL_A11Y_E_TABLE_ITEM_H__
-#define __GAL_A11Y_E_TABLE_ITEM_H__
-
-#include <glib-object.h>
-#include <gal/e-table/e-table-item.h>
-#include <atk/atkgobjectaccessible.h>
-
-#define GAL_A11Y_TYPE_E_TABLE_ITEM            (gal_a11y_e_table_item_get_type ())
-#define GAL_A11Y_E_TABLE_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_TABLE_ITEM, GalA11yETableItem))
-#define GAL_A11Y_E_TABLE_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_A11Y_TYPE_E_TABLE_ITEM, GalA11yETableItemClass))
-#define GAL_A11Y_IS_E_TABLE_ITEM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_A11Y_TYPE_E_TABLE_ITEM))
-#define GAL_A11Y_IS_E_TABLE_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAL_A11Y_TYPE_E_TABLE_ITEM))
-
-typedef struct _GalA11yETableItem GalA11yETableItem;
-typedef struct _GalA11yETableItemClass GalA11yETableItemClass;
-typedef struct _GalA11yETableItemPrivate GalA11yETableItemPrivate;
-
-/* This struct should actually be larger as this isn't what we derive from.
- * The GalA11yETableItemPrivate comes right after the parent class structure.
- **/
-struct _GalA11yETableItem {
-	AtkGObjectAccessible parent;
-};
-
-struct _GalA11yETableItemClass {
-	AtkGObjectAccessibleClass parent_class;
-};
-
-
-/* Standard Glib function */
-GType      gal_a11y_e_table_item_get_type  (void);
-AtkObject *gal_a11y_e_table_item_new       (AtkObject  *parent,
-					    ETableItem *item,
-					    int         index_in_parent);
-
-#endif /* ! __GAL_A11Y_E_TABLE_ITEM_H__ */
diff --git a/a11y/e-table/gal-a11y-e-table.c b/a11y/e-table/gal-a11y-e-table.c
deleted file mode 100644
index 6cd87f41c6..0000000000
--- a/a11y/e-table/gal-a11y-e-table.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2002 Ximian, Inc.
- */
-
-#include <config.h>
-#include "gal-a11y-e-table.h"
-#include "gal-a11y-e-table-item.h"
-#include "gal-a11y-util.h"
-#include <gal/e-table/e-table.h>
-#include <gal/e-table/e-table-group.h>
-#include <gal/e-table/e-table-group-leaf.h>
-
-#define CS_CLASS(a11y) (G_TYPE_INSTANCE_GET_CLASS ((a11y), C_TYPE_STREAM, GalA11yETableClass))
-static AtkObjectClass *parent_class;
-static GType parent_type;
-static gint priv_offset;
-#define GET_PRIVATE(object) ((GalA11yETablePrivate *) (((char *) object) + priv_offset))
-#define PARENT_TYPE (parent_type)
-
-struct _GalA11yETablePrivate {
-	AtkObject *child_item;
-};
-
-/* Static functions */
-
-static void
-init_child_item (GalA11yETable *a11y)
-{
-	GalA11yETablePrivate *priv = GET_PRIVATE (a11y);
-	ETable *table = E_TABLE (GTK_ACCESSIBLE (a11y)->widget);
-	if (priv->child_item == NULL) {
-		priv->child_item = gal_a11y_e_table_item_new (ATK_OBJECT (a11y), E_TABLE_GROUP_LEAF (table->group)->item, 0);
-		priv->child_item->role = ATK_ROLE_TABLE;
-	}
-}
-
-static AtkObject*
-et_ref_accessible_at_point  (AtkComponent *component,
-			     gint x,
-			     gint y,
-			     AtkCoordType coord_type)
-{
-	GalA11yETable *a11y = GAL_A11Y_E_TABLE (component);
-	init_child_item (a11y);
-	return GET_PRIVATE (a11y)->child_item;
-}
-
-static gint
-et_get_n_children (AtkObject *accessible)
-{
-	return 1;
-}
-
-static AtkObject*
-et_ref_child (AtkObject *accessible,
-	      gint i)
-{
-	GalA11yETable *a11y = GAL_A11Y_E_TABLE (accessible);
-	if (i != 0)
-		return NULL;
-	init_child_item (a11y);
-	g_object_ref (GET_PRIVATE (a11y)->child_item);
-	return GET_PRIVATE (a11y)->child_item;
-}
-
-static void
-et_class_init (GalA11yETableClass *klass)
-{
-	AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass);
-
-	parent_class                              = g_type_class_ref (PARENT_TYPE);
-
-	atk_object_class->get_n_children          = et_get_n_children;
-	atk_object_class->ref_child               = et_ref_child;
-}
-
-static void
-et_atk_component_iface_init (AtkComponentIface *iface)
-{
-	iface->ref_accessible_at_point = et_ref_accessible_at_point;
-}
-
-static void
-et_init (GalA11yETable *a11y)
-{
-	GalA11yETablePrivate *priv;
-
-	priv = GET_PRIVATE (a11y);
-
-	priv->child_item = NULL;
-}
-
-/**
- * gal_a11y_e_table_get_type:
- * @void: 
- * 
- * Registers the &GalA11yETable class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &GalA11yETable class.
- **/
-GType
-gal_a11y_e_table_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		AtkObjectFactory *factory;
-
-		GTypeInfo info = {
-			sizeof (GalA11yETableClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) et_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL, /* class_data */
-			sizeof (GalA11yETable),
-			0,
-			(GInstanceInitFunc) et_init,
-			NULL /* value_table */
-		};
-
-		static const GInterfaceInfo atk_component_info = {
-			(GInterfaceInitFunc) et_atk_component_iface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		factory = atk_registry_get_factory (atk_get_default_registry (), GTK_TYPE_WIDGET);
-		parent_type = atk_object_factory_get_accessible_type (factory);
-
-		type = gal_a11y_type_register_static_with_private (PARENT_TYPE, "GalA11yETable", &info, 0,
-								   sizeof (GalA11yETablePrivate), &priv_offset);
-		g_type_add_interface_static (type, ATK_TYPE_COMPONENT, &atk_component_info);
-	}
-
-	return type;
-}
-
-AtkObject *
-gal_a11y_e_table_new (GObject *widget)
-{
-	GalA11yETable *a11y;
-	ETable *table;
-
-	table = E_TABLE (widget);
-
-	a11y = g_object_new (gal_a11y_e_table_get_type (), NULL);
-
-	GTK_ACCESSIBLE (a11y)->widget = GTK_WIDGET (widget);
-
-	return ATK_OBJECT (a11y);
-}
diff --git a/a11y/e-table/gal-a11y-e-table.h b/a11y/e-table/gal-a11y-e-table.h
deleted file mode 100644
index 0a0901e3bc..0000000000
--- a/a11y/e-table/gal-a11y-e-table.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2001 Chris Lahey
- */
-
-#ifndef __GAL_A11Y_E_TABLE_H__
-#define __GAL_A11Y_E_TABLE_H__
-
-#include <glib-object.h>
-#include <atk/atkobject.h>
-#include <atk/atkcomponent.h>
-#include <gtk/gtkaccessible.h>
-
-#define GAL_A11Y_TYPE_E_TABLE            (gal_a11y_e_table_get_type ())
-#define GAL_A11Y_E_TABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_TABLE, GalA11yETable))
-#define GAL_A11Y_E_TABLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_A11Y_TYPE_E_TABLE, GalA11yETableClass))
-#define GAL_A11Y_IS_E_TABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_A11Y_TYPE_E_TABLE))
-#define GAL_A11Y_IS_E_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAL_A11Y_TYPE_E_TABLE))
-
-typedef struct _GalA11yETable GalA11yETable;
-typedef struct _GalA11yETableClass GalA11yETableClass;
-typedef struct _GalA11yETablePrivate GalA11yETablePrivate;
-
-/* This struct should actually be larger as this isn't what we derive from.
- * The GalA11yETablePrivate comes right after the parent class structure.
- **/
-struct _GalA11yETable {
-	GtkAccessible object;
-};
-
-struct _GalA11yETableClass {
-	GtkAccessibleClass parent_class;
-};
-
-
-/* Standard Glib function */
-GType      gal_a11y_e_table_get_type  (void);
-AtkObject *gal_a11y_e_table_new       (GObject *table);
-
-#endif /* ! __GAL_A11Y_E_TABLE_H__ */
diff --git a/a11y/e-table/gal-a11y-e-tree-factory.c b/a11y/e-table/gal-a11y-e-tree-factory.c
deleted file mode 100644
index 2fa34c5fbc..0000000000
--- a/a11y/e-table/gal-a11y-e-tree-factory.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Authors: Yuedong Du <yuedong.du@sun.com>
- *
- * Copyright (C) 2003 Ximian, Inc.
- */
-
-#include <config.h>
-#include "gal-a11y-e-tree-factory.h"
-#include "gal-a11y-e-tree.h"
-
-#define CS_CLASS(factory) (G_TYPE_INSTANCE_GET_CLASS ((factory), C_TYPE_STREAM, GalA11yETreeFactoryClass))
-static AtkObjectFactoryClass *parent_class;
-#define PARENT_TYPE (ATK_TYPE_OBJECT_FACTORY)
-
-/* Static functions */
-
-static GType
-gal_a11y_e_tree_factory_get_accessible_type (void)
-{
-        return GAL_A11Y_TYPE_E_TREE;
-}
-
-static AtkObject*
-gal_a11y_e_tree_factory_create_accessible (GObject *obj)
-{
-	AtkObject *accessible;
-
-	accessible = gal_a11y_e_tree_new (obj);
-
-	return accessible;
-}
-
-static void
-gal_a11y_e_tree_factory_class_init (GalA11yETreeFactoryClass *klass)
-{
-	AtkObjectFactoryClass *factory_class = ATK_OBJECT_FACTORY_CLASS (klass);
-
-	parent_class = g_type_class_ref (PARENT_TYPE);
-
-	factory_class->create_accessible   = gal_a11y_e_tree_factory_create_accessible;
-	factory_class->get_accessible_type = gal_a11y_e_tree_factory_get_accessible_type;
-}
-
-static void
-gal_a11y_e_tree_factory_init (GalA11yETreeFactory *factory)
-{
-}
-
-/**
- * gal_a11y_e_tree_factory_get_type:
- * @void: 
- * 
- * Registers the &GalA11yETreeFactory class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &GalA11yETreeFactory class.
- **/
-GType
-gal_a11y_e_tree_factory_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		GTypeInfo info = {
-			sizeof (GalA11yETreeFactoryClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) gal_a11y_e_tree_factory_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL, /* class_data */
-			sizeof (GalA11yETreeFactory),
-			0,
-			(GInstanceInitFunc) gal_a11y_e_tree_factory_init,
-			NULL /* value_tree */
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "GalA11yETreeFactory", &info, 0);
-	}
-
-	return type;
-}
diff --git a/a11y/e-table/gal-a11y-e-tree-factory.h b/a11y/e-table/gal-a11y-e-tree-factory.h
deleted file mode 100644
index 434e526db9..0000000000
--- a/a11y/e-table/gal-a11y-e-tree-factory.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Authors: Yuedong Du <yuedong.du@ximian.com>
- *
- * Copyright (C) 2003 Ximian, Inc.
- */
-
-#ifndef __GAL_A11Y_E_TREE_FACTORY_H__
-#define __GAL_A11Y_E_TREE_FACTORY_H__
-
-#include <glib-object.h>
-#include <atk/atkobjectfactory.h>
-
-#define GAL_A11Y_TYPE_E_TREE_FACTORY            (gal_a11y_e_table_factory_get_type ())
-#define GAL_A11Y_E_TREE_FACTORY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_TREE_FACTORY, GalA11yETreeFactory))
-#define GAL_A11Y_E_TREE_FACTORY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_A11Y_TYPE_E_TREE_FACTORY, GalA11yETreeFactoryClass))
-#define GAL_A11Y_IS_E_TREE_FACTORY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_A11Y_TYPE_E_TREE_FACTORY))
-#define GAL_A11Y_IS_E_TREE_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAL_A11Y_TYPE_E_TREE_FACTORY))
-
-typedef struct _GalA11yETreeFactory GalA11yETreeFactory;
-typedef struct _GalA11yETreeFactoryClass GalA11yETreeFactoryClass;
-
-struct _GalA11yETreeFactory {
-	AtkObject object;
-};
-
-struct _GalA11yETreeFactoryClass {
-	AtkObjectClass parent_class;
-};
-
-
-/* Standard Glib function */
-GType              gal_a11y_e_tree_factory_get_type         (void);
-
-#endif /* ! __GAL_A11Y_E_TREE_FACTORY_H__ */
diff --git a/a11y/e-table/gal-a11y-e-tree.c b/a11y/e-table/gal-a11y-e-tree.c
deleted file mode 100644
index dc7755c6f2..0000000000
--- a/a11y/e-table/gal-a11y-e-tree.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Authors: Yuedong Du <yuedong.du@sun.com>
- *
- * Copyright (C) 2003 Ximian, Inc.
- */
-
-#include <config.h>
-#include "gal-a11y-e-tree.h"
-#include "gal-a11y-util.h"
-#include <gal/e-table/e-tree.h>
-#include <gal/e-table/e-table-item.h>
-
-#define CS_CLASS(a11y) (G_TYPE_INSTANCE_GET_CLASS ((a11y), C_TYPE_STREAM, GalA11yETreeClass))
-static AtkObjectClass *parent_class;
-static GType parent_type;
-static gint priv_offset;
-#define GET_PRIVATE(object) ((GalA11yETreePrivate *) (((char *) object) + priv_offset))
-#define PARENT_TYPE (parent_type)
-
-struct _GalA11yETreePrivate {
-	AtkObject *child_item;
-};
-
-/* Static functions */
-
-static void
-init_child_item (GalA11yETree *a11y)
-{
-	GalA11yETreePrivate *priv = GET_PRIVATE (a11y);
-	ETree *tree = E_TREE (GTK_ACCESSIBLE (a11y)->widget);
-	ETableItem * eti;
-
-	g_return_if_fail (tree);
-	eti = e_tree_get_item (tree);
-	if (priv->child_item == NULL) {
-		priv->child_item = gal_a11y_e_table_item_new (ATK_OBJECT (a11y),eti, 0);
-		g_return_if_fail (priv->child_item);
-		priv->child_item->role = ATK_ROLE_TREE_TABLE;
-	}
-}
-
-static AtkObject*
-et_ref_accessible_at_point  (AtkComponent *component,
-			     gint x,
-			     gint y,
-			     AtkCoordType coord_type)
-{
-	GalA11yETree *a11y = GAL_A11Y_E_TREE (component);
-	init_child_item (a11y);
-	return GET_PRIVATE (a11y)->child_item;
-}
-
-static gint
-et_get_n_children (AtkObject *accessible)
-{
-	return 1;
-}
-
-static AtkObject*
-et_ref_child (AtkObject *accessible,
-	      gint i)
-{
-	GalA11yETree *a11y = GAL_A11Y_E_TREE (accessible);
-	if (i != 0)
-		return NULL;
-	init_child_item (a11y);
-	g_object_ref (GET_PRIVATE (a11y)->child_item);
-	return GET_PRIVATE (a11y)->child_item;
-}
-
-static void
-et_class_init (GalA11yETreeClass *klass)
-{
-	AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass);
-
-	parent_class                              = g_type_class_ref (PARENT_TYPE);
-
-	atk_object_class->get_n_children          = et_get_n_children;
-	atk_object_class->ref_child               = et_ref_child;
-}
-
-static void
-et_atk_component_iface_init (AtkComponentIface *iface)
-{
-	iface->ref_accessible_at_point = et_ref_accessible_at_point;
-}
-
-static void
-et_init (GalA11yETree *a11y)
-{
-	GalA11yETreePrivate *priv;
-
-	priv = GET_PRIVATE (a11y);
-
-	priv->child_item = NULL;
-}
-
-/**
- * gal_a11y_e_tree_get_type:
- * @void: 
- * 
- * Registers the &GalA11yETree class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &GalA11yETree class.
- **/
-GType
-gal_a11y_e_tree_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		AtkObjectFactory *factory;
-
-		GTypeInfo info = {
-			sizeof (GalA11yETreeClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) et_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL, /* class_data */
-			sizeof (GalA11yETree),
-			0,
-			(GInstanceInitFunc) et_init,
-			NULL /* value_tree */
-		};
-
-		static const GInterfaceInfo atk_component_info = {
-			(GInterfaceInitFunc) et_atk_component_iface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		factory = atk_registry_get_factory (atk_get_default_registry (), GTK_TYPE_WIDGET);
-		parent_type = atk_object_factory_get_accessible_type (factory);
-
-		type = gal_a11y_type_register_static_with_private (PARENT_TYPE, "GalA11yETree", &info, 0,
-								   sizeof (GalA11yETreePrivate), &priv_offset);
-		g_type_add_interface_static (type, ATK_TYPE_COMPONENT, &atk_component_info);
-	}
-
-	return type;
-}
-
-AtkObject *
-gal_a11y_e_tree_new (GObject *widget)
-{
-	GalA11yETree *a11y;
-	ETree *tree;
-	AtkObject * item;
-
-	tree = E_TREE (widget);
-
-	a11y = g_object_new (gal_a11y_e_tree_get_type (), NULL);
-
-	GTK_ACCESSIBLE (a11y)->widget = GTK_WIDGET (widget);
-
-	return ATK_OBJECT (a11y);
-}
diff --git a/a11y/e-table/gal-a11y-e-tree.h b/a11y/e-table/gal-a11y-e-tree.h
deleted file mode 100644
index 65b8deb6cf..0000000000
--- a/a11y/e-table/gal-a11y-e-tree.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Authors: Yuedong Du <yuedong.du@sun.com>
- *
- * Copyright (C) 2003 Ximian, Inc.
- */
-
-#ifndef __GAL_A11Y_E_TREE_H__
-#define __GAL_A11Y_E_TREE_H__
-
-#include <glib-object.h>
-#include <atk/atkobject.h>
-#include <atk/atkcomponent.h>
-#include <gtk/gtkaccessible.h>
-
-#define GAL_A11Y_TYPE_E_TREE            (gal_a11y_e_tree_get_type ())
-#define GAL_A11Y_E_TREE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_TREE, GalA11yETree))
-#define GAL_A11Y_E_TREE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_A11Y_TYPE_E_TREE, GalA11yETreeClass))
-#define GAL_A11Y_IS_E_TREE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_A11Y_TYPE_E_TREE))
-#define GAL_A11Y_IS_E_TREE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAL_A11Y_TYPE_E_TREE))
-
-typedef struct _GalA11yETree GalA11yETree;
-typedef struct _GalA11yETreeClass GalA11yETreeClass;
-typedef struct _GalA11yETreePrivate GalA11yETreePrivate;
-
-/* This struct should actually be larger as this isn't what we derive from.
- * The GalA11yETablePrivate comes right after the parent class structure.
- **/
-struct _GalA11yETree {
-	GtkAccessible object;
-};
-
-struct _GalA11yETreeClass {
-	GtkAccessibleClass parent_class;
-};
-
-
-/* Standard Glib function */
-GType      gal_a11y_e_tree_get_type  (void);
-AtkObject *gal_a11y_e_tree_new       (GObject *tree);
-
-#endif /* ! __GAL_A11Y_E_TREE_H__ */
diff --git a/a11y/e-text/.cvsignore b/a11y/e-text/.cvsignore
deleted file mode 100644
index 5b48d3f593..0000000000
--- a/a11y/e-text/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-.libs
-Makefile.in
-Makefile
-*.la
diff --git a/a11y/e-text/gal-a11y-e-text-factory.c b/a11y/e-text/gal-a11y-e-text-factory.c
deleted file mode 100644
index 24e3c28116..0000000000
--- a/a11y/e-text/gal-a11y-e-text-factory.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2002 Ximian, Inc.
- */
-
-#include <config.h>
-#include "gal/e-text/e-text.h"
-#include "gal-a11y-e-text-factory.h"
-#include "gal-a11y-e-text.h"
-
-#define CS_CLASS(factory) (G_TYPE_INSTANCE_GET_CLASS ((factory), C_TYPE_STREAM, GalA11yETextFactoryClass))
-static AtkObjectFactoryClass *parent_class;
-#define PARENT_TYPE (ATK_TYPE_OBJECT_FACTORY)
-
-/* Static functions */
-
-static GType
-gal_a11y_e_text_factory_get_accessible_type (void)
-{
-        return GAL_A11Y_TYPE_E_TEXT;
-}
-
-static AtkObject*
-gal_a11y_e_text_factory_create_accessible (GObject *obj)
-{
-	AtkObject *atk_object;
-
-	g_return_val_if_fail (E_IS_TEXT (obj), NULL);
-
-	atk_object = g_object_new (GAL_A11Y_TYPE_E_TEXT, NULL);
-	atk_object_initialize (atk_object, obj);
-
-	return atk_object;
-}
-
-static void
-gal_a11y_e_text_factory_class_init (GalA11yETextFactoryClass *klass)
-{
-	AtkObjectFactoryClass *factory_class = ATK_OBJECT_FACTORY_CLASS (klass);
-
-	parent_class = g_type_class_ref (PARENT_TYPE);
-
-	factory_class->create_accessible   = gal_a11y_e_text_factory_create_accessible;
-	factory_class->get_accessible_type = gal_a11y_e_text_factory_get_accessible_type;
-}
-
-static void
-gal_a11y_e_text_factory_init (GalA11yETextFactory *factory)
-{
-}
-
-/**
- * gal_a11y_e_text_factory_get_type:
- * @void: 
- * 
- * Registers the &GalA11yETextFactory class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &GalA11yETextFactory class.
- **/
-GType
-gal_a11y_e_text_factory_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		GTypeInfo info = {
-			sizeof (GalA11yETextFactoryClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) gal_a11y_e_text_factory_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL, /* class_data */
-			sizeof (GalA11yETextFactory),
-			0,
-			(GInstanceInitFunc) gal_a11y_e_text_factory_init,
-			NULL /* value_text */
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "GalA11yETextFactory", &info, 0);
-	}
-
-	return type;
-}
diff --git a/a11y/e-text/gal-a11y-e-text-factory.h b/a11y/e-text/gal-a11y-e-text-factory.h
deleted file mode 100644
index 56a8d29ab9..0000000000
--- a/a11y/e-text/gal-a11y-e-text-factory.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2001 Chris Lahey
- */
-
-#ifndef __GAL_A11Y_E_TEXT_FACTORY_H__
-#define __GAL_A11Y_E_TEXT_FACTORY_H__
-
-#include <glib-object.h>
-#include <atk/atkobjectfactory.h>
-
-#define GAL_A11Y_TYPE_E_TEXT_FACTORY            (gal_a11y_e_text_factory_get_type ())
-#define GAL_A11Y_E_TEXT_FACTORY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_TEXT_FACTORY, GalA11yETextFactory))
-#define GAL_A11Y_E_TEXT_FACTORY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_A11Y_TYPE_E_TEXT_FACTORY, GalA11yETextFactoryClass))
-#define GAL_A11Y_IS_E_TEXT_FACTORY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_A11Y_TYPE_E_TEXT_FACTORY))
-#define GAL_A11Y_IS_E_TEXT_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAL_A11Y_TYPE_E_TEXT_FACTORY))
-
-typedef struct _GalA11yETextFactory GalA11yETextFactory;
-typedef struct _GalA11yETextFactoryClass GalA11yETextFactoryClass;
-
-struct _GalA11yETextFactory {
-	AtkObjectFactory object;
-};
-
-struct _GalA11yETextFactoryClass {
-	AtkObjectFactoryClass parent_class;
-};
-
-
-/* Standard Glib function */
-GType              gal_a11y_e_text_factory_get_type         (void);
-
-#endif /* ! __GAL_A11Y_E_TEXT_FACTORY_H__ */
diff --git a/a11y/e-text/gal-a11y-e-text.c b/a11y/e-text/gal-a11y-e-text.c
deleted file mode 100644
index be7835e17d..0000000000
--- a/a11y/e-text/gal-a11y-e-text.c
+++ /dev/null
@@ -1,1121 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2002 Ximian, Inc.
- */
-
-#include <config.h>
-#include "gal-a11y-e-text.h"
-#include "gal-a11y-util.h"
-#include <atk/atkobject.h>
-#include <atk/atktable.h>
-#include <atk/atkcomponent.h>
-#include <atk/atkobjectfactory.h>
-#include <atk/atkregistry.h>
-#include <atk/atkgobjectaccessible.h>
-#include "gal/e-text/e-text.h"
-#include "gal/e-text/e-text-model-repos.h"
-#include <gtk/gtkmain.h>
-
-#define CS_CLASS(a11y) (G_TYPE_INSTANCE_GET_CLASS ((a11y), C_TYPE_STREAM, GalA11yETextClass))
-static GObjectClass *parent_class;
-static AtkComponentIface *component_parent_iface;
-static GType parent_type;
-static gint priv_offset;
-static GQuark		quark_accessible_object = 0;
-#define GET_PRIVATE(object) ((GalA11yETextPrivate *) (((char *) object) + priv_offset))
-#define PARENT_TYPE (parent_type)
-
-struct _GalA11yETextPrivate {
-	int dummy;
-};
-
-static void
-et_dispose (GObject *object)
-{
-	if (parent_class->dispose)
-		parent_class->dispose (object);
-}
-
-/* Static functions */
-
-static void
-et_get_extents (AtkComponent *component,
-		gint *x,
-		gint *y,
-		gint *width,
-		gint *height,
-		AtkCoordType coord_type)
-{
-	EText *item = E_TEXT (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (component)));
-	double real_width;
-	double real_height;
-	int fake_width;
-	int fake_height;
-
-	if (component_parent_iface &&
-	    component_parent_iface->get_extents)
-		component_parent_iface->get_extents (component,
-						     x,
-						     y,
-						     &fake_width,
-						     &fake_height,
-						     coord_type);
-
-	gtk_object_get (GTK_OBJECT (item),
-			"text_width", &real_width,
-			"text_height", &real_height,
-			NULL);
-
-	if (width)
-		*width = real_width;
-	if (height) 
-		*height = real_height;
-}
-
-static const gchar *
-et_get_full_text (AtkText *text)
-{
-	EText *etext = E_TEXT (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text)));
-	ETextModel *model;
-	const char *full_text;
-
-	gtk_object_get (GTK_OBJECT (etext),
-			"model", &model,
-			NULL);
-
-	full_text = e_text_model_get_text (model);
-
-	return full_text;
-}
-
-static void
-et_set_full_text (AtkEditableText *text,
-		  const char *full_text)
-{
-	EText *etext = E_TEXT (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text)));
-	ETextModel *model;
-
-	gtk_object_get (GTK_OBJECT (etext),
-			"model", &model,
-			NULL);
-
-	e_text_model_set_text (model, full_text);
-}
-
-static gchar *
-et_get_text (AtkText *text,
-	     gint start_offset,
-	     gint end_offset)
-{
-        gint start, end, real_start, real_end, len;
-	const char *full_text = et_get_full_text (text);
-        if (full_text == NULL)
-                return;
-        len = g_utf8_strlen (full_text, -1);
-
-        start = MIN (MAX (0, start_offset), len);
-        end = MIN (MAX (-1, end_offset), len);
-
-	if (end_offset == -1)
-		end = strlen (full_text);
-	else
-		end = g_utf8_offset_to_pointer (full_text, end) - full_text;
-
-	start = g_utf8_offset_to_pointer (full_text, start) - full_text;
-
-	real_start = MIN (start, end);
-	real_end = MAX (start, end);
-
-	return g_strndup (full_text + real_start, real_end - real_start);
-}
-
-static gboolean
-is_a_seperator (gunichar c)
-{
-	return g_unichar_ispunct(c) || g_unichar_isspace(c);
-}
-
-static gint
-find_word_start (const char *text,
-		 gint begin_offset,
-		 gint step)
-{
-	gint offset;
-	char *at_offset;
-	gunichar current, previous;
-	gint len;
-
-	offset = begin_offset;
-	len = g_utf8_strlen (text, -1);
-
-	while (offset > 0 && offset < len) {
-		at_offset = g_utf8_offset_to_pointer (text, offset);
-		current = g_utf8_get_char_validated (at_offset, -1);
-		at_offset = g_utf8_offset_to_pointer (text, offset-1);
-		previous = g_utf8_get_char_validated (at_offset, -1);
-		if ((! is_a_seperator (current)) && is_a_seperator (previous))
-			break;
-		offset += step;
-	}
-
-	return offset;
-}
-
-static gint
-find_word_end (const char *text,
-	       gint begin_offset,
-	       gint step)
-{
-	gint offset;
-	char *at_offset;
-	gunichar current, previous;
-	gint len;
-
-	offset = begin_offset;
-	len = g_utf8_strlen (text, -1);
-
-	while (offset > 0 && offset < len) {
-		at_offset = g_utf8_offset_to_pointer (text, offset);
-		current = g_utf8_get_char_validated (at_offset, -1);
-		at_offset = g_utf8_offset_to_pointer (text, offset-1);
-		previous = g_utf8_get_char_validated (at_offset, -1);
-		if (is_a_seperator (current) && (! is_a_seperator (previous)))
-			break;
-		offset += step;
-	}
-
-	return offset;
-}
-
-static gint
-find_sentence_start (const char *text,
-		     gint begin_offset,
-		     gint step)
-{
-	gint offset, last_word_end, len;
-	char *at_offset;
-	gunichar ch;
-	int i;
-	
-	offset = find_word_start (text, begin_offset, step);
-	len = g_utf8_strlen (text, -1);
-
-	while (offset>0 && offset <len) {
-		last_word_end = find_word_end (text, offset - 1, -1);
-		if (last_word_end == 0)
-			break;
-		for (i = last_word_end; i < offset; i++) {
-			at_offset = g_utf8_offset_to_pointer (text, i);
-			ch = g_utf8_get_char_validated (at_offset, -1);
-			if (ch == '.' || ch == '!' || ch == '?')
-				return offset;
-		}
-
-		offset = find_word_start (text, offset + step, step);
-	}
-
-	return offset;
-}
-
-static gint
-find_sentence_end (const char *text,
-                   gint begin_offset,
-                   gint step)
-{
-        gint offset;
-        char *at_offset;
-        gunichar previous;
-        gint len;
-
-        offset = begin_offset;
-        len = g_utf8_strlen (text, -1);
-
-        while (offset > 0 && offset < len) {
-                at_offset = g_utf8_offset_to_pointer (text, offset - 1);
-                previous = g_utf8_get_char_validated (at_offset, -1);
-                if (previous == '.' || previous == '!' || previous == '?')
-                        break;
-                offset += step;
-        }
-
-        return offset;
-}
-
-static gint
-find_line_start (const char *text,
-                     gint begin_offset,
-                     gint step)
-{
-        gint offset;
-        char *at_offset;
-        gunichar previous;
-        gint len;
-
-        offset = begin_offset;
-        len = g_utf8_strlen (text, -1);
-
-        while (offset > 0 && offset < len) {
-                at_offset = g_utf8_offset_to_pointer (text, offset - 1);
-                previous = g_utf8_get_char_validated (at_offset, -1);
-                if (previous == '\n' || previous == '\r')
-                        break;
-                offset += step;
-        }
-
-        return offset;
-}
-
-static gint
-find_line_end (const char *text,
-                     gint begin_offset,
-                     gint step)
-{
-        gint offset;
-        char *at_offset;
-        gunichar current;
-        gint len;
-
-        offset = begin_offset;
-        len = g_utf8_strlen (text, -1);
-
-        while (offset >= 0 && offset < len) {
-                at_offset = g_utf8_offset_to_pointer (text, offset);
-                current = g_utf8_get_char_validated (at_offset, -1);
-                if (current == '\n' || current == '\r')
-                        break;
-                offset += step;
-        }
-
-        return offset;
-}
-
-static gchar *
-et_get_text_after_offset (AtkText *text,
-			  gint offset,
-			  AtkTextBoundary boundary_type,
-			  gint *start_offset,
-			  gint *end_offset)
-{
-        gint start, end, len;
-        const char *full_text = et_get_full_text (text);
-        g_return_val_if_fail (full_text, NULL);
-
-	switch (boundary_type)
-	{
-	case ATK_TEXT_BOUNDARY_CHAR:
-		start = offset + 1;
-		end = offset + 2;
-		break;
-	case ATK_TEXT_BOUNDARY_WORD_START:
-		start = find_word_start (full_text, offset + 1, 1);
-		end = find_word_start (full_text, start + 1, 1);
-		break;
-	case ATK_TEXT_BOUNDARY_WORD_END:
-		start = find_word_end (full_text, offset + 1, 1);
-		end = find_word_end (full_text, start + 1, 1);
-		break;
-	case ATK_TEXT_BOUNDARY_SENTENCE_START:
-		start = find_sentence_start (full_text, offset + 1, 1);
-		end = find_sentence_start (full_text, start + 1, 1);
-		break;
-	case ATK_TEXT_BOUNDARY_SENTENCE_END:
-		start = find_sentence_end (full_text, offset + 1, 1);
-		end = find_sentence_end (full_text, start + 1, 1);
-		break;
-	case ATK_TEXT_BOUNDARY_LINE_START:
-		start = find_line_start (full_text, offset + 1, 1);
-		end = find_line_start (full_text, start + 1, 1);
-		break;
-	case ATK_TEXT_BOUNDARY_LINE_END:
-		start = find_line_end (full_text, offset + 1, 1);
-		end = find_line_end (full_text, start + 1, 1);
-		break;
-	defalut:
-		return NULL;
-	}
-
-	len = g_utf8_strlen (full_text, -1);
-	if (start_offset)
-		*start_offset = MIN (MAX (0, start), len);
-	if (end_offset)
-		*end_offset = MIN (MAX (0, end), len);
-	return et_get_text (text, start, end);
-}
-
-static gchar *
-et_get_text_at_offset (AtkText *text,
-		       gint offset,
-		       AtkTextBoundary boundary_type,
-		       gint *start_offset,
-		       gint *end_offset)
-{
-	gint start, end, len;
-        const char *full_text = et_get_full_text (text);
-        g_return_val_if_fail (full_text, NULL);
-
-	switch (boundary_type)
-	{
-	case ATK_TEXT_BOUNDARY_CHAR:
-		start = offset;
-		end = offset + 1;
-		break;
-	case ATK_TEXT_BOUNDARY_WORD_START:
-		start = find_word_start (full_text, offset - 1, -1);
-		end = find_word_start (full_text, offset, 1);
-		break;
-	case ATK_TEXT_BOUNDARY_WORD_END:
-		start = find_word_end (full_text, offset, -1);
-		end = find_word_end (full_text, offset + 1, 1);
-		break;
-	case ATK_TEXT_BOUNDARY_SENTENCE_START:
-		start = find_sentence_start (full_text, offset - 1, -1);
-                end = find_sentence_start (full_text, offset, 1);
- 		break;
-	case ATK_TEXT_BOUNDARY_SENTENCE_END:
-	        start = find_sentence_end (full_text, offset, -1);
-                end = find_sentence_end (full_text, offset + 1, 1);
-		break;
-	case ATK_TEXT_BOUNDARY_LINE_START:
-	        start = find_line_start (full_text, offset - 1, -1);
-                end = find_line_start (full_text, offset, 1);
- 		break;
-	case ATK_TEXT_BOUNDARY_LINE_END:
-		start = find_line_end (full_text, offset, -1);
-                end = find_line_end (full_text, offset + 1, 1);
- 		break;
-	defalut:
-		return NULL;
-	}
-
-	len = g_utf8_strlen (full_text, -1);
-	if (start_offset)
-		*start_offset = MIN (MAX (0, start), len);
-	if (end_offset)
-		*end_offset = MIN (MAX (0, end), len);
-	return et_get_text (text, start, end);
-}
-
-static gunichar
-et_get_character_at_offset (AtkText *text,
-			    gint offset)
-{
-	const char *full_text = et_get_full_text (text);
-	char *at_offset;
-
-	at_offset = g_utf8_offset_to_pointer (full_text, offset);
-	return g_utf8_get_char_validated (at_offset, -1);
-}
-
-
-static gchar*
-et_get_text_before_offset (AtkText *text,
-			   gint offset,
-			   AtkTextBoundary boundary_type,
-			   gint *start_offset,
-			   gint *end_offset)
-{
-        gint start, end, len;
-        const char *full_text = et_get_full_text (text);
-        g_return_val_if_fail (full_text, NULL);
-
-	switch (boundary_type)
-	{
-	case ATK_TEXT_BOUNDARY_CHAR:
-		start = offset - 1;
-		end = offset;
-		break;
-	case ATK_TEXT_BOUNDARY_WORD_START:
-		end = find_word_start (full_text, offset - 1, -1);
-		start = find_word_start (full_text, end - 1, -1) ;
-		break;
-	case ATK_TEXT_BOUNDARY_WORD_END:
-		end = find_word_end (full_text, offset, -1);
-		start = find_word_end (full_text, end - 1, -1);
-		break;
-	case ATK_TEXT_BOUNDARY_SENTENCE_START:
-		end = find_sentence_start (full_text, offset, -1);
-		start = find_sentence_start (full_text, end - 1, -1);
- 		break;
-	case ATK_TEXT_BOUNDARY_SENTENCE_END:
-	        end = find_sentence_end (full_text, offset, -1);
-                start = find_sentence_end (full_text, end - 1, -1);
- 		break;
-	case ATK_TEXT_BOUNDARY_LINE_START:
-	        end = find_line_start (full_text, offset, -1);
-                start = find_line_start (full_text, end - 1, -1);
- 		break;
-	case ATK_TEXT_BOUNDARY_LINE_END:
-	        end = find_line_end (full_text, offset, -1);
-                start = find_line_end (full_text, end - 1, -1);
- 		break;
-	default:
-		return NULL;
-	}
-
-	len = g_utf8_strlen (full_text, -1);
-	if (start_offset)
-		*start_offset = MIN (MAX (0, start), len);
-	if (end_offset)
-		*end_offset = MIN (MAX (0, end), len);
-	return et_get_text (text, start, end);
-}
-
-static gint
-et_get_caret_offset (AtkText *text)
-{
-	GObject *obj;
-	EText *etext;
-	int offset;
-
-	g_return_val_if_fail (ATK_IS_GOBJECT_ACCESSIBLE(text), -1);
-	obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text));
-	if (obj == NULL)
-		return -1;
-
-	g_return_val_if_fail (E_IS_TEXT (obj), -1);
-	etext = E_TEXT (obj);
-
-	gtk_object_get (GTK_OBJECT (etext),
-			"cursor_pos", &offset,
-			NULL);
-	return offset;
-}
-
-
-static AtkAttributeSet*
-et_get_run_attributes (AtkText *text,
-		       gint offset,
-		       gint *start_offset,
-		       gint *end_offset)
-{
-	/* Unimplemented */
-	return NULL;
-}
-
-
-static AtkAttributeSet*
-et_get_default_attributes (AtkText *text)
-{
-	/* Unimplemented */
-	return NULL;
-}
-
-
-static void
-et_get_character_extents (AtkText *text,
-			  gint offset,
-			  gint *x,
-			  gint *y,
-			  gint *width,
-			  gint *height,
-			  AtkCoordType coords)
-{
-        GObject *obj;
-        EText *etext;
-        GnomeCanvas *canvas;
-        gint x_widget, y_widget, x_window, y_window;
-        GdkWindow *window;
-        GtkWidget *widget;
-        int index;
-        int trailing;
-	PangoRectangle pango_pos;
-
-        g_return_if_fail (ATK_IS_GOBJECT_ACCESSIBLE(text));
-        obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text));
-        if (obj == NULL)
-            return;
-        g_return_if_fail (E_IS_TEXT (obj));
-        etext = E_TEXT(obj);
-        canvas = GNOME_CANVAS_ITEM(etext)->canvas;
-        widget = GTK_WIDGET(canvas);
-        window = widget->window;
-        gdk_window_get_origin (window, &x_widget, &y_widget);
-
-	pango_layout_index_to_pos (etext->layout, offset, &pango_pos);
-	pango_pos.x = PANGO_PIXELS (pango_pos.x);
-	pango_pos.y = PANGO_PIXELS (pango_pos.y);
-	pango_pos.width = (pango_pos.width + PANGO_SCALE / 2) / PANGO_SCALE;
-	pango_pos.height = (pango_pos.height + PANGO_SCALE / 2) / PANGO_SCALE;
-
-        *x = pango_pos.x + x_widget;
-        *y = pango_pos.y + y_widget;
-
-	*width  = pango_pos.width;
-	*height = pango_pos.height;
-
-        if (etext->draw_borders) {
-                *x += 3; /*BORDER_INDENT;*/
-                *y += 3; /*BORDER_INDENT;*/
-        }
-
-        *x += etext->xofs;
-        *y += etext->yofs;
-
-        if (etext->editing) {
-                *x -= etext->xofs_edit;
-                *y -= etext->yofs_edit;
-        }
-
-        *x += etext->cx;
-        *y += etext->cy;
-
-	if (coords == ATK_XY_WINDOW) {
-		window = gdk_window_get_toplevel (window);
-		gdk_window_get_origin (window, &x_window, &y_window);
-		*x -= x_window;
-	        *y -= y_window;
-    	}
-	else if (coords == ATK_XY_SCREEN) {
-	}
-	else {
-		*x = 0;
-		*y = 0;
-		*height = 0;
-		*width = 0;
-	}
-}
-
-
-static gint
-et_get_character_count (AtkText *text)
-{
-	const char *full_text = et_get_full_text (text);
-
-	return g_utf8_strlen (full_text, -1);
-}
-
-
-static gint
-et_get_offset_at_point (AtkText *text,
-			gint x,
-			gint y,
-			AtkCoordType coords)
-{
-        GObject *obj;
-        EText *etext;
-        GnomeCanvas *canvas;
-	gint x_widget, y_widget, x_window, y_window;
-	GdkWindow *window;
-        GtkWidget *widget;
-        int index;
-        int trailing;
-
-        g_return_val_if_fail (ATK_IS_GOBJECT_ACCESSIBLE(text), -1);
-        obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text));
-        if (obj == NULL)
-            return -1;
-        g_return_val_if_fail (E_IS_TEXT (obj), -1);
-        etext = E_TEXT(obj);
-        canvas = GNOME_CANVAS_ITEM(etext)->canvas;
-        widget = GTK_WIDGET(canvas);
-	window = widget->window;
-	gdk_window_get_origin (window, &x_widget, &y_widget);
-
-	if (coords == ATK_XY_SCREEN) {
-		x = x - x_widget;
-		y = y - y_widget;
-	}
-	else if (coords == ATK_XY_WINDOW) {
-		window = gdk_window_get_toplevel (window);
-		gdk_window_get_origin (window, &x_window, &y_window);
-		x = x - x_widget + x_window;
-		y = y - y_widget + y_window;
-	}
-	else
-		return -1;
-
-        if (etext->draw_borders) {
-                x -= 3; /*BORDER_INDENT;*/
-                y -= 3; /*BORDER_INDENT;*/
-        }
-
-        x -= etext->xofs;
-        y -= etext->yofs;
-
-        if (etext->editing) {
-                x += etext->xofs_edit;
-                y += etext->yofs_edit;
-        }
-
-        x -= etext->cx;
-        y -= etext->cy;
-
-        pango_layout_xy_to_index (etext->layout,
-				  x * PANGO_SCALE - PANGO_SCALE / 2,
-				  y * PANGO_SCALE - PANGO_SCALE / 2,
-				  &index,
-				  &trailing);
-
-        return g_utf8_pointer_to_offset (etext->text, etext->text + index + trailing);
-}
-
-
-static gint 
-et_get_n_selections (AtkText *text)
-{
-	EText *etext = E_TEXT (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text)));
-	if (etext->selection_start !=
-	    etext->selection_end)
-		return 1;
-	return 0;
-}
-
-
-static gchar*
-et_get_selection (AtkText *text,
-		  gint selection_num,
-		  gint *start_offset,
-		  gint *end_offset)
-{
-	gint start, end, real_start, real_end, len;
-	EText *etext;
-	if (selection_num == 0) {
-		const char *full_text = et_get_full_text (text);
-		if (full_text == NULL)
-			return NULL;
-		len = g_utf8_strlen (full_text, -1);
-		etext = E_TEXT (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text)));
-		start = MIN (etext->selection_start, etext->selection_end);
-		end = MAX (etext->selection_start, etext->selection_end);
-		start = MIN (MAX (0, start), len);
-		end = MIN (MAX (0, end), len);
-		if (start != end) {
-			if (start_offset)
-				*start_offset = start;
-			if (end_offset)
-				*end_offset = end;
-			real_start = g_utf8_offset_to_pointer (full_text, start) - full_text;
-			real_end = g_utf8_offset_to_pointer (full_text, end) - full_text;
-			return g_strndup (full_text + real_start, real_end - real_start);
-		}
-	}
-
-	return NULL;
-}
-
-
-static gboolean
-et_add_selection (AtkText *text,
-		  gint start_offset,
-		  gint end_offset)
-{
-	GObject *obj;
-	EText *etext;
-
-	g_return_val_if_fail (ATK_IS_GOBJECT_ACCESSIBLE (text), FALSE);
-	obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text));
-	if (obj == NULL)
-		return FALSE;
-	g_return_val_if_fail (E_IS_TEXT (obj), FALSE);
-	etext = E_TEXT (obj);
-
-	g_return_val_if_fail (start_offset >= 0, FALSE);
-	g_return_val_if_fail (start_offset >= -1, FALSE);
-	if (end_offset == -1)
-		end_offset = et_get_character_count (text);
-
-	if (start_offset != end_offset) {
-		gint real_start, real_end;
-		real_start = MIN (start_offset, end_offset);
-		real_end = MAX (start_offset, end_offset);
-		etext->selection_start = real_start;
-		etext->selection_end = real_end;
-
-		gnome_canvas_item_grab_focus (GNOME_CANVAS_ITEM (etext));
-		gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (etext));
-
-		g_signal_emit_by_name (ATK_OBJECT (text), "text_selection_changed");
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-
-static gboolean
-et_remove_selection (AtkText *text,
-		     gint selection_num)
-{
-	GObject *obj;
-	EText *etext;
-
-	g_return_val_if_fail (ATK_IS_GOBJECT_ACCESSIBLE (text), FALSE);
-	obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text));
-	if (obj == NULL)
-		return FALSE;
-	g_return_val_if_fail (E_IS_TEXT (obj), FALSE);
-	etext = E_TEXT (obj);
-
-	if (selection_num == 0 
-	    && etext->selection_start != etext->selection_end) {
-		etext->selection_end = etext->selection_start;
-		g_signal_emit_by_name (ATK_OBJECT(text), "text_selection_changed");
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-
-static gboolean
-et_set_selection (AtkText *text,
-		  gint selection_num,
-		  gint start_offset,
-		  gint end_offset)
-{
-	GObject *obj;
-	EText *etext;
-	int offset;
-
-	g_return_val_if_fail (ATK_IS_GOBJECT_ACCESSIBLE (text), FALSE);
-	obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text));
-	if (obj == NULL)
-		return FALSE;
-	g_return_val_if_fail (E_IS_TEXT (obj), FALSE);
-	etext = E_TEXT (obj);
-	if (selection_num == 0)
-                return et_add_selection (text, start_offset, end_offset);
-        return FALSE;
-}
-
-
-static gboolean
-et_set_caret_offset (AtkText *text,
-		     gint offset)
-{
-	GObject *obj;
-	EText *etext;
-
-	g_return_val_if_fail (ATK_IS_GOBJECT_ACCESSIBLE (text), FALSE);
-	obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text));
-	if (obj == NULL)
-		return FALSE;
-
-	g_return_val_if_fail (E_IS_TEXT (obj), FALSE);
-	etext = E_TEXT (obj);
-                                                                                
-	if (offset < -1)
-		return FALSE;
-	else {
-		ETextEventProcessorCommand command;
-
-		if (offset == -1)
-			offset = et_get_character_count (text);
-
-		command.action = E_TEP_MOVE;
-		command.position = E_TEP_VALUE;
-		command.value = offset;
-		command.time = GDK_CURRENT_TIME;
-		g_signal_emit_by_name (etext->tep, "command", &command);
-		return TRUE;
-	}
-}
-
-static gboolean
-et_set_run_attributes (AtkEditableText *text,
-		       AtkAttributeSet *attrib_set,
-		       gint start_offset,
-		       gint end_offset)
-{
-	/* Unimplemented */
-	return FALSE;
-}
-
-static void
-et_set_text_contents (AtkEditableText *text,
-		      const gchar *string)
-{
-	et_set_full_text (text, string);
-}
-
-static void
-et_insert_text (AtkEditableText *text,
-		const gchar *string,
-		gint length,
-		gint *position)
-{
-	/* Utf8 unimplemented */
-	char *result;
-
-	const char *full_text = et_get_full_text (ATK_TEXT (text));
-	if (full_text == NULL)
-		return;
-
-	result = g_strdup_printf ("%.*s%.*s%s", *position, full_text, length, string, full_text + *position);
-
-	et_set_full_text (text, result);
-
-	*position += length;
-
-	g_free (result);
-}
-
-static void
-et_copy_text (AtkEditableText *text,
-	      gint start_pos,
-	      gint end_pos)
-{
-	GObject *obj;
-	EText *etext;
-
-	g_return_if_fail (ATK_IS_GOBJECT_ACCESSIBLE (text));
-	obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text));
-	if (obj == NULL)
-		return;
-
-	g_return_if_fail (E_IS_TEXT (obj));
-	etext = E_TEXT (obj);
-
-	if (start_pos != end_pos) {
-		etext->selection_start = start_pos;
-		etext->selection_end = end_pos;
-		e_text_copy_clipboard (etext);
-	}
-}
-
-static void
-et_delete_text (AtkEditableText *text,
-		gint start_pos,
-		gint end_pos)
-{
-	GObject *obj;
-	EText *etext;
-
-	g_return_if_fail (ATK_IS_GOBJECT_ACCESSIBLE(text));
-	obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text));
-	if (obj == NULL)
-		return;
-
-	g_return_if_fail (E_IS_TEXT (obj));
-	etext = E_TEXT (obj);
-
-	etext->selection_start = start_pos;
-	etext->selection_end = end_pos;
-
-	e_text_delete_selection (etext);
-}
-
-static void
-et_cut_text (AtkEditableText *text,
-	     gint start_pos,
-	     gint end_pos)
-{
-	et_copy_text (text, start_pos, end_pos);
-	et_delete_text (text, start_pos, end_pos);
-}
-
-static void
-et_paste_text (AtkEditableText *text,
-	       gint position)
-{
-	GObject *obj;
-	EText *etext;
-
-	g_return_if_fail (ATK_IS_GOBJECT_ACCESSIBLE (text));
-	obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text));
-	if (obj == NULL)
-		return;
-
-	g_return_if_fail (E_IS_TEXT (obj));
-	etext = E_TEXT (obj);
-
-	gtk_object_set (GTK_OBJECT (etext),
-			"cursor_pos", position,
-			NULL);
-	e_text_paste_clipboard (etext);
-}
-
-static void
-et_atk_component_iface_init (AtkComponentIface *iface)
-{
-	iface->get_extents = et_get_extents;
-}
-
-static void
-et_atk_text_iface_init (AtkTextIface *iface)
-{
-	iface->get_text                = et_get_text;
-	iface->get_text_after_offset   = et_get_text_after_offset;
-	iface->get_text_at_offset      = et_get_text_at_offset;
-	iface->get_character_at_offset = et_get_character_at_offset;
-	iface->get_text_before_offset  = et_get_text_before_offset;
-	iface->get_caret_offset        = et_get_caret_offset;
-	iface->get_run_attributes      = et_get_run_attributes;
-	iface->get_default_attributes  = et_get_default_attributes;
-	iface->get_character_extents   = et_get_character_extents;
-	iface->get_character_count     = et_get_character_count;
-	iface->get_offset_at_point     = et_get_offset_at_point;
-	iface->get_n_selections        = et_get_n_selections;
-	iface->get_selection           = et_get_selection;
-	iface->add_selection           = et_add_selection;
-	iface->remove_selection        = et_remove_selection;
-	iface->set_selection           = et_set_selection;
-	iface->set_caret_offset        = et_set_caret_offset;
-}
-
-static void
-et_atk_editable_text_iface_init (AtkEditableTextIface *iface)
-{
-	iface->set_run_attributes = et_set_run_attributes;
-	iface->set_text_contents  = et_set_text_contents;
-	iface->insert_text        = et_insert_text;
-	iface->copy_text          = et_copy_text;
-	iface->cut_text           = et_cut_text;
-	iface->delete_text        = et_delete_text;
-	iface->paste_text         = et_paste_text;
-}
-
-static void
-_et_reposition_cb (ETextModel *model,
-		   ETextModelReposFn fn,
-		   gpointer repos_data,
-		   gpointer user_data)
-{
-	AtkObject *accessible;
-	AtkText *text;
-
-	accessible = ATK_OBJECT (user_data);
-	text = ATK_TEXT (accessible);
-
-	if (fn == e_repos_delete_shift) {
-		EReposDeleteShift *info = (EReposDeleteShift *) repos_data;
-		g_signal_emit_by_name (text, "text-changed::delete", info->pos, info->len);
-	}
-	else if (fn == e_repos_insert_shift) {
-		EReposInsertShift *info = (EReposInsertShift *) repos_data;
-		g_signal_emit_by_name (text, "text-changed::insert", info->pos, info->len);
-	}
-}
-
-static void
-_et_command_cb (ETextEventProcessor *tep,
-		ETextEventProcessorCommand *command,
-		gpointer user_data)
-{
-	AtkObject *accessible;
-	AtkText *text;
-
-	accessible = ATK_OBJECT (user_data);
-	text = ATK_TEXT (accessible);
-
-	switch (command->action) {
-	case E_TEP_MOVE:
-		g_signal_emit_by_name (text, "text-caret-moved", et_get_caret_offset (text));
-		break;
-	case E_TEP_SELECT:
-		g_signal_emit_by_name (text, "text-selection-changed");
-		break;
-	}
-}
-
-static void
-et_real_initialize (AtkObject *obj,
-                    gpointer  data)
-{
-	GalA11yEText *a11y;
-	EText *etext;
-
-	ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
-
-	g_return_if_fail (GAL_A11Y_IS_E_TEXT (obj));
-	g_return_if_fail (E_IS_TEXT (data));
-
-	a11y = GAL_A11Y_E_TEXT (obj);
-	etext = E_TEXT (data);
-
-	/* Set up signal callbacks */
-	g_signal_connect (etext->model, "reposition",
-		G_CALLBACK (_et_reposition_cb), obj);
-
-	g_signal_connect_after (etext->tep, "command",
-		(GCallback) _et_command_cb, obj);
-                                                                              
-	obj->role = ATK_ROLE_TEXT;
-}
-
-static void
-et_class_init (GalA11yETextClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
-
-	quark_accessible_object               = g_quark_from_static_string ("gtk-accessible-object");
-	parent_class                          = g_type_class_ref (PARENT_TYPE);
-	component_parent_iface                = g_type_interface_peek(parent_class, ATK_TYPE_COMPONENT);
-	object_class->dispose                 = et_dispose;
-	atk_class->initialize                 = et_real_initialize;
-}
-
-static void
-et_init (GalA11yEText *a11y)
-{
-#if 0
-	GalA11yETextPrivate *priv;
-
-	priv = GET_PRIVATE (a11y);
-#endif
-}
-
-/**
- * gal_a11y_e_text_get_type:
- * @void: 
- * 
- * Registers the &GalA11yEText class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &GalA11yEText class.
- **/
-GType
-gal_a11y_e_text_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		AtkObjectFactory *factory;
-
-		GTypeInfo info = {
-			sizeof (GalA11yETextClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) et_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL, /* class_data */
-			sizeof (GalA11yEText),
-			0,
-			(GInstanceInitFunc) et_init,
-			NULL /* value_text */
-		};
-
-		static const GInterfaceInfo atk_component_info = {
-			(GInterfaceInitFunc) et_atk_component_iface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-		static const GInterfaceInfo atk_text_info = {
-			(GInterfaceInitFunc) et_atk_text_iface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-		static const GInterfaceInfo atk_editable_text_info = {
-			(GInterfaceInitFunc) et_atk_editable_text_iface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		factory = atk_registry_get_factory (atk_get_default_registry (), GNOME_TYPE_CANVAS_ITEM);
-		parent_type = atk_object_factory_get_accessible_type (factory);
-
-		type = gal_a11y_type_register_static_with_private (PARENT_TYPE, "GalA11yEText", &info, 0,
-								   sizeof (GalA11yETextPrivate), &priv_offset);
-
-		g_type_add_interface_static (type, ATK_TYPE_COMPONENT, &atk_component_info);
-		g_type_add_interface_static (type, ATK_TYPE_TEXT, &atk_text_info);
-		g_type_add_interface_static (type, ATK_TYPE_EDITABLE_TEXT, &atk_editable_text_info);
-	}
-
-	return type;
-}
diff --git a/a11y/e-text/gal-a11y-e-text.h b/a11y/e-text/gal-a11y-e-text.h
deleted file mode 100644
index 66d2d6283b..0000000000
--- a/a11y/e-text/gal-a11y-e-text.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2001 Chris Lahey
- */
-
-#ifndef __GAL_A11Y_E_TEXT_H__
-#define __GAL_A11Y_E_TEXT_H__
-
-#include <glib-object.h>
-#include <gal/e-table/e-table-item.h>
-
-#define GAL_A11Y_TYPE_E_TEXT            (gal_a11y_e_text_get_type ())
-#define GAL_A11Y_E_TEXT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_TEXT, GalA11yEText))
-#define GAL_A11Y_E_TEXT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_A11Y_TYPE_E_TEXT, GalA11yETextClass))
-#define GAL_A11Y_IS_E_TEXT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_A11Y_TYPE_E_TEXT))
-#define GAL_A11Y_IS_E_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAL_A11Y_TYPE_E_TEXT))
-
-typedef struct _GalA11yEText GalA11yEText;
-typedef struct _GalA11yETextClass GalA11yETextClass;
-typedef struct _GalA11yETextPrivate GalA11yETextPrivate;
-
-/* This struct should actually be larger as this isn't what we derive from.
- * The GalA11yETextPrivate comes right after the parent class structure.
- **/
-struct _GalA11yEText {
-	AtkObject object;
-};
-
-struct _GalA11yETextClass {
-	AtkObject parent_class;
-};
-
-
-/* Standard Glib function */
-GType      gal_a11y_e_text_get_type  (void);
-
-#endif /* ! __GAL_A11Y_E_TEXT_H__ */
diff --git a/a11y/ea-cell-table.c b/a11y/ea-cell-table.c
deleted file mode 100644
index 80f5ecbaaa..0000000000
--- a/a11y/ea-cell-table.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-cell-table.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-cell-table.h"
-
-EaCellTable *
-ea_cell_table_create (gint rows, gint columns, gboolean column_first)
-{
-	EaCellTable * cell_data;
-	gint index;
-
-	g_return_val_if_fail (((columns > 0) && (rows > 0)), NULL);
-
-	cell_data = g_new0 (EaCellTable, 1);
-
-	cell_data->column_first = column_first;
-	cell_data->columns = columns;
-	cell_data->rows = rows;
-
-	cell_data->column_labels = g_new0 (gchar*, columns);
-	for (index = columns -1; index >= 0; --index)
-		cell_data->column_labels [index] = NULL;
-
-	cell_data->row_labels = g_new0 (gchar*, rows);
-	for (index = rows -1; index >= 0; --index)
-		cell_data->row_labels [index] = NULL;
-
-	cell_data->cells = g_new0(gpointer, (columns * rows));
-	for (index = (columns * rows) -1; index >= 0; --index)
-		cell_data->cells [index] = NULL;
-	return cell_data;
-}
-
-void
-ea_cell_table_destroy (EaCellTable * cell_data)
-{
-	gint index;
-	g_return_if_fail (cell_data);
-
-	g_print ("destroy cell table (%d, %d)\n", cell_data->rows,
-		  cell_data->columns);
-	for (index = 0; index < cell_data->columns; ++index)
-		if (cell_data->column_labels [index])
-			g_free (cell_data->column_labels [index]);
-	g_free (cell_data->column_labels);
-
-	for (index = 0; index < cell_data->rows; ++index)
-		if (cell_data->row_labels [index])
-			g_free (cell_data->row_labels [index]);
-	g_free (cell_data->row_labels);
-
-	for (index = (cell_data->columns * cell_data->rows) -1;
-	     index >= 0; --index)
-		if (cell_data->cells[index] &&
-		    G_IS_OBJECT (cell_data->cells[index]))
-			g_object_unref (cell_data->cells[index]);
-
-	g_free (cell_data->cells);
-}
-
-gpointer
-ea_cell_table_get_cell (EaCellTable * cell_data,
-			gint row, gint column)
-{
-	gint index;
-
-	g_return_val_if_fail (cell_data, NULL);
-
-	index = ea_cell_table_get_index (cell_data, column, row);
-	if (index == -1)
-		return NULL;
-
-	return cell_data->cells[index];
-}
-
-gboolean
-ea_cell_table_set_cell (EaCellTable * cell_data,
-			gint row, gint column, gpointer cell)
-{
-	gint index;
-
-	g_return_val_if_fail (cell_data, FALSE);
-
-	index = ea_cell_table_get_index (cell_data, column, row);
-	if (index == -1)
-		return FALSE;
-
-	if (cell && G_IS_OBJECT(cell))
-		g_object_ref (cell);
-	if (cell_data->cells[index] &&
-	    G_IS_OBJECT (cell_data->cells[index]))
-		g_object_unref (cell_data->cells[index]);
-	cell_data->cells[index] = cell;
-
-	return TRUE;
-}
-
-gpointer
-ea_cell_table_get_cell_at_index (EaCellTable * cell_data,
-				 gint index)
-{
-	g_return_val_if_fail (cell_data, NULL);
-
-	if (index >=0 && index < (cell_data->columns * cell_data->rows))
-		return cell_data->cells [index];
-	return NULL;
-}
-
-gboolean
-ea_cell_table_set_cell_at_index (EaCellTable * cell_data,
-				 gint index, gpointer cell)
-{
-	g_return_val_if_fail (cell_data, FALSE);
-
-	if (index < 0 || index >=cell_data->columns * cell_data->rows)
-		return FALSE;
-
-	if (cell && G_IS_OBJECT(cell))
-		g_object_ref (cell);
-	if (cell_data->cells[index] &&
-	    G_IS_OBJECT (cell_data->cells[index]))
-		g_object_unref (cell_data->cells[index]);
-	cell_data->cells[index] = cell;
-
-	return TRUE;
-}
-
-G_CONST_RETURN gchar*
-ea_cell_table_get_column_label (EaCellTable * cell_data,
-				gint column)
-{
-	g_return_val_if_fail (cell_data, NULL);
-	g_return_val_if_fail ((column >= 0 && column < cell_data->columns), NULL);
-
-	return cell_data->column_labels[column];
-}
-
-void
-ea_cell_table_set_column_label (EaCellTable * cell_data,
-				gint column, const gchar *label)
-{
-	g_return_if_fail (cell_data);
-	g_return_if_fail ((column >= 0 && column < cell_data->columns));
-
-	if (cell_data->column_labels[column])
-		g_free (cell_data->column_labels[column]);
-	cell_data->column_labels[column] = g_strdup(label);
-}
-
-G_CONST_RETURN gchar*
-ea_cell_table_get_row_label (EaCellTable * cell_data,
-			     gint row)
-{
-	g_return_val_if_fail (cell_data, NULL);
-	g_return_val_if_fail ((row >= 0 && row < cell_data->rows), NULL);
-
-	return cell_data->row_labels[row];
-}
-
-void
-ea_cell_table_set_row_label (EaCellTable * cell_data,
-			     gint row, const gchar *label)
-{
-	g_return_if_fail (cell_data);
-	g_return_if_fail ((row >= 0 && row < cell_data->rows));
-
-	if (cell_data->row_labels[row])
-		g_free (cell_data->row_labels[row]);
-	cell_data->row_labels[row] = g_strdup(label);
-}
-
-gint
-ea_cell_table_get_index (EaCellTable *cell_data,
-			 gint row, gint column)
-{
-	g_return_val_if_fail (cell_data, -1);
-	if (row < 0 || row >= cell_data->rows ||
-	    column < 0 || column >= cell_data->columns)
-		return -1;
-
-	if (cell_data->column_first)
-		return column * cell_data->rows + row;
-	else
-		return row * cell_data->columns + column;
-}
diff --git a/a11y/ea-cell-table.h b/a11y/ea-cell-table.h
deleted file mode 100644
index 932fe8b4fd..0000000000
--- a/a11y/ea-cell-table.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-table-cell.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-/* EaCellTable */
-
-#include <glib.h>
-#include <glib-object.h>
-
-struct _EaCellTable {
-	gint columns;
-	gint rows;
-	gboolean column_first;     /* index order */
-	gchar **column_labels;
-	gchar **row_labels;
-	gpointer *cells;
-};
-
-typedef struct _EaCellTable EaCellTable;
-
-EaCellTable * ea_cell_table_create (gint rows, gint columns,
-				    gboolean column_first);
-void ea_cell_table_destroy (EaCellTable * cell_data);
-gpointer ea_cell_table_get_cell (EaCellTable * cell_data,
-				   gint row, gint column);
-gboolean ea_cell_table_set_cell (EaCellTable * cell_data,
-				 gint row, gint column, gpointer cell);
-gpointer ea_cell_table_get_cell_at_index (EaCellTable * cell_data,
-					  gint index);
-gboolean ea_cell_table_set_cell_at_index (EaCellTable * cell_data,
-					  gint index, gpointer cell);
-
-G_CONST_RETURN gchar*
-ea_cell_table_get_column_label (EaCellTable * cell_data, gint column);
-void ea_cell_table_set_column_label (EaCellTable * cell_data,
-				     gint column, const gchar *label);
-G_CONST_RETURN gchar*
-ea_cell_table_get_row_label (EaCellTable * cell_data, gint row);
-void ea_cell_table_set_row_label (EaCellTable * cell_data,
-				  gint row, const gchar *label);
-gint ea_cell_table_get_index (EaCellTable *cell_data,
-			      gint row, gint column);
diff --git a/a11y/ea-factory.h b/a11y/ea-factory.h
deleted file mode 100644
index 06ae612d6f..0000000000
--- a/a11y/ea-factory.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-factory.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-/* Evolution Accessibility
-*/
-
-#ifndef _EA_FACTORY_H__
-#define _EA_FACTORY_H__
-
-#include <glib-object.h>
-#include <atk/atkobject.h>
-
-#define EA_FACTORY_PARTA_GOBJECT(type, type_as_function, opt_create_accessible)	\
-static AtkObject*								\
-type_as_function ## _factory_create_accessible (GObject *obj)			\
-{                                                                               \
-  AtkObject *accessible;							\
-  g_return_val_if_fail (G_IS_OBJECT (obj), NULL);				\
-  accessible = opt_create_accessible (G_OBJECT (obj));	                 	\
-  return accessible;	                                                        \
-}
-
-#define EA_FACTORY_PARTA(type, type_as_function, opt_create_accessible)	        \
-static AtkObject*								\
-type_as_function ## _factory_create_accessible (GObject *obj)			\
-{                                                                               \
-  GtkWidget *widget;								\
-  AtkObject *accessible;							\
-                                                                                \
-  g_return_val_if_fail (GTK_IS_WIDGET (obj), NULL);				\
-										\
-  widget = GTK_WIDGET (obj);							\
-										\
-  accessible = opt_create_accessible (widget);					\
-  return accessible;	                                                        \
-}
-
-#define EA_FACTORY_PARTB(type, type_as_function, opt_create_accessible)	        \
-										\
-static GType									\
-type_as_function ## _factory_get_accessible_type (void)				\
-{										\
-  return type;									\
-}										\
-										\
-										\
-static void									\
-type_as_function ## _factory_class_init (AtkObjectFactoryClass *klass)		\
-{										\
-  klass->create_accessible   = type_as_function ## _factory_create_accessible;	\
-  klass->get_accessible_type = type_as_function ## _factory_get_accessible_type;\
-}										\
-										\
-static GType									\
-type_as_function ## _factory_get_type (void)					\
-{										\
-  static GType t = 0;								\
-										\
-  if (!t)									\
-  {										\
-    char *name;									\
-    static const GTypeInfo tinfo =						\
-    {										\
-      sizeof (AtkObjectFactoryClass),				         	\
-      NULL, NULL, (GClassInitFunc) type_as_function ## _factory_class_init,	\
-      NULL, NULL, sizeof (AtkObjectFactory), 0, NULL, NULL			\
-    };										\
-										\
-    name = g_strconcat (g_type_name (type), "Factory", NULL);			\
-    t = g_type_register_static (						\
-	    ATK_TYPE_OBJECT_FACTORY, name, &tinfo, 0);				\
-    g_free (name);								\
-  }										\
-										\
-  return t;									\
-}
-
-#define EA_FACTORY(type, type_as_function, opt_create_accessible)	        \
-        EA_FACTORY_PARTA(type, type_as_function, opt_create_accessible)	        \
-        EA_FACTORY_PARTB(type, type_as_function, opt_create_accessible)
-
-#define EA_FACTORY_GOBJECT(type, type_as_function, opt_create_accessible)	\
-        EA_FACTORY_PARTA_GOBJECT(type, type_as_function, opt_create_accessible)	\
-        EA_FACTORY_PARTB(type, type_as_function, opt_create_accessible)
-
-#define EA_SET_FACTORY(obj_type, type_as_function)		         	\
-	atk_registry_set_factory_type (atk_get_default_registry (),		\
-				       obj_type,				\
-				       type_as_function ## _factory_get_type ())
-
-#endif /* _EA_FACTORY_H__ */
diff --git a/a11y/gal-a11y-factory.h b/a11y/gal-a11y-factory.h
deleted file mode 100644
index 22da85eca8..0000000000
--- a/a11y/gal-a11y-factory.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* GAL A11Y
- * gal-a11y-factory.h
- *
- * Copyright 2003 Ximian Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors:
- *  Gilbert Fang <gilbert.fang@sun.com>, Sun Microsystem Inc. 2003.
- *
- * This file is mainly from the gailfactory.h of GAIL. 
- */
-
-#ifndef _GAL_A11Y_FACTORY_H__
-#define _GAL_A11Y_FACTORY_H__
-
-#include <glib-object.h>
-#include <atk/atkobject.h>
-#include <atk/atkobjectfactory.h>
-
-#define GAL_A11Y_FACTORY(type, type_as_function, opt_create_accessible)	\
-										\
-static GType									\
-type_as_function ## _factory_get_accessible_type (void)				\
-{										\
-  return type;									\
-}										\
-										\
-static AtkObject*								\
-type_as_function ## _factory_create_accessible (GObject *obj)			\
-{										\
-  GtkWidget *widget;								\
-  AtkObject *accessible;							\
-										\
-  g_return_val_if_fail (GTK_IS_WIDGET (obj), NULL);				\
-										\
-  widget = GTK_WIDGET (obj);							\
-										\
-  accessible = opt_create_accessible (widget);					\
-										\
-  return accessible;								\
-}										\
-										\
-static void									\
-type_as_function ## _factory_class_init (AtkObjectFactoryClass *klass)		\
-{										\
-  klass->create_accessible   = type_as_function ## _factory_create_accessible;	\
-  klass->get_accessible_type = type_as_function ## _factory_get_accessible_type;\
-}										\
-										\
-static GType									\
-type_as_function ## _factory_get_type (void)					\
-{										\
-  static GType t = 0;								\
-										\
-  if (!t)									\
-  {										\
-    char *name;									\
-    static const GTypeInfo tinfo =						\
-    {										\
-      sizeof (AtkObjectFactoryClass),					\
-      NULL, NULL, (GClassInitFunc) type_as_function ## _factory_class_init,			\
-      NULL, NULL, sizeof (AtkObjectFactory), 0, NULL, NULL			\
-    };										\
-										\
-    name = g_strconcat (g_type_name (type), "Factory", NULL);			\
-    t = g_type_register_static (						\
-	    ATK_TYPE_OBJECT_FACTORY, name, &tinfo, 0);				\
-    g_free (name);								\
-  }										\
-										\
-  return t;									\
-}
-
-#define GAL_A11Y_WIDGET_SET_FACTORY(widget_type, type_as_function)			\
-	atk_registry_set_factory_type (atk_get_default_registry (),		\
-				       widget_type,				\
-				       type_as_function ## _factory_get_type ())
-
-#endif /* _GAL_A11Y_FACTORY_H__ */
diff --git a/a11y/gal-a11y-util.c b/a11y/gal-a11y-util.c
deleted file mode 100644
index 0cf7c69dbb..0000000000
--- a/a11y/gal-a11y-util.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2002 Ximian, Inc.
- */
-
-#include <config.h>
-#include "gal-a11y-util.h"
-
-GType
-gal_a11y_type_register_static_with_private  (GType            parent_type,
-					     const gchar     *type_name,
-					     GTypeInfo *info,
-					     GTypeFlags       flags,
-					     gint             priv_size,
-					     gint            *priv_offset)
-{
-	GTypeQuery query;
-
-	g_type_query (parent_type, &query);
-
-	info->class_size = query.class_size;
-	info->instance_size = query.instance_size + priv_size;
-
-	if (priv_offset)
-		*priv_offset = query.instance_size;
-
-	return g_type_register_static (parent_type, type_name, info, flags);
-}
diff --git a/a11y/gal-a11y-util.h b/a11y/gal-a11y-util.h
deleted file mode 100644
index b7f742b122..0000000000
--- a/a11y/gal-a11y-util.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2001 Chris Lahey
- */
-
-#ifndef __GAL_A11Y_UTIL_H__
-#define __GAL_A11Y_UTIL_H__
-
-#include <glib-object.h>
-
-GType  gal_a11y_type_register_static_with_private  (GType        parent_type,
-						    const gchar *type_name,
-						    GTypeInfo   *info,
-						    GTypeFlags   flags,
-						    int          priv_size,
-						    gint        *priv_offset);
-
-#endif /* ! __GAL_A11Y_UTIL_H__ */
diff --git a/a11y/widgets/.cvsignore b/a11y/widgets/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/a11y/widgets/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/a11y/widgets/Makefile.am b/a11y/widgets/Makefile.am
deleted file mode 100644
index 2480c3bba7..0000000000
--- a/a11y/widgets/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-
-# for debug
-#A11Y_CFLAGS += -pedantic -ansi -DACC_DEBUG -Werror
-
-privlib_LTLIBRARIES = libevolution-widgets-a11y.la
-
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"evolution-a11y\"		\
-	-I$(top_srcdir)/widgets				\
-	-I$(top_srcdir)/a11y				\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
-	-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\"	\
-	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"	\
-	-DPREFIX=\""$(prefix)"\"			\
-	$(A11Y_CFLAGS)					\
-	$(EVOLUTION_CALENDAR_CFLAGS)
-
-libevolution_widgets_a11y_la_SOURCES =		\
-	ea-calendar-item.c			\
-	ea-calendar-item.h			\
-	ea-calendar-cell.c			\
-	ea-calendar-cell.h			\
-	ea-widgets.c				\
-	ea-widgets.h
-
-libevolution_widgets_a11y_la_LIBADD =   \
-        $(top_builddir)/a11y/libevolution-a11y.la
-                                                                                
diff --git a/a11y/widgets/ea-calendar-cell.c b/a11y/widgets/ea-calendar-cell.c
deleted file mode 100644
index 4b0fe75156..0000000000
--- a/a11y/widgets/ea-calendar-cell.c
+++ /dev/null
@@ -1,305 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-calendar-cell.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-calendar-cell.h"
-#include "ea-calendar-item.h"
-#include "ea-factory.h"
-
-/* ECalendarCell */
-
-static void e_calendar_cell_class_init (ECalendarCellClass *class);
-
-EA_FACTORY_GOBJECT (EA_TYPE_CALENDAR_CELL, ea_calendar_cell, ea_calendar_cell_new)
-
-GType
-e_calendar_cell_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (ECalendarCellClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) e_calendar_cell_class_init, /* class init */
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (ECalendarCell), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		type = g_type_register_static (G_TYPE_OBJECT,
-					       "ECalendarCell", &tinfo, 0);
-	}
-
-	return type;
-}
-
-static void
-e_calendar_cell_class_init (ECalendarCellClass *class)
-{
-    EA_SET_FACTORY (e_calendar_cell_get_type (), ea_calendar_cell);
-}
-
-ECalendarCell *
-e_calendar_cell_new (ECalendarItem *calitem, gint row, gint column)
-{
-	GObject *object;
-	ECalendarCell *cell;
-
-	g_return_val_if_fail (E_IS_CALENDAR_ITEM (calitem), NULL);
-
-	object = g_object_new (E_TYPE_CALENDAR_CELL, NULL);
-	cell = E_CALENDAR_CELL (object);
-	cell->calitem = calitem;
-	cell->row = row;
-	cell->column = column;
-
-#ifdef ACC_DEBUG
-	g_print ("EvoAcc: e_calendar_cell created %p\n", (void *)cell);
-#endif
-
-	return cell;
-}
-
-/* EaCalendarCell */
-
-static void ea_calendar_cell_class_init (EaCalendarCellClass *klass);
-
-static G_CONST_RETURN gchar* ea_calendar_cell_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_calendar_cell_get_description (AtkObject *accessible);
-static AtkObject * ea_calendar_cell_get_parent (AtkObject *accessible);
-
-/* component interface */
-static void atk_component_interface_init (AtkComponentIface *iface);
-static void component_interface_get_extents (AtkComponent *component,
-					     gint *x, gint *y,
-					     gint *width, gint *height,
-					     AtkCoordType coord_type);
-
-static gpointer parent_class = NULL;
-
-#ifdef ACC_DEBUG
-static gint n_ea_calendar_cell_created = 0, n_ea_calendar_cell_destroyed = 0;
-static void ea_calendar_cell_finalize (GObject *object);
-#endif
-
-GType
-ea_calendar_cell_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (EaCalendarCellClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) ea_calendar_cell_class_init, /* class init */
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (EaCalendarCell), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		static const GInterfaceInfo atk_component_info = {
-			(GInterfaceInitFunc) atk_component_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		type = g_type_register_static (ATK_TYPE_GOBJECT_ACCESSIBLE,
-					       "EaCalendarCell", &tinfo, 0);
-		g_type_add_interface_static (type, ATK_TYPE_COMPONENT,
-					     &atk_component_info);
-	}
-
-	return type;
-}
-
-static void
-ea_calendar_cell_class_init (EaCalendarCellClass *klass)
-{
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-
-#ifdef ACC_DEBUG
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-	gobject_class->finalize = ea_calendar_cell_finalize;
-#endif
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	class->get_name = ea_calendar_cell_get_name;
-	class->get_description = ea_calendar_cell_get_description;
-
-	class->get_parent = ea_calendar_cell_get_parent;
-}
-
-AtkObject* 
-ea_calendar_cell_new (GObject *obj)
-{
-	gpointer object;
-	AtkObject *atk_object;
-
-	g_return_val_if_fail (E_IS_CALENDAR_CELL (obj), NULL);
-	object = g_object_new (EA_TYPE_CALENDAR_CELL, NULL);
-	atk_object = ATK_OBJECT (object);
-	atk_object_initialize (atk_object, obj);
-	atk_object->role = ATK_ROLE_TABLE_CELL;
-
-#ifdef ACC_DEBUG
-	++n_ea_calendar_cell_created;
-	g_print ("ACC_DEBUG: n_ea_calendar_cell_created = %d\n",
-		n_ea_calendar_cell_created);
-#endif
-	return atk_object;
-}
-
-#ifdef ACC_DEBUG
-static void ea_calendar_cell_finalize (GObject *object)
-{
-	++n_ea_calendar_cell_destroyed;
-	g_print ("ACC_DEBUG: n_ea_calendar_cell_destroyed = %d\n",
-		n_ea_calendar_cell_destroyed);
-}
-#endif
-
-static G_CONST_RETURN gchar*
-ea_calendar_cell_get_name (AtkObject *accessible)
-{
-	GObject *g_obj;
-
-	g_return_val_if_fail (EA_IS_CALENDAR_CELL (accessible), NULL);
-
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(accessible));
-	if (!g_obj)
-		/* defunct object*/
-		return NULL;
-
-	if (!accessible->name) {
-		AtkObject *atk_obj;
-		EaCalendarItem *ea_calitem;
-		ECalendarCell *cell;
-		gint day_index;
-		gint year, month, day;
-		gchar buffer[128];
-
-		cell = E_CALENDAR_CELL (g_obj);
-		atk_obj = ea_calendar_cell_get_parent (accessible);
-		ea_calitem = EA_CALENDAR_ITEM (atk_obj);
-		day_index = atk_table_get_index_at (ATK_TABLE (ea_calitem),
-						    cell->row, cell->column);
-		e_calendar_item_get_date_for_offset (cell->calitem, day_index,
-						     &year, &month, &day);
-
-		g_snprintf (buffer, 128, "%d-%d-%d", year, month + 1, day);
-		ATK_OBJECT_CLASS (parent_class)->set_name (accessible, buffer);
-	}
-	return accessible->name;
-}
-
-static G_CONST_RETURN gchar*
-ea_calendar_cell_get_description (AtkObject *accessible)
-{
-	return ea_calendar_cell_get_name (accessible);
-}
-
-static AtkObject *
-ea_calendar_cell_get_parent (AtkObject *accessible)
-{
-	GObject *g_obj;
-	ECalendarCell *cell;
-	ECalendarItem *calitem;
-
-	g_return_val_if_fail (EA_IS_CALENDAR_CELL (accessible), NULL);
-
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(accessible));
-	if (!g_obj)
-		/* defunct object*/
-		return NULL;
-
-	cell = E_CALENDAR_CELL (g_obj);
-	calitem = cell->calitem;
-	return atk_gobject_accessible_for_object (G_OBJECT (calitem));
-}
-
-/* Atk Component Interface */
-
-static void 
-atk_component_interface_init (AtkComponentIface *iface)
-{
-	g_return_if_fail (iface != NULL);
-
-	iface->get_extents = component_interface_get_extents;
-}
-
-static void 
-component_interface_get_extents (AtkComponent *component,
-				 gint *x, gint *y, gint *width, gint *height,
-				 AtkCoordType coord_type)
-{
-	GObject *g_obj;
-	AtkObject *atk_obj, *atk_canvas;
-	ECalendarCell *cell;
-	ECalendarItem *calitem;
-	EaCalendarItem *ea_calitem;
-	gint day_index;
-	gint year, month, day;
-	gint canvas_x, canvas_y, canvas_width, canvas_height;
-
-	*x = *y = *width = *height = 0;
-
-	g_return_if_fail (EA_IS_CALENDAR_CELL (component));
-
-
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(component));
-	if (!g_obj)
-		/* defunct object*/
-		return;
-
-	cell = E_CALENDAR_CELL (g_obj);
-	calitem = cell->calitem;
-	atk_obj = atk_gobject_accessible_for_object (G_OBJECT (calitem));
-	ea_calitem = EA_CALENDAR_ITEM (atk_obj);
-	day_index = atk_table_get_index_at (ATK_TABLE (ea_calitem),
-					    cell->row, cell->column);
-	e_calendar_item_get_date_for_offset (calitem, day_index,
-					     &year, &month, &day);
-
-	if (!e_calendar_item_get_day_extents (calitem,
-					      year, month, day,
-					      x, y, width, height))
-	    return;
-	atk_canvas = atk_object_get_parent (ATK_OBJECT (ea_calitem));
-	atk_component_get_extents (ATK_COMPONENT (atk_canvas),
-					     &canvas_x, &canvas_y,
-					     &canvas_width, &canvas_height,
-					     coord_type);
-	*x += canvas_x;
-	*y += canvas_y;
-}
diff --git a/a11y/widgets/ea-calendar-cell.h b/a11y/widgets/ea-calendar-cell.h
deleted file mode 100644
index f87ede90a7..0000000000
--- a/a11y/widgets/ea-calendar-cell.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-calendar-cell.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#ifndef __EA_CALENDAR_CELL_H__
-#define __EA_CALENDAR_CELL_H__
-
-#include <atk/atkgobjectaccessible.h>
-#include "misc/e-calendar-item.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_TYPE_CALENDAR_CELL                     (e_calendar_cell_get_type ())
-#define E_CALENDAR_CELL(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CALENDAR_CELL, ECalendarCell))
-#define E_CALENDAR_CELL_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CALENDAR_CELL, ECalendarCellClass))
-#define E_IS_CALENDAR_CELL(obj)                  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CALENDAR_CELL))
-#define E_IS_CALENDAR_CELL_CLASS(klass)          (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_CALENDAR_CELL))
-#define E_CALENDAR_CELL_GET_CLASS(obj)           (G_TYPE_INSTANCE_GET_CLASS ((obj), E_TYPE_CALENDAR_CELL, ECalendarCellClass))
-
-typedef struct _ECalendarCell                   ECalendarCell;
-typedef struct _ECalendarCellClass              ECalendarCellClass;
-
-struct _ECalendarCell
-{
-	GObject parent;
-	ECalendarItem *calitem;
-	gint row;
-	gint column;
-};
-
-GType e_calendar_cell_get_type (void);
-
-struct _ECalendarCellClass
-{
-	GObjectClass parent_class;
-};
-
-ECalendarCell * e_calendar_cell_new (ECalendarItem *calitem,
-				     gint row, gint column);
-
-#define EA_TYPE_CALENDAR_CELL                     (ea_calendar_cell_get_type ())
-#define EA_CALENDAR_CELL(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_CALENDAR_CELL, EaCalendarCell))
-#define EA_CALENDAR_CELL_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_CALENDAR_CELL, EaCalendarCellClass))
-#define EA_IS_CALENDAR_CELL(obj)                  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_CALENDAR_CELL))
-#define EA_IS_CALENDAR_CELL_CLASS(klass)          (G_TYPE_CHECK_CLASS_TYPE ((klass), EA_TYPE_CALENDAR_CELL))
-#define EA_CALENDAR_CELL_GET_CLASS(obj)           (G_TYPE_INSTANCE_GET_CLASS ((obj), EA_TYPE_CALENDAR_CELL, EaCalendarCellClass))
-
-typedef struct _EaCalendarCell                   EaCalendarCell;
-typedef struct _EaCalendarCellClass              EaCalendarCellClass;
-
-struct _EaCalendarCell
-{
-	AtkGObjectAccessible parent;
-};
-
-GType ea_calendar_cell_get_type (void);
-
-struct _EaCalendarCellClass
-{
-	AtkGObjectAccessibleClass parent_class;
-};
-
-AtkObject*     ea_calendar_cell_new         (GObject *gobj);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __EA_CALENDAR_CELL_H__ */
diff --git a/a11y/widgets/ea-calendar-item.c b/a11y/widgets/ea-calendar-item.c
deleted file mode 100644
index 6170e7f50c..0000000000
--- a/a11y/widgets/ea-calendar-item.c
+++ /dev/null
@@ -1,1247 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-calendar-item.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include <stdio.h>
-#include <time.h>
-#include <string.h>
-#include <libgnomecanvas/gnome-canvas.h>
-#include <glib/gdate.h>
-#include "ea-calendar-item.h"
-#include "ea-calendar-cell.h"
-#include "ea-cell-table.h"
-
-#define EA_CALENDAR_COLUMN_NUM E_CALENDAR_COLS_PER_MONTH
-
-/* EaCalendarItem */
-static void ea_calendar_item_class_init (EaCalendarItemClass *klass);
-static void ea_calendar_item_finalize (GObject *object);
-
-static G_CONST_RETURN gchar* ea_calendar_item_get_name (AtkObject *accessible);
-static G_CONST_RETURN gchar* ea_calendar_item_get_description (AtkObject *accessible);
-static gint ea_calendar_item_get_n_children (AtkObject *accessible);
-static AtkObject *ea_calendar_item_ref_child (AtkObject *accessible, gint index);
-
-/* atk table interface */
-static void atk_table_interface_init (AtkTableIface *iface);
-static gint table_interface_get_index_at (AtkTable *table,
-					  gint     row,
-					  gint     column);
-static gint table_interface_get_column_at_index (AtkTable *table,
-						 gint     index);
-static gint table_interface_get_row_at_index (AtkTable *table,
-					      gint     index);
-static AtkObject* table_interface_ref_at (AtkTable *table,
-					  gint     row, 
-					  gint     column);
-static gint table_interface_get_n_rows (AtkTable *table);
-static gint table_interface_get_n_columns (AtkTable *table);
-static gint table_interface_get_column_extent_at (AtkTable      *table,
-						  gint          row,
-						  gint          column);
-static gint table_interface_get_row_extent_at (AtkTable      *table,
-					       gint          row,
-					       gint          column);
-
-static gboolean table_interface_is_row_selected (AtkTable *table,
-						 gint     row);
-static gboolean table_interface_is_column_selected (AtkTable *table,
-						    gint     row);
-static gboolean table_interface_is_selected (AtkTable *table,
-					     gint     row,
-					     gint     column);
-static gint table_interface_get_selected_rows (AtkTable *table,
-					       gint **rows_selected);
-static gint table_interface_get_selected_columns (AtkTable *table,
-						  gint     **columns_selected);
-static gboolean table_interface_add_row_selection (AtkTable *table, gint row);
-static gboolean table_interface_remove_row_selection (AtkTable *table,
-						      gint row);
-static gboolean table_interface_add_column_selection (AtkTable *table,
-						      gint column);
-static gboolean table_interface_remove_column_selection (AtkTable *table,
-							 gint column);
-static AtkObject* table_interface_get_row_header (AtkTable *table, gint row);
-static AtkObject* table_interface_get_column_header (AtkTable *table,
-						     gint in_col);
-static AtkObject* table_interface_get_caption (AtkTable *table);
-
-static G_CONST_RETURN gchar*
-table_interface_get_column_description (AtkTable *table, gint in_col);
-
-static G_CONST_RETURN gchar*
-table_interface_get_row_description (AtkTable *table, gint row);
-
-static AtkObject* table_interface_get_summary (AtkTable *table);
-
-/* atk selection interface */
-static void atk_selection_interface_init (AtkSelectionIface *iface);
-static gboolean selection_interface_add_selection (AtkSelection *selection,
-						   gint i);
-static gboolean selection_interface_clear_selection (AtkSelection *selection);
-static AtkObject* selection_interface_ref_selection (AtkSelection *selection,
-						     gint i);
-static gint selection_interface_get_selection_count (AtkSelection *selection);
-static gboolean selection_interface_is_child_selected (AtkSelection *selection,
-						       gint i);
-
-/* callbacks */
-static void selection_preview_change_cb (ECalendarItem *calitem);
-static void date_range_changed_cb (ECalendarItem *calitem);
-static void selection_changed_cb (ECalendarItem *calitem);
-
-/* helpers */
-static EaCellTable *ea_calendar_item_get_cell_data (EaCalendarItem *ea_calitem);
-static void ea_calendar_item_destory_cell_data (EaCalendarItem *ea_calitem);
-static gboolean ea_calendar_item_get_column_label (EaCalendarItem *ea_calitem,
-						   gint column,
-						   gchar *buffer,
-						   gint buffer_size);
-static gboolean ea_calendar_item_get_row_label (EaCalendarItem *ea_calitem,
-						gint row,
-						gchar *buffer,
-						gint buffer_size);
-
-#ifdef ACC_DEBUG
-static gint n_ea_calendar_item_created = 0;
-static gint n_ea_calendar_item_destroyed = 0;
-#endif
-
-static gpointer parent_class = NULL;
-
-GType
-ea_calendar_item_get_type (void)
-{
-	static GType type = 0;
-	AtkObjectFactory *factory;
-	GTypeQuery query;
-	GType derived_atk_type;
-
-	if (!type) {
-		static GTypeInfo tinfo = {
-			sizeof (EaCalendarItemClass),
-			(GBaseInitFunc) NULL, /* base init */
-			(GBaseFinalizeFunc) NULL, /* base finalize */
-			(GClassInitFunc) ea_calendar_item_class_init, /* class init */
-			(GClassFinalizeFunc) NULL, /* class finalize */
-			NULL, /* class data */
-			sizeof (EaCalendarItem), /* instance size */
-			0, /* nb preallocs */
-			(GInstanceInitFunc) NULL, /* instance init */
-			NULL /* value table */
-		};
-
-		static const GInterfaceInfo atk_table_info = {
-			(GInterfaceInitFunc) atk_table_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-		static const GInterfaceInfo atk_selection_info = {
-			(GInterfaceInitFunc) atk_selection_interface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		/*
-		 * Figure out the size of the class and instance
-		 * we are run-time deriving from (GailCanvasItem, in this case)
-		 */
-
-		factory = atk_registry_get_factory (atk_get_default_registry (),
-						    GNOME_TYPE_CANVAS_ITEM);
-		derived_atk_type = atk_object_factory_get_accessible_type (factory);
-		g_type_query (derived_atk_type, &query);
-
-		tinfo.class_size = query.class_size;
-		tinfo.instance_size = query.instance_size;
-
-		type = g_type_register_static (derived_atk_type,
-					       "EaCalendarItem", &tinfo, 0);
-		g_type_add_interface_static (type, ATK_TYPE_TABLE,
-					     &atk_table_info);
-		g_type_add_interface_static (type, ATK_TYPE_SELECTION,
-					     &atk_selection_info);
-	}
-
-	return type;
-}
-
-static void
-ea_calendar_item_class_init (EaCalendarItemClass *klass)
-{
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-
-	gobject_class->finalize = ea_calendar_item_finalize;
-	parent_class = g_type_class_peek_parent (klass);
-
-	class->get_name = ea_calendar_item_get_name;
-	class->get_description = ea_calendar_item_get_description;
-
-	class->get_n_children = ea_calendar_item_get_n_children;
-	class->ref_child = ea_calendar_item_ref_child;
-}
-
-AtkObject* 
-ea_calendar_item_new (GObject *obj)
-{
-	gpointer object;
-	AtkObject *atk_object;
-
-	g_return_val_if_fail (E_IS_CALENDAR_ITEM (obj), NULL);
-	object = g_object_new (EA_TYPE_CALENDAR_ITEM, NULL);
-	atk_object = ATK_OBJECT (object);
-	atk_object_initialize (atk_object, obj);
-	atk_object->role = ATK_ROLE_TABLE;
-#ifdef ACC_DEBUG
-	++n_ea_calendar_item_created;
-	g_print ("ACC_DEBUG: n_ea_calendar_item_created = %d\n",
-		n_ea_calendar_item_created);
-#endif
-	/* connect signal handlers */
-	g_signal_connect (obj, "selection_preview_changed",
-			  G_CALLBACK (selection_preview_change_cb),
-			  atk_object);
-	g_signal_connect (obj, "date_range_changed",
-			  G_CALLBACK (date_range_changed_cb),
-			  atk_object);
-	g_signal_connect (obj, "selection_preview_changed",
-			  G_CALLBACK (selection_changed_cb),
-			  atk_object);
-
-	return atk_object;
-}
-
-static void
-ea_calendar_item_finalize (GObject *object)
-{
-	EaCalendarItem *ea_calitem;
-
-	g_return_if_fail (EA_IS_CALENDAR_ITEM (object));
-
-	ea_calitem = EA_CALENDAR_ITEM (object);
-
-	/* Free the allocated cell data */
-	ea_calendar_item_destory_cell_data (ea_calitem);
-
-	G_OBJECT_CLASS (parent_class)->finalize (object);
-#ifdef ACC_DEBUG
-	++n_ea_calendar_item_destroyed;
-	printf ("ACC_DEBUG: n_ea_calendar_item_destroyed = %d\n",
-		n_ea_calendar_item_destroyed);
-#endif
-}
-
-static G_CONST_RETURN gchar*
-ea_calendar_item_get_name (AtkObject *accessible)
-{
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	gint start_year, start_month, start_day;
-	gint end_year, end_month, end_day;
-	static gchar new_name[256] = "";
-
-	g_return_val_if_fail (EA_IS_CALENDAR_ITEM (accessible), NULL);
-
-	if (accessible->name)
-		return accessible->name;
-
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(accessible));
-	g_return_val_if_fail (E_IS_CALENDAR_ITEM (g_obj), NULL);
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	if (e_calendar_item_get_date_range (calitem,
-					    &start_year, &start_month, &start_day,
-					    &end_year, &end_month, &end_day)) {
-		++start_month;
-		++end_month;
-		sprintf (new_name, "calendar (from %d-%d-%d to %d-%d-%d)",
-			 start_year, start_month, start_day,
-			 end_year, end_month, end_day);
-	}
-
-#if 0
-	if (e_calendar_item_get_selection (calitem, &select_start, &select_end)) {
-		GDate select_start, select_end;
-		gint year1, year2, month1, month2, day1, day2;
-
-		year1 = g_date_get_year (&select_start);
-		month1  = g_date_get_month (&select_start);
-		day1 = g_date_get_day (&select_start);
-
-		year2 = g_date_get_year (&select_end);
-		month2  = g_date_get_month (&select_end);
-		day2 = g_date_get_day (&select_end);
-
-		sprintf (new_name + strlen (new_name),
-			 " : current selection: from %d-%d-%d to %d-%d-%d.",
-			 year1, month1, day1,
-			 year2, month2, day2);
-	}
-#endif
-
-	return new_name;
-}
-
-static G_CONST_RETURN gchar*
-ea_calendar_item_get_description (AtkObject *accessible)
-{
-	if (accessible->description)
-		return accessible->description;
-
-	return "evolution calendar item";
-}
-
-static gint
-ea_calendar_item_get_n_children (AtkObject *accessible)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	gint n_children = 0;
-	gint start_year, start_month, start_day;
-	gint end_year, end_month, end_day;
-	GDate *start_date, *end_date;
-
-	g_return_val_if_fail (EA_IS_CALENDAR_ITEM (accessible), -1);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	if (!e_calendar_item_get_date_range (calitem, &start_year,
-					     &start_month, &start_day,
-					     &end_year, &end_month,
-					     &end_day))
-		return 0;
-
-	start_date = g_date_new_dmy (start_day, start_month + 1, start_year);
-	end_date = g_date_new_dmy (end_day, end_month + 1, end_year);
-
-	n_children = g_date_days_between (start_date, end_date) + 1;
-	g_free (start_date);
-	g_free (end_date);
-	return n_children;
-}
-
-static AtkObject *
-ea_calendar_item_ref_child (AtkObject *accessible, gint index)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	gint n_children;
-	ECalendarCell *cell;
-	EaCellTable *cell_data;
-	EaCalendarItem *ea_calitem;
-
-	g_return_val_if_fail (EA_IS_CALENDAR_ITEM (accessible), NULL);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-
-	n_children = ea_calendar_item_get_n_children (accessible);
-	if (index < 0 || index >= n_children)
-		return NULL;
-
-	ea_calitem = EA_CALENDAR_ITEM (accessible);
-	cell_data = ea_calendar_item_get_cell_data (ea_calitem);
-	if (!cell_data)
-		return NULL;
-
-	cell = ea_cell_table_get_cell_at_index (cell_data, index);
-	if (!cell) {
-		cell = e_calendar_cell_new (calitem,
-					    index / EA_CALENDAR_COLUMN_NUM,
-					    index % EA_CALENDAR_COLUMN_NUM);
-		ea_cell_table_set_cell_at_index (cell_data, index, cell);
-		g_object_unref (cell);
-	}
-
-#ifdef ACC_DEBUG
-	g_print ("AccDebug: ea_calendar_item children[%d]=%p\n", index,
-		 (gpointer)cell);
-#endif
-	return g_object_ref (atk_gobject_accessible_for_object (G_OBJECT(cell)));
-}
-
-/* atk table interface */
-
-static void 
-atk_table_interface_init (AtkTableIface *iface)
-{
-	g_return_if_fail (iface != NULL);
-
-	iface->ref_at = table_interface_ref_at;
-
-	iface->get_n_rows = table_interface_get_n_rows;
-	iface->get_n_columns = table_interface_get_n_columns;
-	iface->get_index_at = table_interface_get_index_at;
-	iface->get_column_at_index = table_interface_get_column_at_index;
-	iface->get_row_at_index = table_interface_get_row_at_index;
-	iface->get_column_extent_at = table_interface_get_column_extent_at;
-	iface->get_row_extent_at = table_interface_get_row_extent_at;
-
-	iface->is_selected = table_interface_is_selected;
-	iface->get_selected_rows = table_interface_get_selected_rows;
-	iface->get_selected_columns = table_interface_get_selected_columns;
-	iface->is_row_selected = table_interface_is_row_selected;
-	iface->is_column_selected = table_interface_is_column_selected;
-	iface->add_row_selection = table_interface_add_row_selection;
-	iface->remove_row_selection = table_interface_remove_row_selection;
-	iface->add_column_selection = table_interface_add_column_selection;
-	iface->remove_column_selection = table_interface_remove_column_selection;
-
-	iface->get_row_header = table_interface_get_row_header;
-	iface->get_column_header = table_interface_get_column_header;
-	iface->get_caption = table_interface_get_caption;
-	iface->get_summary = table_interface_get_summary;
-	iface->get_row_description = table_interface_get_row_description;
-	iface->get_column_description = table_interface_get_column_description;
-}
-
-static AtkObject* 
-table_interface_ref_at (AtkTable *table,
-			gint     row, 
-			gint     column)
-{
-	gint index;
-
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
-	index = EA_CALENDAR_COLUMN_NUM * row + column;
-	return ea_calendar_item_ref_child (ATK_OBJECT (ea_calitem), index);
-}
-
-static gint 
-table_interface_get_n_rows (AtkTable *table)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
-	gint n_children;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	n_children = ea_calendar_item_get_n_children (ATK_OBJECT (ea_calitem));
-	return (n_children - 1) / EA_CALENDAR_COLUMN_NUM + 1;
-}
-
-static gint 
-table_interface_get_n_columns (AtkTable *table)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	return EA_CALENDAR_COLUMN_NUM;
-}
-
-static gint
-table_interface_get_index_at (AtkTable *table,
-			      gint     row,
-			      gint     column)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	return row * EA_CALENDAR_COLUMN_NUM + column;
-}
-
-static gint
-table_interface_get_column_at_index (AtkTable *table,
-				     gint index)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
-	gint n_children;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	n_children = ea_calendar_item_get_n_children (ATK_OBJECT (ea_calitem));
-	if (index >= 0 && index < n_children)
-		return index % EA_CALENDAR_COLUMN_NUM;
-	return -1;
-}
-
-static gint
-table_interface_get_row_at_index (AtkTable *table,
-				  gint     index)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
-	gint n_children;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return -1;
-
-	n_children = ea_calendar_item_get_n_children (ATK_OBJECT (ea_calitem));
-	if (index >= 0 && index < n_children)
-		return index / EA_CALENDAR_COLUMN_NUM;
-	return -1;
-}
-
-static gint
-table_interface_get_column_extent_at (AtkTable      *table,
-				      gint          row,
-				      gint          column)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	return calitem->cell_width;
-}
-
-static gint 
-table_interface_get_row_extent_at (AtkTable *table,
-				   gint row, gint column)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	return calitem->cell_height;
-}
-
-/* any day in the row is selected, the row is selected */
-static gboolean 
-table_interface_is_row_selected (AtkTable *table,
-				 gint row)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	gint n_rows;
-	ECalendarItem *calitem;
-	gint row_index_start, row_index_end;
-	gint sel_index_start, sel_index_end;
-
-	GDate start_date, end_date;
-
-	g_return_val_if_fail (EA_IS_CALENDAR_ITEM (table), FALSE);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (table);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	n_rows = table_interface_get_n_rows (table);
-	if (row < 0 || row >= n_rows)
-		return FALSE;
-
-	row_index_start = row * EA_CALENDAR_COLUMN_NUM;
-	row_index_end = row_index_start + EA_CALENDAR_COLUMN_NUM - 1;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	e_calendar_item_get_selection (calitem, &start_date, &end_date);
-
-	sel_index_start =
-		e_calendar_item_get_offset_for_date (calitem,
-						     g_date_get_year (&start_date),
-						     g_date_get_month (&start_date),
-						     g_date_get_day (&start_date));
-	sel_index_end =
-		e_calendar_item_get_offset_for_date (calitem,
-						     g_date_get_year (&end_date),
-						     g_date_get_month (&end_date),
-						     g_date_get_day (&end_date));
-
-	if ((sel_index_start < row_index_start &&
-	     sel_index_end >= row_index_start) ||
-	    (sel_index_start >= row_index_start &&
-	     sel_index_start <= row_index_end))
-	    return TRUE;
-	return FALSE;
-}
-
-static gboolean 
-table_interface_is_selected (AtkTable *table, 
-			     gint     row, 
-			     gint     column)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	gint n_rows, n_columns;
-	ECalendarItem *calitem;
-	gint index;
-	gint sel_index_start, sel_index_end;
-
-	GDate start_date, end_date;
-
-	g_return_val_if_fail (EA_IS_CALENDAR_ITEM (table), FALSE);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (table);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	n_rows = table_interface_get_n_rows (table);
-	if (row < 0 || row >= n_rows)
-		return FALSE;
-	n_columns = table_interface_get_n_columns (table);
-	if (column < 0 || column >= n_columns)
-		return FALSE;
-
-	index = table_interface_get_index_at (table, row, column);
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	e_calendar_item_get_selection (calitem, &start_date, &end_date);
-
-	sel_index_start =
-		e_calendar_item_get_offset_for_date (calitem,
-						     g_date_get_year (&start_date),
-						     g_date_get_month (&start_date),
-						     g_date_get_day (&start_date));
-	sel_index_end =
-		e_calendar_item_get_offset_for_date (calitem,
-						     g_date_get_year (&end_date),
-						     g_date_get_month (&end_date),
-						     g_date_get_day (&end_date));
-
-	if (sel_index_start <= index && sel_index_end >= index)
-	    return TRUE;
-	return FALSE;
-}
-
-static gboolean 
-table_interface_is_column_selected (AtkTable *table,
-				    gint column)
-{
-	return FALSE;
-}
-
-static gint 
-table_interface_get_selected_rows (AtkTable *table,
-				   gint **rows_selected)
-{
-	*rows_selected = NULL;
-	return -1;
-}
-
-static gint 
-table_interface_get_selected_columns (AtkTable *table,
-				      gint **columns_selected)
-{
-	*columns_selected = NULL;
-	return -1;
-}
-
-static gboolean 
-table_interface_add_row_selection (AtkTable *table, 
-				   gint row)
-{
-	return FALSE;
-}
-
-static gboolean 
-table_interface_remove_row_selection (AtkTable *table, 
-				      gint row)
-{
-	return FALSE;
-}
-
-static gboolean 
-table_interface_add_column_selection (AtkTable *table, 
-				      gint column)
-{
-	return FALSE;
-}
-
-static gboolean 
-table_interface_remove_column_selection (AtkTable *table, 
-					 gint     column)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return FALSE;
-}
-
-static AtkObject* 
-table_interface_get_row_header (AtkTable *table, 
-				gint     row)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return NULL;
-}
-
-static AtkObject* 
-table_interface_get_column_header (AtkTable *table, 
-				   gint     in_col)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return NULL;
-}
-
-static AtkObject*
-table_interface_get_caption (AtkTable	*table)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return NULL;
-}
-
-static G_CONST_RETURN gchar*
-table_interface_get_column_description (AtkTable *table, gint in_col)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
-	const gchar *description = NULL;
-	EaCellTable *cell_data;
-	gint n_columns;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	n_columns = table_interface_get_n_columns (table);
-	if (in_col < 0 || in_col >= n_columns)
-		return NULL;
-	cell_data = ea_calendar_item_get_cell_data (ea_calitem);
-	if (!cell_data)
-		return NULL;
-
-	description = ea_cell_table_get_column_label (cell_data, in_col);
-	if (!description) {
-		gchar buffer[128] = "column description";
-		ea_calendar_item_get_column_label (ea_calitem, in_col,
-						   buffer, sizeof (buffer));
-		ea_cell_table_set_column_label (cell_data, in_col, buffer);
-		description = ea_cell_table_get_column_label (cell_data,
-							      in_col);
-	}
-	return description;
-}
-
-static G_CONST_RETURN gchar*
-table_interface_get_row_description (AtkTable *table, gint row)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
-	const gchar *description = NULL;
-	EaCellTable *cell_data;
-	gint n_rows;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	n_rows = table_interface_get_n_rows (table);
-	if (row < 0 || row >= n_rows)
-		return NULL;
-	cell_data = ea_calendar_item_get_cell_data (ea_calitem);
-	if (!cell_data)
-		return NULL;
-
-	description = ea_cell_table_get_row_label (cell_data, row);
-	if (!description) {
-		gchar buffer[128] = "row description";
-		ea_calendar_item_get_row_label (ea_calitem, row,
-						buffer, sizeof (buffer));
-		ea_cell_table_set_row_label (cell_data, row, buffer);
-		description = ea_cell_table_get_row_label (cell_data,
-							   row);
-	}
-	return description;
-}
-
-static AtkObject*
-table_interface_get_summary (AtkTable	*table)
-{
-	/* FIXME: NOT IMPLEMENTED */
-	return NULL;
-}
-
-/* atkselection interface */
-
-static void
-atk_selection_interface_init (AtkSelectionIface *iface)
-{
-	g_return_if_fail (iface != NULL);
-
-	iface->add_selection = selection_interface_add_selection;
-	iface->clear_selection = selection_interface_clear_selection;
-	iface->ref_selection = selection_interface_ref_selection;
-	iface->get_selection_count = selection_interface_get_selection_count;
-	iface->is_child_selected = selection_interface_is_child_selected;
-}
-
-static gboolean
-selection_interface_add_selection (AtkSelection *selection, gint index)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (selection);
-	gint year, month, day;
-	GDate start_date, end_date;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	if (!e_calendar_item_get_date_for_offset (calitem, index,
-						  &year, &month, &day))
-		return FALSE;
-
-	/* FIXME: not support mulit-selection */
-	g_date_set_dmy (&start_date, day, month + 1, year);
-	end_date = start_date;
-	e_calendar_item_set_selection (calitem, &start_date, &end_date);
-	return TRUE;
-}
-
-static gboolean
-selection_interface_clear_selection (AtkSelection *selection)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (selection);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	e_calendar_item_set_selection (calitem, NULL, NULL);
-
-	return TRUE;
-}
-
-static AtkObject*  
-selection_interface_ref_selection (AtkSelection *selection, gint i)
-{
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (selection);
-	gint count, sel_offset;
-	GDate start_date, end_date;
-
-	count = selection_interface_get_selection_count (selection);
-	if (i < 0 || i >= count)
-		return NULL;
-
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (ea_calitem));
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	e_calendar_item_get_selection (calitem, &start_date, &end_date);
-	sel_offset = e_calendar_item_get_offset_for_date (calitem,
-							  g_date_get_year (&start_date),
-							  g_date_get_month (&start_date),
-							  g_date_get_day (&start_date));
-
-	return ea_calendar_item_ref_child (ATK_OBJECT (selection), sel_offset + i);
-}
-
-static gint
-selection_interface_get_selection_count (AtkSelection *selection)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (selection);
-	GDate start_date, end_date;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return 0;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	e_calendar_item_get_selection (calitem, &start_date, &end_date);
-
-	return g_date_days_between (&start_date, &end_date) + 1;
-}
-
-static gboolean
-selection_interface_is_child_selected (AtkSelection *selection, gint index)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (selection);
-	gint row, column, n_children;
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	n_children = atk_object_get_n_accessible_children (ATK_OBJECT (selection));
-	if (index < 0 || index >= n_children)
-		return FALSE;
-
-	row = index / EA_CALENDAR_COLUMN_NUM;
-	column = index % EA_CALENDAR_COLUMN_NUM;
-
-	return table_interface_is_selected (ATK_TABLE (selection), row, column);
-}
-
-/* callbacks */
-
-static void
-selection_preview_change_cb (ECalendarItem *calitem)
-{
-	AtkObject *atk_obj;
-
-	g_return_if_fail (E_IS_CALENDAR_ITEM (calitem));
-	atk_obj = atk_gobject_accessible_for_object (G_OBJECT (calitem));
-
-	g_signal_emit_by_name (atk_obj, "selection_changed");
-}
-
-static void
-date_range_changed_cb (ECalendarItem *calitem)
-{
-	AtkObject *atk_obj;
-
-	g_return_if_fail (E_IS_CALENDAR_ITEM (calitem));
-	atk_obj = atk_gobject_accessible_for_object (G_OBJECT (calitem));
-	ea_calendar_item_destory_cell_data (EA_CALENDAR_ITEM (atk_obj));
-
-	g_signal_emit_by_name (atk_obj, "model_changed");
-}
-
-static void
-selection_changed_cb (ECalendarItem *calitem)
-{
-	selection_preview_change_cb (calitem);
-}
-
-/* helpers */
-
-static EaCellTable *
-ea_calendar_item_get_cell_data (EaCalendarItem *ea_calitem)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	EaCellTable *cell_data;
-
-	g_return_val_if_fail (ea_calitem, NULL);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return NULL;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-
-	cell_data = g_object_get_data (G_OBJECT(ea_calitem),
-				       "ea-calendar-cell-table");
-
-	if (!cell_data) {
-		gint n_cells = ea_calendar_item_get_n_children (ATK_OBJECT(ea_calitem));
-		cell_data = ea_cell_table_create (n_cells/EA_CALENDAR_COLUMN_NUM,
-						  EA_CALENDAR_COLUMN_NUM,
-						  FALSE);
-		g_object_set_data (G_OBJECT(ea_calitem),
-				   "ea-calendar-cell-table", cell_data);
-	}
-	return cell_data;
-}
-
-static void
-ea_calendar_item_destory_cell_data (EaCalendarItem *ea_calitem)
-{
-	EaCellTable *cell_data;
-
-	g_return_if_fail (ea_calitem);
-
-	cell_data = g_object_get_data (G_OBJECT(ea_calitem),
-				       "ea-calendar-cell-table");
-	if (cell_data) {
-		ea_cell_table_destroy (cell_data);
-		g_object_set_data (G_OBJECT(ea_calitem),
-				   "ea-calendar-cell-table", NULL);
-	}
-}
-
-static gboolean
-ea_calendar_item_get_row_label (EaCalendarItem *ea_calitem, gint row,
-				gchar *buffer, gint buffer_size)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	gint index, week_num;
-	gint year, month, day;
-
-	g_return_val_if_fail (ea_calitem, FALSE);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-
-	index = atk_table_get_index_at (ATK_TABLE (ea_calitem), row, 0);
-	if (!e_calendar_item_get_date_for_offset (calitem, index,
-						  &year, &month, &day))
-		return FALSE;
-
-	week_num = e_calendar_item_get_week_number (calitem,
-						    day, month, year);
-
-	g_snprintf (buffer, buffer_size, "week number : %d", week_num);
-	return TRUE;
-}
-
-static gboolean
-ea_calendar_item_get_column_label (EaCalendarItem *ea_calitem, gint column,
-				   gchar *buffer, gint buffer_size)
-{
-	AtkGObjectAccessible *atk_gobj;
-	GObject *g_obj;
-	ECalendarItem *calitem;
-	gchar *week_char;
-	gint char_size;
-
-	g_return_val_if_fail (ea_calitem, FALSE);
-
-	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
-	g_obj = atk_gobject_accessible_get_object (atk_gobj);
-	if (!g_obj)
-		return FALSE;
-
-	calitem = E_CALENDAR_ITEM (g_obj);
-	week_char = g_utf8_offset_to_pointer (calitem->days, column);
-	char_size = strlen (calitem->days) -
-		strlen (g_utf8_find_next_char (calitem->days, NULL));
-
-	if (week_char && char_size < buffer_size) {
-		memcpy (buffer, week_char, char_size);
-		buffer[char_size] = '\0';
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/* the coordinate the e-calendar canvas coord */
-gboolean
-e_calendar_item_get_day_extents (ECalendarItem *calitem,
-				 gint year, gint month, gint date,
-				 gint *x, gint *y,
-				 gint *width, gint *height)
-{
-	GnomeCanvasItem *item;
-	GtkWidget *widget;
-	GtkStyle *style;
-	PangoFontDescription *font_desc;
-	PangoContext *pango_context;
-	PangoFontMetrics *font_metrics;
-	gint char_height, xthickness, ythickness, text_y;
-	gint new_year, new_month, num_months, months_offset;
-	gint month_x, month_y, month_cell_x, month_cell_y;
-	gint month_row, month_col;
-	gint day_row, day_col;
-	gint days_from_week_start;
-
-	g_return_val_if_fail (E_IS_CALENDAR_ITEM (calitem), FALSE);
-
-	item = GNOME_CANVAS_ITEM (calitem);
-	widget = GTK_WIDGET (item->canvas);
-	style = widget->style;
-
-	/* Set up Pango prerequisites */
-	font_desc = calitem->font_desc;
-	if (!font_desc)
-		font_desc = style->font_desc;
-	pango_context = gtk_widget_get_pango_context (widget);
-	font_metrics = pango_context_get_metrics (pango_context, font_desc,
-						  pango_context_get_language (pango_context));
-
-	char_height =
-		PANGO_PIXELS (pango_font_metrics_get_ascent (font_metrics)) +
-		PANGO_PIXELS (pango_font_metrics_get_descent (font_metrics));
-
-	xthickness = style->xthickness;
-	ythickness = style->ythickness;
-
-	new_year = year;
-	new_month = month;
-	e_calendar_item_normalize_date	(calitem, &new_year, &new_month);
-	num_months = calitem->rows * calitem->cols;
-	months_offset = (new_year - calitem->year) * 12
-		+ new_month - calitem->month;
-
-	if (months_offset > num_months || months_offset < 0)
-		return FALSE;
-
-	month_row = months_offset / calitem->cols;
-	month_col = months_offset % calitem->cols;
-
-	month_x = item->x1 + xthickness + calitem->x_offset
-		+ month_col * calitem->month_width;
-	month_y = item->y1 + ythickness + month_row * calitem->month_height;
-
-	month_cell_x = month_x + E_CALENDAR_ITEM_XPAD_BEFORE_WEEK_NUMBERS
- 		+ calitem->month_lpad + E_CALENDAR_ITEM_XPAD_BEFORE_CELLS;
-	text_y = month_y + ythickness * 2
-		+ E_CALENDAR_ITEM_YPAD_ABOVE_MONTH_NAME
-		+ char_height + E_CALENDAR_ITEM_YPAD_BELOW_MONTH_NAME
-		+ E_CALENDAR_ITEM_YPAD_ABOVE_DAY_LETTERS + calitem->month_tpad;
-
-	month_cell_y = text_y + char_height
-		+ E_CALENDAR_ITEM_YPAD_BELOW_DAY_LETTERS + 1
-		+ E_CALENDAR_ITEM_YPAD_ABOVE_CELLS;
-
-	days_from_week_start =
-		e_calendar_item_get_n_days_from_week_start (calitem, new_year,
-							    new_month);
-	day_row = (date + days_from_week_start - 1) / EA_CALENDAR_COLUMN_NUM;
-	day_col = (date + days_from_week_start - 1) % EA_CALENDAR_COLUMN_NUM;
-
-	*x = month_cell_x + day_col * calitem->cell_width;
-	*y = month_cell_y + day_row * calitem->cell_height;
-	*width = calitem->cell_width;
-	*height = calitem->cell_height;
-
-	return TRUE;
-}
-
-/* month is from 0 to 11 */
-gboolean
-e_calendar_item_get_date_for_offset (ECalendarItem *calitem, gint day_offset,
-				     gint *year, gint *month, gint *day)
-{
-	gint start_year, start_month, start_day;
-	gint end_year, end_month, end_day;
-	GDate *start_date;
-
-	g_return_val_if_fail (E_IS_CALENDAR_ITEM (calitem), FALSE);
-
-	if (!e_calendar_item_get_date_range (calitem, &start_year,
-					     &start_month, &start_day,
-					     &end_year, &end_month,
-					     &end_day))
-		return FALSE;
-
-	start_date = g_date_new_dmy (start_day, start_month + 1, start_year);
-
-	g_date_add_days (start_date, day_offset);
-
-	*year = g_date_get_year (start_date);
-	*month = g_date_get_month (start_date) - 1;
-	*day = g_date_get_day (start_date);
-
-	return TRUE;
-}
-
-/* month is from 0 to 11 */
-gint
-e_calendar_item_get_offset_for_date (ECalendarItem *calitem,
-				     gint year, gint month, gint day)
-{
-	gint start_year, start_month, start_day;
-	gint end_year, end_month, end_day;
-	GDate *start_date, *end_date;
-	gint n_days;
-
-	g_return_val_if_fail (E_IS_CALENDAR_ITEM (calitem), -1);
-
-	if (!e_calendar_item_get_date_range (calitem, &start_year,
-					     &start_month, &start_day,
-					     &end_year, &end_month,
-					     &end_day))
-		return FALSE;
-
-	start_date = g_date_new_dmy (start_day, start_month + 1, start_year);
-	end_date = g_date_new_dmy (day, month + 1, year);
-
-	n_days = g_date_days_between (start_date, end_date);
-	g_free (start_date);
-	g_free (end_date);
-	return n_days;
-}
-
-gint
-e_calendar_item_get_n_days_from_week_start (ECalendarItem *calitem,
-					    gint year, gint month)
-{
-	struct tm tmp_tm;
-	gint start_weekday, days_from_week_start;
-
-	memset (&tmp_tm, 0, sizeof (tmp_tm));
-	tmp_tm.tm_year = year - 1900;
-	tmp_tm.tm_mon = month;
-	tmp_tm.tm_mday = 1;
-	tmp_tm.tm_isdst = -1;
-	mktime (&tmp_tm);
-	start_weekday = (tmp_tm.tm_wday + 6) % 7;   /* 0 to 6 */
-	days_from_week_start = (start_weekday + 7 - calitem->week_start_day)
-		% 7;
-	return days_from_week_start;
-}
diff --git a/a11y/widgets/ea-calendar-item.h b/a11y/widgets/ea-calendar-item.h
deleted file mode 100644
index 04df5f94ac..0000000000
--- a/a11y/widgets/ea-calendar-item.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-calendar-item.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#ifndef __EA_CALENDAR_ITEM_H__
-#define __EA_CALENDAR_ITEM_H__
-
-#include <atk/atkgobjectaccessible.h>
-#include <misc/e-calendar-item.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define EA_TYPE_CALENDAR_ITEM                   (ea_calendar_item_get_type ())
-#define EA_CALENDAR_ITEM(obj)                   (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_CALENDAR_ITEM, EaCalendarItem))
-#define EA_CALENDAR_ITEM_CLASS(klass)           (G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_CALENDAR_ITEM, EaCalendarItemClass))
-#define EA_IS_CALENDAR_ITEM(obj)                (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_CALENDAR_ITEM))
-#define EA_IS_CALENDAR_ITEM_CLASS(klass)        (G_TYPE_CHECK_CLASS_TYPE ((klass), EA_TYPE_CALENDAR_ITEM))
-#define EA_CALENDAR_ITEM_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), EA_TYPE_CALENDAR_ITEM, EaCalendarItemClass))
-
-typedef struct _EaCalendarItem                   EaCalendarItem;
-typedef struct _EaCalendarItemClass              EaCalendarItemClass;
-
-struct _EaCalendarItem
-{
-	AtkGObjectAccessible parent;
-};
-
-GType ea_calendar_item_get_type (void);
-
-struct _EaCalendarItemClass
-{
-	AtkGObjectAccessibleClass parent_class;
-};
-
-AtkObject *ea_calendar_item_new (GObject *obj);
-gboolean e_calendar_item_get_day_extents (ECalendarItem *calitem,
-					  gint year, gint month, gint date,
-					  gint *x, gint *y,
-					  gint *width, gint *height);
-gboolean e_calendar_item_get_date_for_offset (ECalendarItem *calitem,
-					      gint day_offset,
-					      gint *year, gint *month,
-					      gint *day);
-gint e_calendar_item_get_offset_for_date (ECalendarItem *calitem,
-					  gint year, gint month, gint day);
-gint e_calendar_item_get_n_days_from_week_start (ECalendarItem *calitem,
-						 gint year, gint month);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __EA_CALENDAR_ITEM_H__ */
diff --git a/a11y/widgets/ea-widgets.c b/a11y/widgets/ea-widgets.c
deleted file mode 100644
index edead1b785..0000000000
--- a/a11y/widgets/ea-widgets.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-widgets.c
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-#include "ea-factory.h"
-#include "widgets/ea-calendar-item.h"
-#include "ea-widgets.h"
-
-EA_FACTORY_GOBJECT (EA_TYPE_CALENDAR_ITEM, ea_calendar_item, ea_calendar_item_new)
-
-void e_calendar_item_a11y_init (void)
-{
-    EA_SET_FACTORY (e_calendar_item_get_type (), ea_calendar_item);
-}
diff --git a/a11y/widgets/ea-widgets.h b/a11y/widgets/ea-widgets.h
deleted file mode 100644
index e9ec9b3ad9..0000000000
--- a/a11y/widgets/ea-widgets.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/* Evolution Accessibility: ea-widgets.h
- *
- * Copyright (C) 2003 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Bolian Yin <bolian.yin@sun.com> Sun Microsystem Inc., 2003
- *
- */
-
-/* Evolution Accessibility
-*/
-
-#ifndef _EA_WIDGETS_H__
-#define _EA_WIDGETS_H__
-
-void e_calendar_item_a11y_init (void);
-
-#endif /* _EA_WIDGETS_H__ */