This commit was manufactured by cvs2svn to create tag 'gtkmm_1_2_7'.gtkmm_1_2_7

svn path=/tags/gtkmm_1_2_7/; revision=11632

279 files changed, 0 insertions, 84691 deletions

diff --git a/widgets/.cvsignore b/widgets/.cvsignore
deleted file mode 100644
index d5b3a2ad62..0000000000
--- a/widgets/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
-minicard-test
-minicard-label-test
-reflow-test
diff --git a/widgets/ChangeLog b/widgets/ChangeLog
deleted file mode 100644
index 8b3d4d8b83..0000000000
--- a/widgets/ChangeLog
+++ /dev/null
@@ -1,232 +0,0 @@
-2001-07-02 Anna Marie Dirks <anna@ximian.com>
-	*misc/e-filter-bar.c (option_changed): Specified a default size
-	for the Advanced Search dialog such that when it first appear, it
-	is large enough to view all parts of a search clause without 
-	the user needing to resize it. 
-
-
-2001-05-31  Federico Mena Quintero  <federico@ximian.com>
-
-	* menus/gal-view-menus.c (gal_view_menus_construct): Store the
-	connection ID of the "changed" signal in the collection.
-	(gal_view_menus_new): Added preconditions.
-	(gal_view_menus_construct): Added preconditions.
-
-2001-05-21  Chris Toshok  <toshok@ximian.com>
-
-	* menus/gal-view-menus.c (build_menus): make the view menuitems
-	radio items of the same group, and allocate the closure here.
-	(free_verbs): only need to free the one DefineViews verb here.
-	(closure_free): new function - EListFreeFunc for our
-	listenerClosure list.
-	(remove_listeners): new function, free our listener list.
-	(gvm_destroy): call remove_listeners.
-	(gvm_init): init listenerClosures list.
-	(toggled_cb): callback for radio items.
-	(build_verbs): strip out almost all the code since there's only 1
-	verb now.
-	(build_stuff): call remove_listeners.
-
-2001-05-08  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* misc/e-search-bar.c (add_dropdown), (set_option): first try to
-	translate, then if not suceeded -- convert from utf8. This handles
-	cases when menuitem needs to be translated (it is passed as N_()), or is
-	utf8 search title. However you cannot have a search like "Folders" -- it
-	is translated. Part of fix for #2253.
-	
-	* misc/e-filter-bar.c: d() debugging strings. Use E_FILTERBAR_ADVANCED
-	macro instead of own "Advanced ..." for consistency.
-
-2001-05-07  Gediminas Paulauskas <menesis@delfi.lt>
-	
-	* menus/gal-view-menus.c (build_menus): convert label to locale
-	encoding. Still displays truncated strings.
-	
-	* menus/Makefile.am: removed -DEVOLUTION_VERSION.
-
-2001-04-21  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* menus/gal-view-menus.c: bonobo_ui_node_set_attr expects unstranslated
-	strings, so change _() to N_().
-
-2001-04-12  Dan Winship  <danw@ximian.com>
-
-	* menus/gal-view-menus.c (build_menus): Fix a memory leak.
-	(Doesn't anyone ever change any other file in this directory? :)
-
-2001-04-10  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* menus/gal-view-menus.c: convert label to utf8.
-
-2001-04-04  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* menus/gal-view-menus.c: Fix headers.
-	
-2001-03-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* menus/gal-view-menus.c (build_menus): Don't print the xml tree
-	here.
-
-2001-03-16  Miguel de Icaza  <miguel@ximian.com>
-
-	* menus/gal-view-menus.c (build_menus): Hook this up under the
-	"ViewBegin" node.
-
-2001-02-28  Miguel de Icaza  <miguel@ximian.com>
-
-	* menus/gal-view-menus.c (build_menus): Add translation string
-	here. 
-
-2001-03-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* menus/gal-view-menus.c (collection_changed): Rebuild when the
-	collection changes.
-
-2001-01-27  Jason Leach  <jasonleach@usa.net>
-
-	* cvs remove all files in shortcut-bar/, this widget is now in
-	gal, will be maintained there.
-	
-	* Makefile.am (SUBDIRS): Remove shortcut-bar from here.
-
-2001-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* menus/gal-view-menus.c: Make this actually deploy the titles
-	from the GalViewCollection and emit the display_view signals and
-	such.
-
-2001-01-22  Jon Trowbridge  <trow@gnu.org>
-
-	* menus/gal-view-menus.c (define_views): Fixed
-	gal_define_views_dialog_new to be called with its proper argument.
-
-2000-12-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* menus/gal-view-menus.c, menus/gal-view-menus.h: Added a
-	GalViewCollection argument to the new function here.
-
-2000-12-04  Dan Winship  <danw@helixcode.com>
-
-	* menus/gal-view-menus.c: NULL-terminate gal_view_menus_apply's
-	BonoboUIVerb array to prevent a crash. (Why are there gal* things
-	in the evolution sources?)
-
-2000-11-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-paned/.cvsignore, e-table/.cvsignore, e-text/.cvsignore:
-	Removed unnecessary .cvsignore files.
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Removed directories that have been moved to gal.
-
-	* e-paned/.cvsignore, e-paned/Makefile.am, e-paned/e-hpaned.c,
-	e-paned/e-hpaned.h, e-paned/e-paned.c, e-paned/e-paned.h,
-	e-paned/e-vpaned.c, e-paned/e-vpaned.h: Moved to gal.
-
-	* e-reflow/.cvsignore, e-reflow/Makefile.am,
-	e-reflow/e-reflow-sorted.c, e-reflow/e-reflow-sorted.h,
-	e-reflow/e-reflow.c, e-reflow/e-reflow.h: Moved to gal.
-
-	* e-table/.cvsignore, e-table/ChangeLog, e-table/LICENSE,
-	e-table/Makefile.am, e-table/ROADMAP.e-table, e-table/TODO,
-	e-table/add-col.xpm, e-table/arrow-down.xpm, e-table/arrow-up.xpm,
-	e-table/check-empty.xpm, e-table/check-filled.xpm,
-	e-table/clip.png, e-table/e-cell-checkbox.c,
-	e-table/e-cell-checkbox.h, e-table/e-cell-string.c,
-	e-table/e-cell-text.c, e-table/e-cell-text.h,
-	e-table/e-cell-toggle.c, e-table/e-cell-toggle.h,
-	e-table/e-cell-tree.c, e-table/e-cell-tree.h, e-table/e-cell.c,
-	e-table/e-cell.h, e-table/e-table-click-to-add.c,
-	e-table/e-table-click-to-add.h, e-table/e-table-col-dnd.h,
-	e-table/e-table-col.c, e-table/e-table-col.h,
-	e-table/e-table-column-model.h, e-table/e-table-column.c,
-	e-table/e-table-config.c, e-table/e-table-config.glade,
-	e-table/e-table-config.glade.h, e-table/e-table-config.h,
-	e-table/e-table-defines.h, e-table/e-table-example-1.c,
-	e-table/e-table-example-2.c,
-	e-table/e-table-field-chooser-dialog.c,
-	e-table/e-table-field-chooser-dialog.h,
-	e-table/e-table-field-chooser-item.c,
-	e-table/e-table-field-chooser-item.h,
-	e-table/e-table-field-chooser.c,
-	e-table/e-table-field-chooser.glade,
-	e-table/e-table-field-chooser.glade.h,
-	e-table/e-table-field-chooser.h,
-	e-table/e-table-group-container.c,
-	e-table/e-table-group-container.h, e-table/e-table-group-leaf.c,
-	e-table/e-table-group-leaf.h, e-table/e-table-group.c,
-	e-table/e-table-group.glade, e-table/e-table-group.glade.h,
-	e-table/e-table-group.h, e-table/e-table-header-item.c,
-	e-table/e-table-header-item.h, e-table/e-table-header.c,
-	e-table/e-table-header.h, e-table/e-table-item.c,
-	e-table/e-table-item.h, e-table/e-table-model.c,
-	e-table/e-table-model.h, e-table/e-table-one.c,
-	e-table/e-table-one.h, e-table/e-table-scrolled.c,
-	e-table/e-table-scrolled.h, e-table/e-table-selection-model.c,
-	e-table/e-table-selection-model.h, e-table/e-table-simple.c,
-	e-table/e-table-simple.h, e-table/e-table-size-test.c,
-	e-table/e-table-sort-info.c, e-table/e-table-sort-info.h,
-	e-table/e-table-sorted-variable.c,
-	e-table/e-table-sorted-variable.h, e-table/e-table-sorted.c,
-	e-table/e-table-sorted.h, e-table/e-table-sorter.c,
-	e-table/e-table-sorter.h, e-table/e-table-subset-variable.c,
-	e-table/e-table-subset-variable.h, e-table/e-table-subset.c,
-	e-table/e-table-subset.h, e-table/e-table-text-model.c,
-	e-table/e-table-text-model.h, e-table/e-table-tooltip.h,
-	e-table/e-table-tree.h, e-table/e-table.c, e-table/e-table.h,
-	e-table/e-tree-example-1.c, e-table/e-tree-example-2.c,
-	e-table/e-tree-model.c, e-table/e-tree-model.h,
-	e-table/e-tree-simple.c, e-table/e-tree-simple.h,
-	e-table/image1.png, e-table/image2.png, e-table/image3.png,
-	e-table/remove-col.xpm, e-table/sample.table,
-	e-table/table-test.c, e-table/table-test.h, e-table/test-check.c,
-	e-table/test-cols.c, e-table/test-table.c: Moved to gal.
-
-	* e-text/.cvsignore, e-text/Makefile.am, e-text/e-entry-test.c,
-	e-text/e-entry.c, e-text/e-entry.h,
-	e-text/e-text-event-processor-emacs-like.c,
-	e-text/e-text-event-processor-emacs-like.h,
-	e-text/e-text-event-processor-types.h,
-	e-text/e-text-event-processor.c, e-text/e-text-event-processor.h,
-	e-text/e-text-model.c, e-text/e-text-model.h,
-	e-text/e-text-test.c, e-text/e-text.c, e-text/e-text.h: Moved to
-	gal.
-
-2000-09-14  Michael Meeks  <michael@helixcode.com>
-
-	* e-reflow/e-reflow-sorted.h: fix include.
-
-2000-09-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am (SUBDIRS): Added e-reflow.
-
-	* e-reflow/e-reflow.c, e-reflow/e-reflow.h: Moved from
-	addressbook/gui/minicard/.
-
-	* e-reflow/Makefile.am, e-reflow/.cvsignore: New files for a new
-	directory.
-
-2000-09-08  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* e-text/e-text.c (calc_line_widths): Fix byte/char confusion
-
-2000-08-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-paned/e-hpaned.c (e_hpaned_motion): Do not flicker while
-	trying to resize a quantized pane.
-
-	* e-paned/e-vpaned.c (e_vpaned_motion): Likewise.
-
-2000-08-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* widgets/e-paned/e-vpaned.c (e_vpaned_size_allocate): Ensure that
-	the child's allocation height is >= 1.
-
-	* widgets/e-paned/e-hpaned.c (e_hpaned_size_allocate): Ensure that
-	the child's allocation width is >= 1.
-
-2000-08-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* ChangeLog: Started a ChangeLog here.
diff --git a/widgets/LICENSE b/widgets/LICENSE
deleted file mode 100644
index b1f6ae08a4..0000000000
--- a/widgets/LICENSE
+++ /dev/null
@@ -1 +0,0 @@
-This code is released under the terms of the GNU GPL.
diff --git a/widgets/Makefile.am b/widgets/Makefile.am
deleted file mode 100644
index b5380daa7f..0000000000
--- a/widgets/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-
-SUBDIRS =			\
-	misc			\
-	meeting-time-sel	\
-	menus
diff --git a/widgets/meeting-time-sel/.cvsignore b/widgets/meeting-time-sel/.cvsignore
deleted file mode 100644
index 50530fdf4e..0000000000
--- a/widgets/meeting-time-sel/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-test-meeting-time-selector
diff --git a/widgets/meeting-time-sel/ChangeLog b/widgets/meeting-time-sel/ChangeLog
deleted file mode 100644
index f2598d9fa2..0000000000
--- a/widgets/meeting-time-sel/ChangeLog
+++ /dev/null
@@ -1,82 +0,0 @@
-2001-05-04  JP Rosevear  <jpr@ximian.com>
-
-	* e-meeting-time-sel-list-item.c
-	(e_meeting_time_selector_list_item_destroy): correct type where
-	same pixmap mask was unreffed twice
-
-2001-04-24  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-meeting-time-sel.c, test-meeting-time-sel.c: Added #include
-	<glib.h>.
-	
-2001-04-08  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-meeting-time-sel-item.c (e_meeting_time_selector_item_init):
-	Use a pretty arrow instead of GDK_TOP_LEFT_ARROW.
-
-2001-04-04  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-meeting-time-sel-item.c: Fix headers.
-	* e-meeting-time-sel-list-item.c: Same here.
-	* e-meeting-time-sel.[ch]: Same here.
-	* test-meeting-time-sel.c: Same here.
-	
-2001-03-29  Larry Ewing  <lewing@ximian.com>
-
-	* e-meeting-time-sel-list-item.c: s/#include/#ifdef/ to fix
-	Kjartan's commit.
-
-2001-03-29  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-meeting-time-sel-item.c: #ifdef HAVE_CONFIG_H
-	* e-meeting-time-sel-list-item.c: Same here.
-	* e-meeting-time-sel.c: Same here.
-	* test-meeting-time-sel.c: And here.
-	
-2001-03-15  Dan Winship  <danw@ximian.com>
-
-	* e-meeting-time-sel.c
-	(e_meeting_time_selector_on_text_item_event):  
-	* e-meeting-time-sel-list-item.c
-	(e_meeting_time_selector_list_item_button_press): Update arguments
-	to e_canvas_item_grab_focus.
-
-2000-12-25  Miguel de Icaza  <miguel@helixcode.com>
-
-	* e-meeting-time-sel.c (e_meeting_time_selector_attendee_add): Set
-	draw_background to FALSE.
-
-2000-12-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-meeting-time-sel.c: Fixed a bunch of warnings.
-
-2000-09-25  Damon Chaplin  <damon@helixcode.com>
-
-	* e-meeting-time-sel-item.c: 
-	* e-meeting-time-sel.c: fixed use of date strings to support i18n
-	better.
-	(e_meeting_time_selector_update_attendees_list_positions): updated to
-	use e_canvas_item_move_absolute() to position the EText items.
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
-	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.
-
-	* e-meeting-time-sel-list-item.c, e-meeting-time-sel.c,
-	e-meeting-time-sel.h: Fixed the #include lines to deal properly
-	with gal.
-
-2000-09-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (INCLUDES): Add `$(EXTRA_GNOME_CFLAGS)'.
-
-2000-06-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added the include path to top_srcdir.
-
-2000-06-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-meeting-time-sel.c: Specify the #include path for
-	`e-canvas-utils.h' so that we build with builddir != srcdir.
-
diff --git a/widgets/meeting-time-sel/LICENSE b/widgets/meeting-time-sel/LICENSE
deleted file mode 100644
index 9babf4395f..0000000000
--- a/widgets/meeting-time-sel/LICENSE
+++ /dev/null
@@ -1 +0,0 @@
-This code is licensed under the terms of the GNU GPL
diff --git a/widgets/meeting-time-sel/Makefile.am b/widgets/meeting-time-sel/Makefile.am
deleted file mode 100644
index 767de5cd86..0000000000
--- a/widgets/meeting-time-sel/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-
-INCLUDES =					\
-	$(EXTRA_GNOME_CFLAGS)			\
-	$(GNOME_INCLUDEDIR)			\
-	-I $(top_srcdir)			\
-	-DG_LOG_DOMAIN=\"meeting-time-sel\"
-
-noinst_LIBRARIES =				\
-	libevolutionmtsel.a
-
-libevolutionmtsel_a_SOURCES =			\
-	e-meeting-time-sel.c			\
-	e-meeting-time-sel.h			\
-	e-meeting-time-sel-item.c		\
-	e-meeting-time-sel-item.h		\
-	e-meeting-time-sel-list-item.c		\
-	e-meeting-time-sel-list-item.h
-
-noinst_PROGRAMS =	\
-	test-meeting-time-selector
-
-test_meeting_time_selector_SOURCES = 	\
-	test-meeting-time-sel.c
-
-test_meeting_time_selector_LDADD =			\
-	libevolutionmtsel.a				\
-	$(EXTRA_GNOME_LIBS)				\
-	$(GNOMEUI_LIBS)
-
-test_meeting_time_selector_LDFLAGS = $(GNOME_LIBDIR)
-
-EXTRA_DIST =				\
-	e-meeting-time-sel-mail.xpm	\
-	e-meeting-time-sel-no-mail.xpm
-
diff --git a/widgets/meeting-time-sel/e-meeting-time-sel-item.c b/widgets/meeting-time-sel/e-meeting-time-sel-item.c
deleted file mode 100644
index e11c3a6a16..0000000000
--- a/widgets/meeting-time-sel/e-meeting-time-sel-item.c
+++ /dev/null
@@ -1,993 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@gtk.org>
- *
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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
- */
-
-/*
- * EMeetingTimeSelectorItem - A GnomeCanvasItem which is used for both the main
- * display canvas and the top display (with the dates, times & All Attendees).
- * I didn't make these separate GnomeCanvasItems since they share a lot of
- * code.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <time.h>
-#include <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include "e-meeting-time-sel-item.h"
-#include "e-meeting-time-sel.h"
-
-/* Initially the grid lines were drawn at the bottom of cells, but this didn't
-   line up well with the GtkEntry widgets, which in the default theme draw a
-   black shadow line across the top. So I've switched our code to draw the
-   lines across the top of cells. */
-#define E_MEETING_TIME_SELECTOR_DRAW_GRID_LINES_AT_BOTTOM 0
-
-static void e_meeting_time_selector_item_class_init (EMeetingTimeSelectorItemClass *mts_item_class);
-static void e_meeting_time_selector_item_init (EMeetingTimeSelectorItem *mts_item);
-static void e_meeting_time_selector_item_destroy (GtkObject *object);
-
-static void e_meeting_time_selector_item_set_arg (GtkObject *o, GtkArg *arg,
-						  guint arg_id);
-static void e_meeting_time_selector_item_realize (GnomeCanvasItem *item);
-static void e_meeting_time_selector_item_unrealize (GnomeCanvasItem *item);
-static void e_meeting_time_selector_item_update (GnomeCanvasItem *item,
-						 double *affine,
-						 ArtSVP *clip_path, int flags);
-static void e_meeting_time_selector_item_draw (GnomeCanvasItem *item,
-					       GdkDrawable *drawable,
-					       int x, int y,
-					       int width, int height);
-static double e_meeting_time_selector_item_point (GnomeCanvasItem *item,
-						  double x, double y,
-						  int cx, int cy,
-						  GnomeCanvasItem **actual_item);
-static gint e_meeting_time_selector_item_event (GnomeCanvasItem *item,
-						GdkEvent *event);
-static gint e_meeting_time_selector_item_button_press (EMeetingTimeSelectorItem *mts_item,
-						       GdkEvent *event);
-static gint e_meeting_time_selector_item_button_release (EMeetingTimeSelectorItem *mts_item,
-							 GdkEvent *event);
-static gint e_meeting_time_selector_item_motion_notify (EMeetingTimeSelectorItem *mts_item,
-							GdkEvent *event);
-
-static void e_meeting_time_selector_item_paint_day_top (EMeetingTimeSelectorItem *mts_item,
-							GdkDrawable *drawable,
-							GDate *date,
-							int x, int scroll_y,
-							int width, int height);
-static void e_meeting_time_selector_item_paint_all_attendees_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, int x, int y, int width, int height);
-static void e_meeting_time_selector_item_paint_day (EMeetingTimeSelectorItem *mts_item,
-						    GdkDrawable *drawable,
-						    GDate *date,
-						    int x, int scroll_y,
-						    int width, int height);
-static void e_meeting_time_selector_item_paint_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, int x, int scroll_y, int width, int height);
-static gint e_meeting_time_selector_item_find_first_busy_period (EMeetingTimeSelectorItem *mts_item, GDate *date, gint row);
-static void e_meeting_time_selector_item_paint_attendee_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, int row, int x, int y, int width, int first_period, EMeetingTimeSelectorBusyType busy_type);
-
-static EMeetingTimeSelectorPosition e_meeting_time_selector_item_get_drag_position (EMeetingTimeSelectorItem *mts_item, gint x, gint y);
-static gboolean e_meeting_time_selector_item_calculate_busy_range (EMeetingTimeSelector *mts,
-								   gint row,
-								   gint x,
-								   gint width,
-								   gint *start_x,
-								   gint *end_x);
-
-static GnomeCanvasItemClass *parent_class;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_MEETING_TIME_SELECTOR
-};
-
-
-GtkType
-e_meeting_time_selector_item_get_type (void)
-{
-	static GtkType e_meeting_time_selector_item_type = 0;
-
-	if (!e_meeting_time_selector_item_type) {
-		GtkTypeInfo e_meeting_time_selector_item_info = {
-			"EMeetingTimeSelectorItem",
-			sizeof (EMeetingTimeSelectorItem),
-			sizeof (EMeetingTimeSelectorItemClass),
-			(GtkClassInitFunc) e_meeting_time_selector_item_class_init,
-			(GtkObjectInitFunc) e_meeting_time_selector_item_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		e_meeting_time_selector_item_type = gtk_type_unique (gnome_canvas_item_get_type (), &e_meeting_time_selector_item_info);
-	}
-
-	return e_meeting_time_selector_item_type;
-}
-
-
-static void
-e_meeting_time_selector_item_class_init (EMeetingTimeSelectorItemClass *mts_item_class)
-{
-	GtkObjectClass  *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	parent_class = gtk_type_class (gnome_canvas_item_get_type());
-
-	object_class = (GtkObjectClass *) mts_item_class;
-	item_class = (GnomeCanvasItemClass *) mts_item_class;
-
-	gtk_object_add_arg_type ("EMeetingTimeSelectorItem::meeting_time_selector",
-				 GTK_TYPE_POINTER, GTK_ARG_WRITABLE,
-				 ARG_MEETING_TIME_SELECTOR);
-
-	object_class->destroy = e_meeting_time_selector_item_destroy;
-	object_class->set_arg = e_meeting_time_selector_item_set_arg;
-
-	/* GnomeCanvasItem method overrides */
-	item_class->realize     = e_meeting_time_selector_item_realize;
-	item_class->unrealize   = e_meeting_time_selector_item_unrealize;
-	item_class->update      = e_meeting_time_selector_item_update;
-	item_class->draw        = e_meeting_time_selector_item_draw;
-	item_class->point       = e_meeting_time_selector_item_point;
-	item_class->event       = e_meeting_time_selector_item_event;
-}
-
-
-static void
-e_meeting_time_selector_item_init (EMeetingTimeSelectorItem *mts_item)
-{
-	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (mts_item);
-	
-	mts_item->mts = NULL;
-
-	mts_item->main_gc = NULL;
-	mts_item->stipple_gc = NULL;
-
-	/* Create the cursors. */
-	mts_item->normal_cursor = gdk_cursor_new (GDK_LEFT_PTR);
-	mts_item->resize_cursor = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW);
-	mts_item->last_cursor_set = NULL;
-
-	item->x1 = 0;
-	item->y1 = 0;
-	item->x2 = 0;
-	item->y2 = 0;
-}
-
-
-static void
-e_meeting_time_selector_item_destroy (GtkObject *object)
-{
-	EMeetingTimeSelectorItem *mts_item;
-
-	mts_item = E_MEETING_TIME_SELECTOR_ITEM (object);
-
-	gdk_cursor_destroy (mts_item->normal_cursor);
-	gdk_cursor_destroy (mts_item->resize_cursor);
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(*GTK_OBJECT_CLASS (parent_class)->destroy)(object);
-}
-
-
-static void
-e_meeting_time_selector_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EMeetingTimeSelectorItem *mts_item;
-
-	item = GNOME_CANVAS_ITEM (o);
-	mts_item = E_MEETING_TIME_SELECTOR_ITEM (o);
-	
-	switch (arg_id){
-	case ARG_MEETING_TIME_SELECTOR:
-		mts_item->mts = GTK_VALUE_POINTER (*arg);
-		break;
-	}
-}
-
-
-static void
-e_meeting_time_selector_item_realize (GnomeCanvasItem *item)
-{
-	GnomeCanvas *canvas;
-	GdkWindow *window;
-	EMeetingTimeSelectorItem *mts_item;
-
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->realize)
-		(*GNOME_CANVAS_ITEM_CLASS (parent_class)->realize)(item);
-
-	mts_item = E_MEETING_TIME_SELECTOR_ITEM (item);
-
-	canvas = item->canvas;
-	window = GTK_WIDGET (canvas)->window;
-
-	mts_item->main_gc = gdk_gc_new (window);
-	mts_item->stipple_gc = gdk_gc_new (window);
-}
-
-
-static void
-e_meeting_time_selector_item_unrealize (GnomeCanvasItem *item)
-{
-	EMeetingTimeSelectorItem *mts_item;
-
-	mts_item = E_MEETING_TIME_SELECTOR_ITEM (item);
-
-	gdk_gc_unref (mts_item->main_gc);
-	mts_item->main_gc = NULL;
-	gdk_gc_unref (mts_item->stipple_gc);
-	mts_item->stipple_gc = NULL;
-
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->unrealize)
-		(*GNOME_CANVAS_ITEM_CLASS (parent_class)->unrealize)(item);
-}
-
-
-static void
-e_meeting_time_selector_item_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags)
-{
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->update)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->update) (item, affine, clip_path, flags);
-
-	/* The grid covers the entire canvas area. */
-	item->x1 = 0;
-	item->y1 = 0;
-	item->x2 = INT_MAX;
-	item->y2 = INT_MAX;
-}
-
-
-/*
- * DRAWING ROUTINES - functions to paint the canvas item.
- */
-
-static void
-e_meeting_time_selector_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, int height)
-{
-	EMeetingTimeSelector *mts;
-	EMeetingTimeSelectorItem *mts_item;
-	EMeetingTimeSelectorAttendee *attendee;
-	gint day_x, meeting_start_x, meeting_end_x, bar_y, bar_height;
-	gint row, row_y, start_x, end_x;
-	GDate date, last_date, current_date;
-	gboolean is_display_top, show_meeting_time;
-	GdkGC *gc, *stipple_gc;
-
-	mts_item = E_MEETING_TIME_SELECTOR_ITEM (item);
-	mts = mts_item->mts;
-	g_return_if_fail (mts != NULL);
-	gc = mts_item->main_gc;
-	stipple_gc = mts_item->stipple_gc;
-
-	is_display_top = (GTK_WIDGET (item->canvas) == mts->display_top)
-		? TRUE : FALSE;
-
-	/* Calculate the first and last visible days and positions. */
-	e_meeting_time_selector_calculate_day_and_position (mts, x,
-							    &date, &day_x);
-	e_meeting_time_selector_calculate_day_and_position (mts, x + width,
-							    &last_date, NULL);
-
-	/* For the top display draw the 'All Attendees' row background. */
-	if (is_display_top) {
-		gdk_gc_set_foreground (gc, &mts->all_attendees_bg_color);
-		gdk_draw_rectangle (drawable, gc, TRUE,
-				    0, mts->row_height * 2 - y,
-				    width, mts->row_height);
-	} else {
-		gdk_gc_set_foreground (gc, &mts->bg_color);
-		gdk_draw_rectangle (drawable, gc, TRUE, 0, 0, width, height);
-	}
-
-	/* Calculate the x coordinates of the meeting time. */
-	show_meeting_time = e_meeting_time_selector_get_meeting_time_positions (mts, &meeting_start_x, &meeting_end_x);
-
-	/* Draw the meeting time background. */
-	if (show_meeting_time
-	    && (meeting_end_x - 1 >= x) && (meeting_start_x + 1 < x + width)
-	    && (meeting_end_x - meeting_start_x > 2)) {
-		gdk_gc_set_foreground (gc, &mts->meeting_time_bg_color);
-		if (is_display_top)
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    meeting_start_x + 1 - x, mts->row_height * 2 - y,
-					    meeting_end_x - meeting_start_x - 2, mts->row_height);
-		else
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    meeting_start_x + 1 - x, 0,
-					    meeting_end_x - meeting_start_x - 2, height);
-	}
-
-	/* For the main display draw the stipple background for attendee's
-	   that have no calendar information. */
-	if (!is_display_top) {
-		gdk_gc_set_foreground (gc, &mts->grid_color);
-		gdk_gc_set_foreground (stipple_gc, &mts->grid_color);
-		gdk_gc_set_background (stipple_gc, &mts->stipple_bg_color);
-		gdk_gc_set_stipple (stipple_gc, mts->stipple);
-		gnome_canvas_set_stipple_origin (item->canvas, stipple_gc);
-		gdk_gc_set_fill (stipple_gc, GDK_OPAQUE_STIPPLED);
-		row = y / mts->row_height;
-		row_y = row * mts->row_height - y;
-		while (row < mts->attendees->len && row_y < height) {
-			attendee = &g_array_index (mts->attendees,
-						   EMeetingTimeSelectorAttendee, row);
-			if (attendee->has_calendar_info) {
-				if (e_meeting_time_selector_item_calculate_busy_range (mts, row, x, width, &start_x, &end_x)) {
-					if (start_x >= width || end_x <= 0) {
-						gdk_draw_rectangle (drawable, stipple_gc, TRUE, 0, row_y, width, mts->row_height);
-					} else {
-						if (start_x >= 0) {
-							gdk_draw_rectangle (drawable, stipple_gc, TRUE, 0, row_y, start_x, mts->row_height);
-							gdk_draw_line (drawable, gc, start_x, row_y, start_x, row_y + mts->row_height);
-						}
-						if (end_x <= width) {
-							gdk_draw_rectangle (drawable, stipple_gc, TRUE, end_x, row_y, width - end_x, mts->row_height);
-							gdk_draw_line (drawable, gc, end_x, row_y, end_x, row_y + mts->row_height);
-						}
-					}
-				}
-			} else {
-				gdk_draw_rectangle (drawable, stipple_gc, TRUE,
-						    0, row_y,
-						    width, mts->row_height);
-			}
-			row++;
-			row_y += mts->row_height;
-		}
-		gdk_gc_set_fill (gc, GDK_SOLID);
-	}
-
-	/* Now paint the visible days one by one. */
-	current_date = date;
-	for (;;) {
-		/* Currently we use the same GnomeCanvasItem class for the
-		   top display and the main display. We may use separate
-		   classes in future if necessary. */
-		if (is_display_top)
-			e_meeting_time_selector_item_paint_day_top (mts_item, drawable, &current_date, day_x, y, width, height);
-		else
-			e_meeting_time_selector_item_paint_day (mts_item, drawable, &current_date, day_x, y, width, height);
-
-		day_x += mts_item->mts->day_width;
-		if (g_date_compare (&current_date, &last_date) == 0)
-			break;
-		g_date_add_days (&current_date, 1);
-	}
-
-	/* Draw the busy periods. */
-	if (is_display_top)
-		e_meeting_time_selector_item_paint_all_attendees_busy_periods (mts_item, drawable, &date, x, y, width, height);
-	else
-		e_meeting_time_selector_item_paint_busy_periods (mts_item, drawable, &date, x, y, width, height);
-
-
-	/* Draw the currently-selected meeting time vertical bars. */
-	if (show_meeting_time) {
-		if (is_display_top) {
-			bar_y = mts->row_height * 2 - y;
-			bar_height = mts->row_height;
-		} else {
-			bar_y = 0;
-			bar_height = height;
-		}
-
-		gdk_gc_set_foreground (gc, &mts->grid_color);
-
-		if ((meeting_start_x + 2 >= x)
-		    && (meeting_start_x - 2 < x + width)) {
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    meeting_start_x - 2 - x, bar_y,
-					    5, bar_height);
-		}
-
-		if ((meeting_end_x + 2 >= x)
-		    && (meeting_end_x - 2 < x + width)) {
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    meeting_end_x - 2 - x, bar_y,
-					    5, bar_height);
-		}
-	}
-}
-
-
-static void
-e_meeting_time_selector_item_paint_day_top (EMeetingTimeSelectorItem *mts_item,
-					    GdkDrawable *drawable, GDate *date,
-					    int x, int scroll_y,
-					    int width, int height)
-{
-	EMeetingTimeSelector *mts;
-	GdkGC *gc;
-	GdkFont *font;
-	gint y, grid_x;
-	gchar buffer[128], *format;
-	gint hour, hour_x, hour_y;
-	GdkRectangle clip_rect;
-
-	mts = mts_item->mts;
-	gc = mts_item->main_gc;
-
-	gdk_gc_set_foreground (gc, &mts->grid_color);
-
-	/* Draw the horizontal lines. */
-	y = mts->row_height - 1 - scroll_y;
-	gdk_draw_line (drawable, gc, x, y, x + mts->day_width - 1, y);
-	gdk_gc_set_foreground (gc, &mts->grid_shadow_color);
-	gdk_draw_line (drawable, gc, x, y + 1, x + mts->day_width - 1, y + 1);
-	gdk_gc_set_foreground (gc, &mts->grid_color);
-	y += mts->row_height;
-	gdk_draw_line (drawable, gc, x, y, x + mts->day_width - 1, y);
-	y += mts->row_height;
-	gdk_draw_line (drawable, gc, x, y, x + mts->day_width - 1, y);
-
-
-	/* Draw the vertical grid lines. */
-	for (grid_x = mts->col_width - 1;
-	     grid_x < mts->day_width - mts->col_width;
-	     grid_x += mts->col_width) {
-		gdk_draw_line (drawable, gc,
-			       x + grid_x, mts->row_height * 2 - 4 - scroll_y,
-			       x + grid_x, height);
-	}
-	grid_x = mts->day_width - 2;
-	gdk_draw_line (drawable, gc, x + grid_x, 0, x + grid_x, height);
-	grid_x++;
-	gdk_draw_line (drawable, gc, x + grid_x, 0, x + grid_x, height);
-
-	/* Draw the date. Set a clipping rectangle so we don't draw over the
-	   next day. */
-	font = GTK_WIDGET (mts)->style->font;
-	if (mts->date_format == E_MEETING_TIME_SELECTOR_DATE_FULL)
-		/* This is a strftime() format string %A = full weekday name,
-		   %B = full month name, %d = month day, %Y = full year. */
-		format = _("%A, %B %d, %Y");
-	else if (mts->date_format == E_MEETING_TIME_SELECTOR_DATE_ABBREVIATED_DAY)
-		/* This is a strftime() format string %a = abbreviated weekday
-		   name, %m = month number, %d = month day, %Y = full year. */
-		format = _("%a %m/%d/%Y");
-	else
-		/* This is a strftime() format string %m = month number,
-		   %d = month day, %Y = full year. */
-		format = _("%m/%d/%Y");
-
-	g_date_strftime (buffer, sizeof (buffer), format, date);
-
-	clip_rect.x = x;
-	clip_rect.y = -scroll_y;
-	clip_rect.width = mts->day_width - 2;
-	clip_rect.height = mts->row_height - 2;
-	gdk_gc_set_clip_rectangle (gc, &clip_rect);
-	gdk_draw_string (drawable, font, gc,
-			 x + 4, 4 + font->ascent - scroll_y, buffer);
-	gdk_gc_set_clip_rectangle (gc, NULL);
-
-	/* Draw the hours. */
-	hour = mts->first_hour_shown + (mts->zoomed_out ? 3 : 1);
-	hour_x = x + mts->col_width;
-	hour_y = mts->row_height + 4 + font->ascent - scroll_y;
-	while (hour < mts->last_hour_shown) {
-		gdk_draw_string (drawable, font, gc,
-				 hour_x - (mts->hour_widths[hour] / 2),
-				 hour_y, EMeetingTimeSelectorHours[hour]);
-
-		hour += mts->zoomed_out ? 3 : 1;
-		hour_x += mts->col_width;
-	}
-}
-
-
-/* This paints the colored bars representing busy periods for the combined
-   list of attendees. For now we just paint the bars for each attendee of
-   each other. If we want to speed it up we could optimise it later. */
-static void
-e_meeting_time_selector_item_paint_all_attendees_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, int x, int scroll_y, int width, int height)
-{
-	EMeetingTimeSelector *mts;
-	EMeetingTimeSelectorBusyType busy_type;
-	gint row, y;
-	GdkGC *gc;
-	gint *first_periods;
-
-	mts = mts_item->mts;
-	gc = mts_item->main_gc;
-
-	/* Calculate the y coordinate to paint the row at in the drawable. */
-	y = 2 * mts->row_height - scroll_y - 1;
-
-	/* Get the first visible busy periods for all the attendees. */
-	first_periods = g_new (gint, mts->attendees->len);
-	for (row = 0; row < mts->attendees->len; row++) {
-		first_periods[row] = e_meeting_time_selector_item_find_first_busy_period (mts_item, date, row);
-	}
-
-	for (busy_type = 0;
-	     busy_type < E_MEETING_TIME_SELECTOR_BUSY_LAST;
-	     busy_type++) {
-		gdk_gc_set_foreground (gc, &mts->busy_colors[busy_type]);
-		for (row = 0; row < mts->attendees->len; row++) {
-			if (first_periods[row] == -1)
-				continue;
-			e_meeting_time_selector_item_paint_attendee_busy_periods (mts_item, drawable, x, y, width, row, first_periods[row], busy_type);
-		}
-	}
-
-	g_free (first_periods);
-}
-
-
-static void
-e_meeting_time_selector_item_paint_day (EMeetingTimeSelectorItem *mts_item,
-					GdkDrawable *drawable, GDate *date,
-					int x, int scroll_y,
-					int width, int height)
-{
-	EMeetingTimeSelector *mts;
-	GdkGC *gc;
-	gint grid_x, grid_y, attendee_index, unused_y;
-
-	mts = mts_item->mts;
-	gc = mts_item->main_gc;
-
-	/* Draw the grid lines. The grid lines around unused rows are drawn in
-	   a different color. */
-
-	/* Draw the horizontal grid lines. */
-	attendee_index = scroll_y / mts->row_height;
-#if E_MEETING_TIME_SELECTOR_DRAW_GRID_LINES_AT_BOTTOM
-	for (grid_y = mts->row_height - 1 - (scroll_y % mts->row_height);
-#else
-	for (grid_y = - (scroll_y % mts->row_height);
-#endif
-	     grid_y < height;
-	     grid_y += mts->row_height)
-	  {
-		  if (attendee_index <= mts->attendees->len) {
-			  gdk_gc_set_foreground (gc, &mts->grid_color);
-			  gdk_draw_line (drawable, gc, 0, grid_y,
-					 width, grid_y);
-		  } else {
-			  gdk_gc_set_foreground (gc, &mts->grid_unused_color);
-			  gdk_draw_line (drawable, gc, 0, grid_y,
-					 width, grid_y);
-		  }
-		  attendee_index++;
-	  }
-
-	/* Draw the vertical grid lines. */
-	unused_y = (mts->attendees->len * mts->row_height) - scroll_y;
-	if (unused_y >= 0) {
-		gdk_gc_set_foreground (gc, &mts->grid_color);
-		for (grid_x = mts->col_width - 1;
-		     grid_x < mts->day_width - mts->col_width;
-		     grid_x += mts->col_width)
-			{
-				gdk_draw_line (drawable, gc,
-					       x + grid_x, 0,
-					       x + grid_x, unused_y - 1);
-			}
-		gdk_draw_rectangle (drawable, gc, TRUE,
-				    x + mts->day_width - 2, 0,
-				    2, unused_y);
-	}
-
-	if (unused_y < height) {
-		gdk_gc_set_foreground (gc, &mts->grid_unused_color);
-		for (grid_x = mts->col_width - 1;
-		     grid_x < mts->day_width - mts->col_width;
-		     grid_x += mts->col_width)
-			{
-				gdk_draw_line (drawable, gc,
-					       x + grid_x, unused_y,
-					       x + grid_x, height);
-			}
-		gdk_draw_rectangle (drawable, gc, TRUE,
-				    x + mts->day_width - 2, unused_y,
-				    2, height - unused_y);
-	}
-
-
-}
-
-
-/* This paints the colored bars representing busy periods for the individual
-   attendees. */
-static void
-e_meeting_time_selector_item_paint_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, int x, int scroll_y, int width, int height)
-{
-	EMeetingTimeSelector *mts;
-	EMeetingTimeSelectorBusyType busy_type;
-	gint row, y, first_period;
-	GdkGC *gc;
-
-	mts = mts_item->mts;
-	gc = mts_item->main_gc;
-
-	/* Calculate the first visible attendee row. */
-	row = scroll_y / mts->row_height;
-
-	/* Calculate the y coordinate to paint the row at in the drawable. */
-	y = row * mts->row_height - scroll_y;
-
-	/* Step through the attendees painting the busy periods. */
-	while (y < height && row < mts->attendees->len) {
-
-		/* Find the first visible busy period. */
-		first_period = e_meeting_time_selector_item_find_first_busy_period (mts_item, date, row);
-		if (first_period != -1) {
-			/* Paint the different types of busy periods, in
-			   reverse order of precedence, so the highest
-			   precedences are displayed. */
-			for (busy_type = 0;
-			     busy_type < E_MEETING_TIME_SELECTOR_BUSY_LAST;
-			     busy_type++) {
-				gdk_gc_set_foreground (gc, &mts->busy_colors[busy_type]);
-				e_meeting_time_selector_item_paint_attendee_busy_periods (mts_item, drawable, x, y, width, row, first_period, busy_type);
-			}
-		}
-		y += mts->row_height;
-		row++;
-	}
-}
-
-
-/* This subtracts the attendees longest_period_in_days from the given date,
-   and does a binary search of the attendee's busy periods array to find the
-   first one which could possible end on the given day or later.
-   If none are found it returns -1. */
-static gint
-e_meeting_time_selector_item_find_first_busy_period (EMeetingTimeSelectorItem *mts_item, GDate *date, gint row)
-{
-	EMeetingTimeSelector *mts;
-	EMeetingTimeSelectorAttendee *attendee;
-	EMeetingTimeSelectorPeriod *period;
-	gint period_num;
-
-	mts = mts_item->mts;
-
-	attendee = &g_array_index (mts->attendees,
-				   EMeetingTimeSelectorAttendee, row);
-
-	period_num = e_meeting_time_selector_find_first_busy_period (mts, attendee, date);
-	if (period_num == -1)
-		return -1;
-
-	/* Check if the period starts after the end of the current canvas
-	   scroll area. */
-	period = &g_array_index (attendee->busy_periods,
-				 EMeetingTimeSelectorPeriod, period_num);
-	if (g_date_compare (&mts->last_date_shown, &period->start.date) < 0)
-		return -1;
-
-	return period_num;
-}
-
-
-/* This paints the visible busy periods for one attendee which are of a certain
-   busy type, e.g out of office. It is passed the index of the first visible
-   busy period of the attendee and continues until it runs off the screen. */
-static void
-e_meeting_time_selector_item_paint_attendee_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, int x, int y, int width, int row, int first_period, EMeetingTimeSelectorBusyType busy_type)
-{
-	EMeetingTimeSelector *mts;
-	EMeetingTimeSelectorAttendee *attendee;
-	EMeetingTimeSelectorPeriod *period;
-	GdkGC *gc;
-	gint period_num, x1, x2, x2_within_day, x2_within_col;
-
-	mts = mts_item->mts;
-	gc = mts_item->main_gc;
-
-	attendee = &g_array_index (mts->attendees,
-				   EMeetingTimeSelectorAttendee, row);
-
-	for (period_num = first_period;
-	     period_num < attendee->busy_periods->len;
-	     period_num++) {
-		period = &g_array_index (attendee->busy_periods,
-					 EMeetingTimeSelectorPeriod, period_num);
-
-		if (period->busy_type != busy_type)
-			continue;
-
-		/* Convert the period start and end times to x coordinates. */
-		x1 = e_meeting_time_selector_calculate_time_position (mts, &period->start);
-		/* If the period is off the right of the area being drawn, we
-		   are finished. */
-		if (x1 >= x + width)
-			return;
-
-		x2 = e_meeting_time_selector_calculate_time_position (mts, &period->end);
-		/* If the period is off the left edge of the area skip it. */
-		if (x2 <= x)
-			continue;
-
-		/* We paint from x1 to x2 - 1, so that for example a time
-		   from 5:00-6:00 is distinct from 6:00-7:00.
-		   We never finish on a grid line separating days, and we only
-		   ever paint on a normal vertical grid line if the period is
-		   only 1 pixel wide. */
-		x2_within_day = x2 % mts->day_width;
-		if (x2_within_day == 0) {
-			x2 -= 2;
-		} else if (x2_within_day == mts->day_width - 1) {
-			x2 -= 1;
-		} else {
-			x2_within_col = x2_within_day % mts->col_width;
-			if (x2_within_col == 0 && x2 > x1 + 1)
-				x2 -= 1;
-		}
-
-		/* Paint the rectangle. We leave a gap of 2 pixels at the
-		 top and bottom, remembering that the grid is painted along
-		 the top/bottom line of each row. */
-		if (x2 - x1 > 0) {
-#if E_MEETING_TIME_SELECTOR_DRAW_GRID_LINES_AT_BOTTOM
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    x1 - x, y + 2,
-					    x2 - x1, mts->row_height - 5);
-#else
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    x1 - x, y + 3,
-					    x2 - x1, mts->row_height - 5);
-#endif
-		}
-	}
-}
-
-
-/*
- * CANVAS ITEM ROUTINES - functions to be a GnomeCanvasItem.
- */
-
-/* This is supposed to return the nearest item the the point and the distance.
-   Since we are the only item we just return ourself and 0 for the distance.
-   This is needed so that we get button/motion events. */
-static double
-e_meeting_time_selector_item_point (GnomeCanvasItem *item, double x, double y,
-				    int cx, int cy,
-				    GnomeCanvasItem **actual_item)
-{
-	*actual_item = item;
-	return 0.0;
-}
-
-
-static gint
-e_meeting_time_selector_item_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	EMeetingTimeSelectorItem *mts_item;
-
-	mts_item = E_MEETING_TIME_SELECTOR_ITEM (item);
-
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-		return e_meeting_time_selector_item_button_press (mts_item,
-								  event);
-	case GDK_BUTTON_RELEASE:
-		return e_meeting_time_selector_item_button_release (mts_item,
-								    event);
-	case GDK_MOTION_NOTIFY:
-		return e_meeting_time_selector_item_motion_notify (mts_item,
-								   event);
-	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-
-/* This handles all button press events for the item. If the cursor is over
-   one of the meeting time vertical bars we start a drag. If not we set the
-   meeting time to the nearest half-hour interval.
-   Note that GnomeCanvas converts the event coords to world coords,
-   i.e. relative to the entire canvas scroll area. */
-static gint
-e_meeting_time_selector_item_button_press (EMeetingTimeSelectorItem *mts_item,
-					   GdkEvent *event)
-{
-	EMeetingTimeSelector *mts;
-	EMeetingTimeSelectorTime start_time, end_time;
-	EMeetingTimeSelectorPosition position;
-	GDate *start_date, *end_date;
-	gint x, y;
-
-	mts = mts_item->mts;
-	x = (gint) event->button.x;
-	y = (gint) event->button.y;
-
-	/* Check if we are starting a drag of the vertical meeting time bars.*/
-	position = e_meeting_time_selector_item_get_drag_position (mts_item,
-								   x, y);
-	if (position != E_MEETING_TIME_SELECTOR_POS_NONE) {
-		if (gnome_canvas_item_grab (GNOME_CANVAS_ITEM (mts_item),
-					    GDK_POINTER_MOTION_MASK
-					    | GDK_BUTTON_RELEASE_MASK,
-					    mts_item->resize_cursor,
-					    event->button.time) == 0 /*Success*/) {
-			mts->dragging_position = position;
-			return TRUE;
-		}
-	}
-
-	/* Convert the x coordinate into a EMeetingTimeSelectorTime. */
-	e_meeting_time_selector_calculate_time (mts, x, &start_time);
-	start_date = &start_time.date;
-	end_date = &end_time.date;
-
-	/* Find the nearest half-hour or hour interval, depending on whether
-	   zoomed_out is set. */
-	if (mts->zoomed_out) {
-		start_time.minute = 0;
-		end_time = start_time;
-		end_time.hour += 1;
-	} else {
-		start_time.minute -= start_time.minute % 30;
-		end_time = start_time;
-		end_time.minute += 30;
-	}
-
-	/* Fix any overflows. */
-	e_meeting_time_selector_fix_time_overflows (&end_time);
-
-	/* Set the new meeting time. */
-	e_meeting_time_selector_set_meeting_time (mts_item->mts,
-						  g_date_year (start_date),
-						  g_date_month (start_date),
-						  g_date_day (start_date),
-						  start_time.hour,
-						  start_time.minute,
-						  g_date_year (end_date),
-						  g_date_month (end_date),
-						  g_date_day (end_date),
-						  end_time.hour,
-						  end_time.minute);
-
-
-	return FALSE;
-}
-
-
-/* This handles all button release events for the item. If we were dragging,
-   we finish the drag. */
-static gint
-e_meeting_time_selector_item_button_release (EMeetingTimeSelectorItem *mts_item,
-					     GdkEvent *event)
-{
-	EMeetingTimeSelector *mts;
-
-	mts = mts_item->mts;
-
-	/* Reset any drag. */
-	if (mts->dragging_position != E_MEETING_TIME_SELECTOR_POS_NONE) {
-		mts->dragging_position = E_MEETING_TIME_SELECTOR_POS_NONE;
-		e_meeting_time_selector_remove_timeout (mts);
-		gnome_canvas_item_ungrab (GNOME_CANVAS_ITEM (mts_item),
-					  event->button.time);
-	}
-
-	return FALSE;
-}
-
-
-/* This handles all motion notify events for the item. If button1 is pressed
-   we check if a drag is in progress. If not, we set the cursor if we are over
-   the meeting time vertical bars. Note that GnomeCanvas doesn't use motion
-   hints, which may affect performance. */
-static gint
-e_meeting_time_selector_item_motion_notify (EMeetingTimeSelectorItem *mts_item,
-					    GdkEvent *event)
-{
-	EMeetingTimeSelector *mts;
-	EMeetingTimeSelectorPosition position;
-	GdkCursor *cursor;
-	gint x, y;
-
-	mts = mts_item->mts;
-	x = (gint) event->motion.x;
-	y = (gint) event->motion.y;
-
-	if (mts->dragging_position != E_MEETING_TIME_SELECTOR_POS_NONE) {
-		e_meeting_time_selector_drag_meeting_time (mts, x);
-		return TRUE;
-	}
-
-	position = e_meeting_time_selector_item_get_drag_position (mts_item,
-								   x, y);
-
-	/* Determine which cursor should be used. */
-	if (position == E_MEETING_TIME_SELECTOR_POS_NONE)
-		cursor = mts_item->normal_cursor;
-	else
-		cursor = mts_item->resize_cursor;
-
-	/* Only set the cursor if it is different to the last one we set. */
-	if (mts_item->last_cursor_set != cursor) {
-		mts_item->last_cursor_set = cursor;
-		gdk_window_set_cursor (GTK_WIDGET (GNOME_CANVAS_ITEM (mts_item)->canvas)->window, cursor);
-	}
-
-	return FALSE;
-}
-
-
-static EMeetingTimeSelectorPosition
-e_meeting_time_selector_item_get_drag_position (EMeetingTimeSelectorItem *mts_item,
-						gint x, gint y)
-{
-	EMeetingTimeSelector *mts;
-	gboolean is_display_top;
-	gint meeting_start_x, meeting_end_x;
-
-	mts = mts_item->mts;
-
-	is_display_top = (GTK_WIDGET (GNOME_CANVAS_ITEM (mts_item)->canvas) == mts->display_top) ? TRUE : FALSE;
-
-	if (is_display_top && y < mts->row_height * 2)
-		return E_MEETING_TIME_SELECTOR_POS_NONE;
-
-	if (!e_meeting_time_selector_get_meeting_time_positions (mts, &meeting_start_x, &meeting_end_x))
-		return E_MEETING_TIME_SELECTOR_POS_NONE;
-
-	if (x >= meeting_end_x - 2 && x <= meeting_end_x + 2)
-		return E_MEETING_TIME_SELECTOR_POS_END;
-
-	if (x >= meeting_start_x - 2 && x <= meeting_start_x + 2)
-		return E_MEETING_TIME_SELECTOR_POS_START;
-
-	return E_MEETING_TIME_SELECTOR_POS_NONE;
-}
-
-
-static gboolean
-e_meeting_time_selector_item_calculate_busy_range (EMeetingTimeSelector *mts,
-						   gint row,
-						   gint x,
-						   gint width,
-						   gint *start_x,
-						   gint *end_x)
-{
-	EMeetingTimeSelectorAttendee *attendee;
-
-	attendee = &g_array_index (mts->attendees,
-				   EMeetingTimeSelectorAttendee, row);
-
-	*start_x = -1;
-	*end_x = -1;
-
-	if (!g_date_valid (&attendee->busy_periods_start.date)
-	    || !g_date_valid (&attendee->busy_periods_end.date))
-		return FALSE;
-
-	*start_x = e_meeting_time_selector_calculate_time_position (mts, &attendee->busy_periods_start) - x - 1;
-
-	*end_x = e_meeting_time_selector_calculate_time_position (mts, &attendee->busy_periods_end) - x;
-
-	return TRUE;
-}
diff --git a/widgets/meeting-time-sel/e-meeting-time-sel-item.h b/widgets/meeting-time-sel/e-meeting-time-sel-item.h
deleted file mode 100644
index 7ad1f232b2..0000000000
--- a/widgets/meeting-time-sel/e-meeting-time-sel-item.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@gtk.org>
- *
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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
- */
-
-/*
- * MeetingTimeSelectorItem - A GnomeCanvasItem which is used for both the main
- * display canvas and the top display (with the dates, times & All Attendees).
- * I didn't make these separate GnomeCanvasItems since they share a lot of
- * code.
- */
-
-#ifndef _E_MEETING_TIME_SELECTOR_ITEM_H_
-#define _E_MEETING_TIME_SELECTOR_ITEM_H_
-
-#include "e-meeting-time-sel.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-#define E_MEETING_TIME_SELECTOR_ITEM(obj)          (GTK_CHECK_CAST((obj), e_meeting_time_selector_item_get_type (), EMeetingTimeSelectorItem))
-#define E_MEETING_TIME_SELECTOR_ITEM_CLASS(k)      (GTK_CHECK_CLASS_CAST ((k), e_meeting_time_selector_item_get_type (), EMeetingTimeSelectorItemClass))
-#define IS_E_MEETING_TIME_SELECTOR_ITEM(o)         (GTK_CHECK_TYPE((o), e_meeting_time_selector_item_get_type ()))
-
-
-typedef struct _EMeetingTimeSelectorItem       EMeetingTimeSelectorItem;
-typedef struct _EMeetingTimeSelectorItemClass  EMeetingTimeSelectorItemClass;
-
-struct _EMeetingTimeSelectorItem
-{
-	GnomeCanvasItem canvas_item;
-
-	/* The parent EMeetingTimeSelector widget. */
-	EMeetingTimeSelector *mts;
-
-	/* This GC is used for most of the drawing. The fg/bg colors are
-	   changed for each bit. */
-	GdkGC *main_gc;
-	GdkGC *stipple_gc;
-
-	/* The normal & resize cursors. */
-	GdkCursor *normal_cursor;
-	GdkCursor *resize_cursor;
-
-	/* This remembers the last cursor set on the window. */
-	GdkCursor *last_cursor_set;
-};
-
-
-struct _EMeetingTimeSelectorItemClass
-{
-	GnomeCanvasItemClass parent_class;
-};
-
-GtkType e_meeting_time_selector_item_get_type (void);
-
-
-#endif /* _E_MEETING_TIME_SELECTOR_ITEM_H_ */
diff --git a/widgets/meeting-time-sel/e-meeting-time-sel-list-item.c b/widgets/meeting-time-sel/e-meeting-time-sel-list-item.c
deleted file mode 100644
index 1a6ddf3e62..0000000000
--- a/widgets/meeting-time-sel/e-meeting-time-sel-list-item.c
+++ /dev/null
@@ -1,397 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@gtk.org>
- *
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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
- */
-
-/*
- * EMeetingTimeSelectorListItem - A GnomeCanvasItem covering the entire attendee
- * list. It just draws the grid lines between the rows and after the icon
- * column. 
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <time.h>
-#include <gtk/gtksignal.h>
-#include <gal/widgets/e-canvas.h>
-#include "e-meeting-time-sel-list-item.h"
-#include "e-meeting-time-sel.h"
-
-/* This is the size of our icons. */
-#define E_MEETING_TIME_SELECTOR_ICON_WIDTH 19
-#define E_MEETING_TIME_SELECTOR_ICON_HEIGHT 16
-
-#include "e-meeting-time-sel-mail.xpm"
-#include "e-meeting-time-sel-no-mail.xpm"
-
-static void e_meeting_time_selector_list_item_class_init (EMeetingTimeSelectorListItemClass *mtsl_item_class);
-static void e_meeting_time_selector_list_item_init (EMeetingTimeSelectorListItem *mtsl_item);
-static void e_meeting_time_selector_list_item_destroy (GtkObject *object);
-
-static void e_meeting_time_selector_list_item_set_arg (GtkObject *o, GtkArg *arg,
-						     guint arg_id);
-static void e_meeting_time_selector_list_item_realize (GnomeCanvasItem *item);
-static void e_meeting_time_selector_list_item_unrealize (GnomeCanvasItem *item);
-static void e_meeting_time_selector_list_item_update (GnomeCanvasItem *item,
-						      double *affine,
-						      ArtSVP *clip_path, int flags);
-static void e_meeting_time_selector_list_item_draw (GnomeCanvasItem *item,
-						    GdkDrawable *drawable,
-						    int x, int y,
-						    int width, int height);
-static double e_meeting_time_selector_list_item_point (GnomeCanvasItem *item,
-						       double x, double y,
-						       int cx, int cy,
-						       GnomeCanvasItem **actual_item);
-static gint e_meeting_time_selector_list_item_event (GnomeCanvasItem *item,
-						     GdkEvent	 *event);
-static gboolean e_meeting_time_selector_list_item_button_press (EMeetingTimeSelectorListItem *mtsl_item,
-								GdkEvent *event);
-
-
-static GnomeCanvasItemClass *e_meeting_time_selector_list_item_parent_class;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_MEETING_TIME_SELECTOR
-};
-
-
-GtkType
-e_meeting_time_selector_list_item_get_type (void)
-{
-	static GtkType e_meeting_time_selector_list_item_type = 0;
-
-	if (!e_meeting_time_selector_list_item_type) {
-		GtkTypeInfo e_meeting_time_selector_list_item_info = {
-			"EMeetingTimeSelectorListItem",
-			sizeof (EMeetingTimeSelectorListItem),
-			sizeof (EMeetingTimeSelectorListItemClass),
-			(GtkClassInitFunc) e_meeting_time_selector_list_item_class_init,
-			(GtkObjectInitFunc) e_meeting_time_selector_list_item_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		e_meeting_time_selector_list_item_type = gtk_type_unique (gnome_canvas_item_get_type (), &e_meeting_time_selector_list_item_info);
-	}
-
-	return e_meeting_time_selector_list_item_type;
-}
-
-
-static void
-e_meeting_time_selector_list_item_class_init (EMeetingTimeSelectorListItemClass *mtsl_item_class)
-{
-	GtkObjectClass  *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	e_meeting_time_selector_list_item_parent_class = gtk_type_class (gnome_canvas_item_get_type());
-
-	object_class = (GtkObjectClass *) mtsl_item_class;
-	item_class = (GnomeCanvasItemClass *) mtsl_item_class;
-
-	gtk_object_add_arg_type ("EMeetingTimeSelectorListItem::meeting_time_selector",
-				 GTK_TYPE_POINTER, GTK_ARG_WRITABLE,
-				 ARG_MEETING_TIME_SELECTOR);
-
-	object_class->destroy = e_meeting_time_selector_list_item_destroy;
-	object_class->set_arg = e_meeting_time_selector_list_item_set_arg;
-
-	/* GnomeCanvasItem method overrides */
-	item_class->realize     = e_meeting_time_selector_list_item_realize;
-	item_class->unrealize   = e_meeting_time_selector_list_item_unrealize;
-	item_class->update      = e_meeting_time_selector_list_item_update;
-	item_class->draw        = e_meeting_time_selector_list_item_draw;
-	item_class->point       = e_meeting_time_selector_list_item_point;
-	item_class->event       = e_meeting_time_selector_list_item_event;
-}
-
-
-static void
-e_meeting_time_selector_list_item_init (EMeetingTimeSelectorListItem *mtsl_item)
-{
-	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (mtsl_item);
-	GdkColormap *colormap;
-
-	mtsl_item->mts = NULL;
-
-	colormap = gtk_widget_get_default_colormap ();
-	mtsl_item->mail_icon = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap, &mtsl_item->mail_icon_mask, NULL, e_meeting_time_sel_mail_xpm);
-	mtsl_item->no_mail_icon = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap, &mtsl_item->no_mail_icon_mask, NULL, e_meeting_time_sel_no_mail_xpm);
-
-	item->x1 = 0;
-	item->y1 = 0;
-	item->x2 = 0;
-	item->y2 = 0;
-}
-
-
-static void
-e_meeting_time_selector_list_item_destroy (GtkObject *object)
-{
-	EMeetingTimeSelectorListItem *mtsl_item;
-
-	mtsl_item = E_MEETING_TIME_SELECTOR_LIST_ITEM (object);
-
-	gdk_pixmap_unref (mtsl_item->mail_icon);
-	gdk_pixmap_unref (mtsl_item->no_mail_icon);
-	gdk_bitmap_unref (mtsl_item->mail_icon_mask);
-	gdk_bitmap_unref (mtsl_item->no_mail_icon_mask);
-
-	if (GTK_OBJECT_CLASS (e_meeting_time_selector_list_item_parent_class)->destroy)
-		(*GTK_OBJECT_CLASS (e_meeting_time_selector_list_item_parent_class)->destroy)(object);
-}
-
-
-static void
-e_meeting_time_selector_list_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EMeetingTimeSelectorListItem *mtsl_item;
-
-	item = GNOME_CANVAS_ITEM (o);
-	mtsl_item = E_MEETING_TIME_SELECTOR_LIST_ITEM (o);
-	
-	switch (arg_id){
-	case ARG_MEETING_TIME_SELECTOR:
-		mtsl_item->mts = GTK_VALUE_POINTER (*arg);
-		break;
-	}
-}
-
-
-static void
-e_meeting_time_selector_list_item_realize (GnomeCanvasItem *item)
-{
-	GnomeCanvas *canvas;
-	GdkWindow *window;
-	EMeetingTimeSelectorListItem *mtsl_item;
-
-	if (GNOME_CANVAS_ITEM_CLASS (e_meeting_time_selector_list_item_parent_class)->realize)
-		(*GNOME_CANVAS_ITEM_CLASS (e_meeting_time_selector_list_item_parent_class)->realize)(item);
-
-	mtsl_item = E_MEETING_TIME_SELECTOR_LIST_ITEM (item);
-
-	canvas = item->canvas;
-	window = GTK_WIDGET (canvas)->window;
-
-	mtsl_item->main_gc = gdk_gc_new (window);
-}
-
-
-static void
-e_meeting_time_selector_list_item_unrealize (GnomeCanvasItem *item)
-{
-	EMeetingTimeSelectorListItem *mtsl_item;
-
-	mtsl_item = E_MEETING_TIME_SELECTOR_LIST_ITEM (item);
-
-	gdk_gc_unref (mtsl_item->main_gc);
-	mtsl_item->main_gc = NULL;
-
-	if (GNOME_CANVAS_ITEM_CLASS (e_meeting_time_selector_list_item_parent_class)->unrealize)
-		(*GNOME_CANVAS_ITEM_CLASS (e_meeting_time_selector_list_item_parent_class)->unrealize)(item);
-}
-
-
-static void
-e_meeting_time_selector_list_item_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags)
-{
-	if (GNOME_CANVAS_ITEM_CLASS (e_meeting_time_selector_list_item_parent_class)->update)
-		(* GNOME_CANVAS_ITEM_CLASS (e_meeting_time_selector_list_item_parent_class)->update) (item, affine, clip_path, flags);
-
-	/* The item covers the entire canvas area. */
-	item->x1 = 0;
-	item->y1 = 0;
-	item->x2 = INT_MAX;
-	item->y2 = INT_MAX;
-}
-
-
-/*
- * DRAWING ROUTINES - functions to paint the canvas item.
- */
-
-static void
-e_meeting_time_selector_list_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, int height)
-{
-	EMeetingTimeSelectorListItem *mtsl_item;
-	EMeetingTimeSelector *mts;
-	EMeetingTimeSelectorAttendee *attendee;
-	GdkGC *gc;
-	GdkFont *font;
-	gint row, row_y, icon_x, icon_y;
-	GdkPixmap *pixmap;
-	GdkBitmap *mask;
-
-	mtsl_item = E_MEETING_TIME_SELECTOR_LIST_ITEM (item);
-	mts = mtsl_item->mts;
-	gc = mtsl_item->main_gc;
-
-	gdk_gc_set_foreground (gc, &mts->attendee_list_bg_color);
-	gdk_draw_rectangle (drawable, gc, TRUE, 0, 0, width, height);
-
-	gdk_gc_set_foreground (gc, &mts->grid_unused_color);
-	gdk_draw_line (drawable, gc, 24 - x, 0, 24 - x, height);
-
-	/* Draw the grid line across the top of the row. */
-	row = y / mts->row_height;
-	row_y = row * mts->row_height - y;
-	while (row_y < height) {
-		gdk_draw_line (drawable, gc, 0, row_y, width, row_y);
-		row_y += mts->row_height;
-	}
-
-	row = y / mts->row_height;
-	row_y = row * mts->row_height - y;
-	icon_x = (E_MEETING_TIME_SELECTOR_ICON_COLUMN_WIDTH - E_MEETING_TIME_SELECTOR_ICON_WIDTH + 1) / 2 - x;
-	icon_y = row_y + (mts->row_height - E_MEETING_TIME_SELECTOR_ICON_HEIGHT + 1) / 2;
-	while (row < mts->attendees->len && row_y < height) {
-		attendee = &g_array_index (mts->attendees,
-					   EMeetingTimeSelectorAttendee, row);
-
-		gdk_gc_set_clip_origin (gc, icon_x, icon_y);
-
-		if (attendee->send_meeting_to) {
-			pixmap = mtsl_item->mail_icon;
-			mask = mtsl_item->mail_icon_mask;
-		} else {
-			pixmap = mtsl_item->no_mail_icon;
-			mask = mtsl_item->no_mail_icon_mask;
-		}
-
-		gdk_gc_set_clip_mask (gc, mask);
-		gdk_draw_pixmap (drawable, gc, pixmap, 0, 0,
-				 icon_x, icon_y, 24, 24);
-
-		row++;
-		row_y += mts->row_height;
-		icon_y += mts->row_height;
-	}
-	gdk_gc_set_clip_mask (gc, NULL);
-
-	/* Draw 'Click here to add attendee' on the last dummy row. */
-	row_y = mts->attendees->len * mts->row_height;
-
-	font = GTK_WIDGET (mts)->style->font;
-	gdk_gc_set_foreground (gc, &mts->grid_unused_color);
-	gdk_draw_string (drawable, font, gc,
-			 E_MEETING_TIME_SELECTOR_ICON_COLUMN_WIDTH
-			 + E_MEETING_TIME_SELECTOR_TEXT_X_PAD - x,
-			 row_y + E_MEETING_TIME_SELECTOR_TEXT_Y_PAD
-			 + font->ascent + 1 - y,
-			 "Click here to add attendee");
-}
-
-
-/* This is supposed to return the nearest item the the point and the distance.
-   Since we cover the entire canvas we just return ourself and 0 for the
-   distance. This is needed so that we get button/motion events. */
-static double
-e_meeting_time_selector_list_item_point (GnomeCanvasItem *item,
-					 double x, double y,
-					 int cx, int cy,
-					 GnomeCanvasItem **actual_item)
-{
-	*actual_item = item;
-	return 0.0;
-}
-
-
-static gint
-e_meeting_time_selector_list_item_event (GnomeCanvasItem *item,
-					 GdkEvent *event)
-{
-	EMeetingTimeSelectorListItem *mtsl_item;
-
-	mtsl_item = E_MEETING_TIME_SELECTOR_LIST_ITEM (item);
-
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-		return e_meeting_time_selector_list_item_button_press (mtsl_item, event);
-	case GDK_BUTTON_RELEASE:
-		break;
-	case GDK_MOTION_NOTIFY:
-		break;
-	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-
-static gboolean
-e_meeting_time_selector_list_item_button_press (EMeetingTimeSelectorListItem *mtsl_item,
-						GdkEvent *event)
-{
-	EMeetingTimeSelector *mts;
-	EMeetingTimeSelectorAttendee *attendee;
-	gint row;
-	gboolean return_val;
-
-	mts = mtsl_item->mts;
-	row = event->button.y / mts->row_height;
-
-	g_print ("In e_meeting_time_selector_list_item_button_press: %g,%g row:%i\n",
-		 event->button.x, event->button.y, row);
-
-	if (event->button.x >= E_MEETING_TIME_SELECTOR_ICON_COLUMN_WIDTH) {
-		if (row < mts->attendees->len) {
-			attendee = &g_array_index (mts->attendees, EMeetingTimeSelectorAttendee, row);
-			gtk_signal_emit_by_name (GTK_OBJECT (attendee->text_item),
-						 "event", event, &return_val);
-			return return_val;
-		} else {
-			row = e_meeting_time_selector_attendee_add (mts, "",
-								    NULL);
-
-			/* Scroll down to show the last line.?? */
-#if 0
-			adjustment = GTK_LAYOUT (mts->display_main)->vadjustment;
-			adjustment->value = adjustment->upper - adjustment->page_size;
-			gtk_adjustment_value_changed (adjustment);
-#endif
-
-			attendee = &g_array_index (mts->attendees, EMeetingTimeSelectorAttendee, row);
-			e_canvas_item_grab_focus (attendee->text_item, TRUE);
-			return TRUE;
-		}
-	} else {
-		attendee = &g_array_index (mts->attendees,
-					   EMeetingTimeSelectorAttendee, row);
-
-		attendee->send_meeting_to = !attendee->send_meeting_to;
-
-		gnome_canvas_request_redraw (GNOME_CANVAS_ITEM (mtsl_item)->canvas,
-					     0, row * mts->row_height,
-					     E_MEETING_TIME_SELECTOR_ICON_COLUMN_WIDTH,
-					     (row + 1) * mts->row_height);
-		return TRUE;
-	}
-}
-
diff --git a/widgets/meeting-time-sel/e-meeting-time-sel-list-item.h b/widgets/meeting-time-sel/e-meeting-time-sel-list-item.h
deleted file mode 100644
index b71474b0e9..0000000000
--- a/widgets/meeting-time-sel/e-meeting-time-sel-list-item.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@gtk.org>
- *
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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
- */
-
-/*
- * MeetingTimeSelectorListItem - A GnomeCanvasItem covering the entire attendee
- * list. It just draws the grid lines between the rows and after the icon
- * column. 
- */
-
-#ifndef _E_MEETING_TIME_SELECTOR_LIST_ITEM_H_
-#define _E_MEETING_TIME_SELECTOR_LIST_ITEM_H_
-
-#include "e-meeting-time-sel.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-#define E_MEETING_TIME_SELECTOR_LIST_ITEM(obj)          (GTK_CHECK_CAST((obj), e_meeting_time_selector_list_item_get_type (), EMeetingTimeSelectorListItem))
-#define E_MEETING_TIME_SELECTOR_LIST_ITEM_CLASS(k)      (GTK_CHECK_CLASS_CAST ((k), e_meeting_time_selector_list_item_get_type (), EMeetingTimeSelectorListItemClass))
-#define IS_E_MEETING_TIME_SELECTOR_LIST_ITEM(o)         (GTK_CHECK_TYPE((o), e_meeting_time_selector_list_item_get_type ()))
-
-
-typedef struct _EMeetingTimeSelectorListItem      EMeetingTimeSelectorListItem;
-typedef struct _EMeetingTimeSelectorListItemClass EMeetingTimeSelectorListItemClass;
-
-struct _EMeetingTimeSelectorListItem
-{
-	GnomeCanvasItem canvas_item;
-
-	/* The parent EMeetingTimeSelector widget. */
-	EMeetingTimeSelector *mts;
-
-	/* This GC is used for most of the drawing. The fg/bg colors are
-	   changed for each bit. */
-	GdkGC *main_gc;
-
-	GdkPixmap *mail_icon, *no_mail_icon;
-	GdkBitmap *mail_icon_mask, *no_mail_icon_mask;
-};
-
-
-struct _EMeetingTimeSelectorListItemClass
-{
-	GnomeCanvasItemClass parent_class;
-};
-
-GtkType e_meeting_time_selector_list_item_get_type (void);
-
-
-#endif /* _E_MEETING_TIME_SELECTOR_LIST_ITEM_H_ */
diff --git a/widgets/meeting-time-sel/e-meeting-time-sel-mail.xpm b/widgets/meeting-time-sel/e-meeting-time-sel-mail.xpm
deleted file mode 100644
index 5a03c7ea8a..0000000000
--- a/widgets/meeting-time-sel/e-meeting-time-sel-mail.xpm
+++ /dev/null
@@ -1,135 +0,0 @@
-/* XPM */
-static char * e_meeting_time_sel_mail_xpm[] = {
-"19 16 116 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #7B7B78",
-"@ 	c #C7C7C3",
-"# 	c #F1F0EB",
-"$ 	c #BFBFBC",
-"% 	c #5F5E5E",
-"& 	c #E3E3DF",
-"* 	c #F3F3EF",
-"= 	c #F2F2EE",
-"- 	c #F1F1EC",
-"; 	c #F0EFEB",
-"> 	c #D2D2CD",
-", 	c #969592",
-"' 	c #616060",
-") 	c #B5B5B4",
-"! 	c #F8F8F6",
-"~ 	c #F7F7F5",
-"{ 	c #F6F6F3",
-"] 	c #F5F5F2",
-"^ 	c #F4F4F0",
-"/ 	c #F2F1ED",
-"( 	c #F1F0EC",
-"_ 	c #F0EFEA",
-": 	c #EFEEE9",
-"< 	c #4F4F4D",
-"[ 	c #BDBCB8",
-"} 	c #A7A6A3",
-"| 	c #C6C6C4",
-"1 	c #7C7C7B",
-"2 	c #525251",
-"3 	c #DBDBD9",
-"4 	c #F5F4F1",
-"5 	c #F4F3F0",
-"6 	c #F3F2EE",
-"7 	c #999894",
-"8 	c #62625F",
-"9 	c #BCBCB6",
-"0 	c #EBE9E3",
-"a 	c #838381",
-"b 	c #D7D6D4",
-"c 	c #A8A8A6",
-"d 	c #515150",
-"e 	c #7E7D7C",
-"f 	c #DAD9D5",
-"g 	c #EFEEE8",
-"h 	c #EEEDE7",
-"i 	c #4F4E4C",
-"j 	c #BCBBB6",
-"k 	c #EBE9E2",
-"l 	c #EAE8E1",
-"m 	c #F6F5F2",
-"n 	c #F4F3EF",
-"o 	c #B5B4B1",
-"p 	c #9B9A97",
-"q 	c #646361",
-"r 	c #92918E",
-"s 	c #EEEDE8",
-"t 	c #EDECE6",
-"u 	c #4E4E4C",
-"v 	c #797976",
-"w 	c #797874",
-"x 	c #E9E8E1",
-"y 	c #E8E7DF",
-"z 	c #B4B3AF",
-"A 	c #D0D0CD",
-"B 	c #F2F2ED",
-"C 	c #BFBEBA",
-"D 	c #BEBDB9",
-"E 	c #7A7A77",
-"F 	c #979691",
-"G 	c #EAE9E2",
-"H 	c #959590",
-"I 	c #787773",
-"J 	c #B8B7B0",
-"K 	c #E6E4DC",
-"L 	c #A9A9A6",
-"M 	c #626260",
-"N 	c #ECEBE4",
-"O 	c #EBEAE3",
-"P 	c #E9E7E0",
-"Q 	c #E8E6DF",
-"R 	c #E7E5DD",
-"S 	c #777671",
-"T 	c #93918C",
-"U 	c #BEBDB8",
-"V 	c #989793",
-"W 	c #ECEAE4",
-"X 	c #E8E6DE",
-"Y 	c #E6E4DB",
-"Z 	c #E4E3DA",
-"` 	c #75746F",
-" .	c #91908A",
-"..	c #EEECE7",
-"+.	c #62615F",
-"@.	c #EBEAE4",
-"#.	c #E7E6DE",
-"$.	c #E6E5DC",
-"%.	c #E5E4DB",
-"&.	c #E4E2DA",
-"*.	c #CCCBC4",
-"=.	c #A3A29D",
-"-.	c #B6B5B2",
-";.	c #BCBCB7",
-">.	c #CDCCC6",
-",.	c #959490",
-"'.	c #ECEBE5",
-").	c #61615E",
-"!.	c #E9E8E0",
-"~.	c #CECDC7",
-"{.	c #797875",
-"].	c #969590",
-"^.	c #CFCEC8",
-"/.	c #AEADA8",
-"(.	c #585754",
-"_.	c #7B7A76",
-"                      . . . .         ",
-"            . . . . . + @ # $ .       ",
-"  . . . . . % $ & * = - ; > , .       ",
-". ' ) ! ~ { ] ^ * / ( _ : < [ } .     ",
-". | 1 2 3 4 5 6 / # _ : 7 8 9 0 .     ",
-". a b c d e f / # _ g h i j k l .     ",
-"  . m 4 n o p q r s t u v w x y z .   ",
-"  . A * B ( ; C D E u F G H I J K .   ",
-"  . L / ( _ : M t N O l P Q R S T .   ",
-"    . # _ g U V W 0 l P X R Y Z `  .. ",
-"    . ; g ..+.@.G x y #.$.%.&.*.=.. . ",
-"    . -.t ;.F G x y #.K >.,.. . .     ",
-"      . '.).G !.Q ~.H . . .           ",
-"      . {.].^./.. . .                 ",
-"      . (._.. .                       ",
-"        . .                           "};
diff --git a/widgets/meeting-time-sel/e-meeting-time-sel-no-mail.xpm b/widgets/meeting-time-sel/e-meeting-time-sel-no-mail.xpm
deleted file mode 100644
index 747202b3e2..0000000000
--- a/widgets/meeting-time-sel/e-meeting-time-sel-no-mail.xpm
+++ /dev/null
@@ -1,123 +0,0 @@
-/* XPM */
-static char * e_meeting_time_sel_no_mail_xpm[] = {
-"19 16 104 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #7B7B78",
-"@ 	c #C7C7C3",
-"# 	c #F1F0EB",
-"$ 	c #BFBFBC",
-"% 	c #5F5E5E",
-"& 	c #E3E3DF",
-"* 	c #F3F3EF",
-"= 	c #F2F2EE",
-"- 	c #F1F1EC",
-"; 	c #F0EFEB",
-"> 	c #D2D2CD",
-", 	c #969592",
-"' 	c #616060",
-") 	c #B5B5B4",
-"! 	c #F8F8F6",
-"~ 	c #F7F7F5",
-"{ 	c #F6F6F3",
-"] 	c #F5F5F2",
-"^ 	c #F4F4F0",
-"/ 	c #F2F1ED",
-"( 	c #F1F0EC",
-"_ 	c #F0EFEA",
-": 	c #EFEEE9",
-"< 	c #4F4F4D",
-"[ 	c #BDBCB8",
-"} 	c #A7A6A3",
-"| 	c #C6C6C4",
-"1 	c #7C7C7B",
-"2 	c #525251",
-"3 	c #DBDBD9",
-"4 	c #F5F4F1",
-"5 	c #F4F3F0",
-"6 	c #F3F2EE",
-"7 	c #999894",
-"8 	c #62625F",
-"9 	c #BCBCB6",
-"0 	c #EBE9E3",
-"a 	c #838381",
-"b 	c #D7D6D4",
-"c 	c #A8A8A6",
-"d 	c #515150",
-"e 	c #7E7D7C",
-"f 	c #DAD9D5",
-"g 	c #D16069",
-"h 	c #EEEDE7",
-"i 	c #4F4E4C",
-"j 	c #BCBBB6",
-"k 	c #F6F5F2",
-"l 	c #F4F3EF",
-"m 	c #B5B4B1",
-"n 	c #9B9A97",
-"o 	c #646361",
-"p 	c #92918E",
-"q 	c #9F3C44",
-"r 	c #797976",
-"s 	c #B5444E",
-"t 	c #B4B3AF",
-"u 	c #D0D0CD",
-"v 	c #F2F2ED",
-"w 	c #BFBEBA",
-"x 	c #BEBDB9",
-"y 	c #BB565F",
-"z 	c #812F36",
-"A 	c #E6E4DC",
-"B 	c #A9A9A6",
-"C 	c #626260",
-"D 	c #EDECE6",
-"E 	c #ECEBE4",
-"F 	c #BB555D",
-"G 	c #90353D",
-"H 	c #777671",
-"I 	c #93918C",
-"J 	c #EFEEE8",
-"K 	c #BEBDB8",
-"L 	c #989793",
-"M 	c #ECEAE4",
-"N 	c #E6E4DB",
-"O 	c #E4E3DA",
-"P 	c #75746F",
-"Q 	c #91908A",
-"R 	c #EEECE7",
-"S 	c #62615F",
-"T 	c #EBEAE4",
-"U 	c #EAE9E2",
-"V 	c #BD5A62",
-"W 	c #E4E2DA",
-"X 	c #CCCBC4",
-"Y 	c #A3A29D",
-"Z 	c #B6B5B2",
-"` 	c #BCBCB7",
-" .	c #979691",
-"..	c #BC5760",
-"+.	c #A13C45",
-"@.	c #ECEBE5",
-"#.	c #61615E",
-"$.	c #C0636B",
-"%.	c #A83F48",
-"&.	c #797875",
-"*.	c #969590",
-"=.	c #CFCEC8",
-"-.	c #585754",
-";.	c #7B7A76",
-"                      . . . .         ",
-"            . . . . . + @ # $ .       ",
-"  . . . . . % $ & * = - ; > , .       ",
-". ' ) ! ~ { ] ^ * / ( _ : < [ } .     ",
-". | 1 2 3 4 5 6 / # _ : 7 8 9 0 .     ",
-". a b c d e f / # g g h i j g g .     ",
-"  . k 4 l m n o p g q g r g s g t .   ",
-"  . u * v ( ; w x g s g g y z g A .   ",
-"  . B / ( _ : C D E g s F G g H I .   ",
-"    . # _ J K L M 0 g s s g N O P Q . ",
-"    . ; J R S T U g V s s g W X Y . . ",
-"    . Z D `  .U g ..G g g +.g . .     ",
-"      . @.#.U g $.G g . g %.g         ",
-"      . &.*.=.g g g .     g g         ",
-"      . -.;.. .                       ",
-"        . .                           "};
diff --git a/widgets/meeting-time-sel/e-meeting-time-sel.c b/widgets/meeting-time-sel/e-meeting-time-sel.c
deleted file mode 100644
index c00bed73b1..0000000000
--- a/widgets/meeting-time-sel/e-meeting-time-sel.c
+++ /dev/null
@@ -1,3308 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@gtk.org>
- *
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-meeting-time-sel.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <glib.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkdrawingarea.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkhscrollbar.h>
-#include <gtk/gtkhseparator.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkvscrollbar.h>
-#include <libgnomeui/gnome-dateedit.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-canvas-widget.h>
-
-#include <gal/widgets/e-canvas.h>
-#include <gal/widgets/e-canvas-utils.h>
-#include "e-meeting-time-sel-item.h"
-#include "e-meeting-time-sel-list-item.h"
-
-/* An array of hour strings, "0:00" .. "23:00". */
-const gchar *EMeetingTimeSelectorHours[24] = {
-	"0:00", "1:00", "2:00", "3:00", "4:00", "5:00", "6:00", "7:00", 
-	"8:00", "9:00", "10:00", "11:00", "12:00", "13:00", "14:00", "15:00", 
-	"16:00", "17:00", "18:00", "19:00", "20:00", "21:00", "22:00", "23:00"
-};
-
-/* The number of days shown in the entire canvas. */
-#define E_MEETING_TIME_SELECTOR_DAYS_SHOWN		365
-
-/* This is the number of pixels between the mouse has to move before the
-   scroll speed is incremented. */
-#define E_MEETING_TIME_SELECTOR_SCROLL_INCREMENT_WIDTH	10
-
-/* This is the maximum scrolling speed. */
-#define E_MEETING_TIME_SELECTOR_MAX_SCROLL_SPEED	4
-
-
-static void e_meeting_time_selector_class_init (EMeetingTimeSelectorClass * klass);
-static void e_meeting_time_selector_init (EMeetingTimeSelector * mts);
-static void e_meeting_time_selector_destroy (GtkObject *object);
-static void e_meeting_time_selector_alloc_named_color (EMeetingTimeSelector * mts,
-						       const char *name, GdkColor *c);
-static void e_meeting_time_selector_add_key_color (EMeetingTimeSelector * mts,
-						   GtkWidget *hbox,
-						   gchar *label_text,
-						   GdkColor *color);
-static gint e_meeting_time_selector_expose_key_color (GtkWidget *darea,
-						      GdkEventExpose *event,
-						      GdkColor *color);
-static gint e_meeting_time_selector_expose_title_bar (GtkWidget *darea,
-						      GdkEventExpose *event,
-						      gpointer data);
-static void e_meeting_time_selector_options_menu_detacher (GtkWidget *widget,
-							   GtkMenu   *menu);
-static void e_meeting_time_selector_autopick_menu_detacher (GtkWidget *widget,
-							    GtkMenu   *menu);
-static void e_meeting_time_selector_realize (GtkWidget *widget);
-static void e_meeting_time_selector_unrealize (GtkWidget *widget);
-static void e_meeting_time_selector_style_set (GtkWidget *widget,
-					       GtkStyle  *previous_style);
-static gint e_meeting_time_selector_expose_event (GtkWidget *widget,
-						  GdkEventExpose *event);
-static void e_meeting_time_selector_draw (GtkWidget    *widget,
-					  GdkRectangle *area);
-static void e_meeting_time_selector_draw_shadow (EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_hadjustment_changed (GtkAdjustment *adjustment,
-							 EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_vadjustment_changed (GtkAdjustment *adjustment,
-							 EMeetingTimeSelector *mts);
-
-static void e_meeting_time_selector_on_canvas_realized (GtkWidget *widget,
-							EMeetingTimeSelector *mts);
-
-static gint e_meeting_time_selector_compare_period_starts (const void *arg1,
-							 const void *arg2);
-#if 0
-static gint e_meeting_time_selector_compare_periods (const void *arg1,
-						     const void *arg2);
-#endif
-static gint e_meeting_time_selector_compare_times (EMeetingTimeSelectorTime *time1,
-						   EMeetingTimeSelectorTime *time2);
-static void e_meeting_time_selector_on_options_button_clicked (GtkWidget *button,
-							       EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_options_menu_position_callback (GtkMenu *menu,
-								    gint *x,
-								    gint *y,
-								    gpointer user_data);
-static void e_meeting_time_selector_on_zoomed_out_toggled (GtkWidget *button,
-							   EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_on_working_hours_toggled (GtkWidget *button,
-							      EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_on_invite_others_button_clicked (GtkWidget *button,
-								     EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_on_update_free_busy (GtkWidget *button,
-							 EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_on_autopick_button_clicked (GtkWidget *button,
-								EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_autopick_menu_position_callback (GtkMenu *menu,
-								     gint *x,
-								     gint *y,
-								     gpointer user_data);
-static void e_meeting_time_selector_on_autopick_option_toggled (GtkWidget *button,
-								EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_on_prev_button_clicked (GtkWidget *button,
-							    EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_on_next_button_clicked (GtkWidget *button,
-							    EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_autopick (EMeetingTimeSelector *mts,
-					      gboolean forward);
-static void e_meeting_time_selector_calculate_time_difference (EMeetingTimeSelectorTime *start,
-							       EMeetingTimeSelectorTime *end,
-							       gint *days,
-							       gint *hours,
-							       gint *minutes);
-static void e_meeting_time_selector_find_nearest_interval (EMeetingTimeSelector *mts,
-							   EMeetingTimeSelectorTime *start_time,
-							   EMeetingTimeSelectorTime *end_time,
-							   gint days, gint hours, gint mins);
-static void e_meeting_time_selector_find_nearest_interval_backward (EMeetingTimeSelector *mts,
-								    EMeetingTimeSelectorTime *start_time,
-								    EMeetingTimeSelectorTime *end_time,
-								    gint days, gint hours, gint mins);
-static void e_meeting_time_selector_adjust_time (EMeetingTimeSelectorTime *mtstime,
-						 gint days, gint hours, gint minutes);
-static EMeetingTimeSelectorPeriod* e_meeting_time_selector_find_time_clash (EMeetingTimeSelector *mts,
-									    EMeetingTimeSelectorAttendee *attendee,
-									    EMeetingTimeSelectorTime *start_time,
-									    EMeetingTimeSelectorTime *end_time);
-
-
-static void e_meeting_time_selector_recalc_grid (EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_recalc_date_format (EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_save_position (EMeetingTimeSelector *mts,
-						   EMeetingTimeSelectorTime *mtstime);
-static void e_meeting_time_selector_restore_position (EMeetingTimeSelector *mts,
-						      EMeetingTimeSelectorTime *mtstime);
-static void e_meeting_time_selector_on_start_time_changed (GtkWidget *widget,
-							   EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_on_end_time_changed (GtkWidget *widget,
-							 EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_update_date_popup_menus (EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_on_attendees_list_size_allocate (GtkWidget *widget,
-								     GtkAllocation *allocation,
-								     EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_on_canvas_size_allocate (GtkWidget *widget,
-							     GtkAllocation *allocation,
-							     EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_update_main_canvas_scroll_region (EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_update_attendees_list_scroll_region (EMeetingTimeSelector *mts);
-static gboolean e_meeting_time_selector_timeout_handler (gpointer data);
-static void e_meeting_time_selector_update_start_date_edit (EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_update_end_date_edit (EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_ensure_meeting_time_shown (EMeetingTimeSelector *mts);
-static void e_meeting_time_selector_update_dates_shown (EMeetingTimeSelector *mts);
-
-static void e_meeting_time_selector_update_attendees_list_positions (EMeetingTimeSelector *mts);
-static gboolean e_meeting_time_selector_on_text_item_event (GnomeCanvasItem *item,
-							    GdkEvent *event,
-							    EMeetingTimeSelector *mts);
-static gint e_meeting_time_selector_find_row_from_text_item (EMeetingTimeSelector *mts,
-							     GnomeCanvasItem *item);
-
-static GtkTableClass *parent_class;
-
-
-GtkType
-e_meeting_time_selector_get_type (void)
-{
-	static guint e_meeting_time_selector_type = 0;
-
-	if (!e_meeting_time_selector_type) {
-		GtkTypeInfo e_meeting_time_selector_info =
-		{
-			"EMeetingTimeSelector",
-			sizeof (EMeetingTimeSelector),
-			sizeof (EMeetingTimeSelectorClass),
-			(GtkClassInitFunc) e_meeting_time_selector_class_init,
-			(GtkObjectInitFunc) e_meeting_time_selector_init,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-
-		e_meeting_time_selector_type = gtk_type_unique (GTK_TYPE_TABLE,
-								&e_meeting_time_selector_info);
-	}
-	return e_meeting_time_selector_type;
-}
-
-
-static void
-e_meeting_time_selector_class_init (EMeetingTimeSelectorClass * klass)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-
-	parent_class = gtk_type_class (gtk_table_get_type());
-
-	object_class = (GtkObjectClass *) klass;
-	widget_class = (GtkWidgetClass *) klass;
-
-	object_class->destroy = e_meeting_time_selector_destroy;
-
-	widget_class->realize      = e_meeting_time_selector_realize;
-	widget_class->unrealize    = e_meeting_time_selector_unrealize;
-	widget_class->style_set    = e_meeting_time_selector_style_set;
-	widget_class->expose_event = e_meeting_time_selector_expose_event;
-	widget_class->draw	   = e_meeting_time_selector_draw;
-}
-
-
-static void
-e_meeting_time_selector_init (EMeetingTimeSelector * mts)
-{
-	GtkWidget *hbox, *separator, *button, *label, *table;
-	GtkWidget *alignment, *child_hbox, *arrow, *menuitem;
-	GSList *group;
-	GdkVisual *visual;
-	GdkColormap *colormap;
-	guint accel_key;
-	GtkAccelGroup *menu_accel_group;
-	time_t meeting_start_time;
-	struct tm *meeting_start_tm;
-	guchar stipple_bits[] = {
-		0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80,
-	};
-
-	/* The shadow is drawn in the border so it must be >= 2 pixels. */
-	gtk_container_set_border_width (GTK_CONTAINER (mts), 2);
-
-	mts->accel_group = gtk_accel_group_new ();
-
-	mts->attendees = g_array_new (FALSE, FALSE,
-				      sizeof (EMeetingTimeSelectorAttendee));
-
-	mts->working_hours_only = TRUE;
-	mts->day_start_hour = 9;
-	mts->day_start_minute = 0;
-	mts->day_end_hour = 18;
-	mts->day_end_minute = 0;
-	mts->zoomed_out = FALSE;
-	mts->dragging_position = E_MEETING_TIME_SELECTOR_POS_NONE;
-
-	/* The default meeting time is the nearest half-hour interval in the
-	   future, in working hours. */
-	meeting_start_time = time (NULL);
-	g_date_clear (&mts->meeting_start_time.date, 1);
-	g_date_set_time (&mts->meeting_start_time.date, meeting_start_time);
-	meeting_start_tm = localtime (&meeting_start_time);
-	mts->meeting_start_time.hour = meeting_start_tm->tm_hour;
-	mts->meeting_start_time.minute = meeting_start_tm->tm_min;
-
-	e_meeting_time_selector_find_nearest_interval (mts, &mts->meeting_start_time,
-						       &mts->meeting_end_time,
-						       0, 0, 30);
-
-	e_meeting_time_selector_update_dates_shown (mts);
-
-	mts->meeting_positions_valid = FALSE;
-
-	mts->row_height = 30;
-	mts->col_width = 50;
-	mts->day_width = 50 * 24 + 1;
-
-	mts->auto_scroll_timeout_id = 0;
-
-
-	mts->attendees_title_bar_vbox = gtk_vbox_new (FALSE, 2);
-	/* Add some horizontal padding for the shadow around the display. */
-	gtk_table_attach (GTK_TABLE (mts),
-			  mts->attendees_title_bar_vbox,
-			  0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 2, 0);
-	gtk_widget_show (mts->attendees_title_bar_vbox);
-
-	mts->attendees_title_bar = gtk_drawing_area_new ();
-	gtk_box_pack_end (GTK_BOX (mts->attendees_title_bar_vbox),
-			  mts->attendees_title_bar, FALSE, FALSE, 0);
-	gtk_widget_show (mts->attendees_title_bar);
-	gtk_signal_connect (GTK_OBJECT (mts->attendees_title_bar),
-			    "expose_event",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_expose_title_bar), mts);
-
-	mts->attendees_list = e_canvas_new ();
-	/* Add some horizontal padding for the shadow around the display. */
-	gtk_table_attach (GTK_TABLE (mts), mts->attendees_list,
-			  0, 1, 1, 2,
-			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 0);
-	gtk_widget_show (mts->attendees_list);
-	gtk_signal_connect (GTK_OBJECT (mts->attendees_list), "realize",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_canvas_realized), mts);
-	gtk_signal_connect (GTK_OBJECT (mts->attendees_list), "size_allocate",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_attendees_list_size_allocate), mts);
-
-	/* Create the item in the list canvas. */
-	gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (mts->attendees_list)->root),
-			       e_meeting_time_selector_list_item_get_type (),
-			       "EMeetingTimeSelectorListItem::meeting_time_selector", mts,
-			       NULL);
-
-	mts->display_top = gnome_canvas_new ();
-	gnome_canvas_set_scroll_region (GNOME_CANVAS (mts->display_top),
-					0, 0,
-					mts->day_width * E_MEETING_TIME_SELECTOR_DAYS_SHOWN,
-					mts->row_height * 3);
-	/* Add some horizontal padding for the shadow around the display. */
-	gtk_table_attach (GTK_TABLE (mts), mts->display_top,
-			  1, 4, 0, 1, GTK_EXPAND | GTK_FILL, 0, 2, 0);
-	gtk_widget_show (mts->display_top);
-	gtk_signal_connect (GTK_OBJECT (mts->display_top), "realize",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_canvas_realized), mts);
-
-	mts->display_main = gnome_canvas_new ();
-	e_meeting_time_selector_update_main_canvas_scroll_region (mts);
-	/* Add some horizontal padding for the shadow around the display. */
-	gtk_table_attach (GTK_TABLE (mts), mts->display_main,
-			  1, 4, 1, 2,
-			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 0);
-	gtk_widget_show (mts->display_main);
-	gtk_signal_connect (GTK_OBJECT (mts->display_main), "realize",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_canvas_realized), mts);
-	gtk_signal_connect (GTK_OBJECT (mts->display_main), "size_allocate",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_canvas_size_allocate), mts);
-
-	mts->hscrollbar = gtk_hscrollbar_new (GTK_LAYOUT (mts->display_main)->hadjustment);
-	gtk_table_attach (GTK_TABLE (mts), mts->hscrollbar,
-			  1, 4, 2, 3, GTK_EXPAND | GTK_FILL, 0, 0, 0);
-	gtk_widget_show (mts->hscrollbar);
-
-	mts->vscrollbar = gtk_vscrollbar_new (GTK_LAYOUT (mts->display_main)->vadjustment);
-	gtk_table_attach (GTK_TABLE (mts), mts->vscrollbar,
-			  4, 5, 1, 2, 0, GTK_EXPAND | GTK_FILL, 0, 0);
-	gtk_widget_show (mts->vscrollbar);
-
-	/* Create the item in the top canvas. */
-	gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (mts->display_top)->root),
-			       e_meeting_time_selector_item_get_type (),
-			       "EMeetingTimeSelectorItem::meeting_time_selector", mts,
-			       NULL);
-
-	/* Create the item in the main canvas. */
-	gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (mts->display_main)->root),
-			       e_meeting_time_selector_item_get_type (),
-			       "EMeetingTimeSelectorItem::meeting_time_selector", mts,
-			       NULL);
-
-	/* Create the hbox containing the color key. */
-	hbox = gtk_hbox_new (FALSE, 2);
-	gtk_table_attach (GTK_TABLE (mts), hbox,
-			  1, 4, 3, 4, GTK_FILL, 0, 0, 8);
-	gtk_widget_show (hbox);
-
-	e_meeting_time_selector_add_key_color (mts, hbox, _("Tentative"), &mts->busy_colors[E_MEETING_TIME_SELECTOR_BUSY_TENTATIVE]);
-	e_meeting_time_selector_add_key_color (mts, hbox, _("Busy"), &mts->busy_colors[E_MEETING_TIME_SELECTOR_BUSY_BUSY]);
-	e_meeting_time_selector_add_key_color (mts, hbox, _("Out of Office"), &mts->busy_colors[E_MEETING_TIME_SELECTOR_BUSY_OUT_OF_OFFICE]);
-	e_meeting_time_selector_add_key_color (mts, hbox, _("No Information"),
-					       NULL);
-
-	separator = gtk_hseparator_new ();
-	gtk_table_attach (GTK_TABLE (mts), separator,
-			  0, 5, 4, 5, GTK_FILL, 0, 0, 0);
-	gtk_widget_show (separator);
-
-	/* Create the Invite Others & Options buttons on the left. */
-	hbox = gtk_hbox_new (FALSE, 4);
-	gtk_table_attach (GTK_TABLE (mts), hbox,
-			  0, 1, 3, 4, GTK_FILL, 0, 0, 0);
-	gtk_widget_show (hbox);
-
-	button = gtk_button_new_with_label ("");
-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (button)->child),
-					   _("_Invite Others..."));
-	gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
-	gtk_widget_show (button);
-	gtk_widget_add_accelerator (button, "clicked", mts->accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_invite_others_button_clicked), mts);
-
-	mts->options_button = gtk_button_new ();
-	gtk_box_pack_start (GTK_BOX (hbox), mts->options_button, TRUE, TRUE, 0);
-	gtk_widget_show (mts->options_button);
-
-	gtk_signal_connect (GTK_OBJECT (mts->options_button), "clicked",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_options_button_clicked), mts);
-
-	child_hbox = gtk_hbox_new (FALSE, 2);
-	gtk_container_add (GTK_CONTAINER (mts->options_button), child_hbox);
-	gtk_widget_show (child_hbox);
-
-	label = gtk_label_new ("");
-	accel_key = gtk_label_parse_uline (GTK_LABEL (label), _("_Options"));
-	gtk_box_pack_start (GTK_BOX (child_hbox), label, TRUE, TRUE, 0);
-	gtk_widget_show (label);
-	gtk_widget_add_accelerator (mts->options_button, "clicked", mts->accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-
-	arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_OUT);
-	gtk_box_pack_start (GTK_BOX (child_hbox), arrow, FALSE, FALSE, 2);
-	gtk_widget_show (arrow);
-
-	/* Create the Options menu. */
-	mts->options_menu = gtk_menu_new ();
-	gtk_menu_attach_to_widget (GTK_MENU (mts->options_menu), mts->options_button,
-				   e_meeting_time_selector_options_menu_detacher);
-	menu_accel_group = gtk_menu_ensure_uline_accel_group (GTK_MENU (mts->options_menu));
-
-	menuitem = gtk_check_menu_item_new_with_label ("");
-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menuitem)->child), _("Show _Only Working Hours"));
-	gtk_menu_append (GTK_MENU (mts->options_menu), menuitem);
-	gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem),
-					mts->working_hours_only);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, 0, 0);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (menuitem), "toggled",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_working_hours_toggled), mts);
-	gtk_widget_show (menuitem);
-
-	menuitem = gtk_check_menu_item_new_with_label ("");
-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menuitem)->child), _("Show _Zoomed Out"));
-	gtk_menu_append (GTK_MENU (mts->options_menu), menuitem);
-	gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem),
-					mts->zoomed_out);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, 0, 0);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (menuitem), "toggled",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_zoomed_out_toggled), mts);
-	gtk_widget_show (menuitem);
-
-	menuitem = gtk_menu_item_new ();
-	gtk_menu_append (GTK_MENU (mts->options_menu), menuitem);
-	gtk_widget_set_sensitive (menuitem, FALSE);
-	gtk_widget_show (menuitem);
-
-	menuitem = gtk_menu_item_new_with_label ("");
-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menuitem)->child), _("_Update Free/Busy"));
-	gtk_menu_append (GTK_MENU (mts->options_menu), menuitem);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, 0, 0);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_update_free_busy), mts);
-	gtk_widget_show (menuitem);
-
-	/* Create the 3 AutoPick buttons on the left. */
-	hbox = gtk_hbox_new (FALSE, 0);
-	gtk_table_attach (GTK_TABLE (mts), hbox,
-			  0, 1, 5, 6, GTK_FILL, 0, 0, 0);
-	gtk_widget_show (hbox);
-
-	button = gtk_button_new_with_label ("");
-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (button)->child),
-					   _("_<<"));
-	gtk_widget_add_accelerator (button, "clicked", mts->accel_group,
-				    accel_key, GDK_MOD1_MASK | GDK_SHIFT_MASK, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
-	gtk_widget_show (button);
-	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_prev_button_clicked), mts);
-
-	mts->autopick_button = gtk_button_new ();
-	gtk_box_pack_start (GTK_BOX (hbox), mts->autopick_button, TRUE, TRUE, 0);
-	gtk_widget_show (mts->autopick_button);
-
-	child_hbox = gtk_hbox_new (FALSE, 2);
-	gtk_container_add (GTK_CONTAINER (mts->autopick_button), child_hbox);
-	gtk_widget_show (child_hbox);
-
-	label = gtk_label_new ("");
-	accel_key = gtk_label_parse_uline (GTK_LABEL (label), _("_Autopick"));
-	gtk_box_pack_start (GTK_BOX (child_hbox), label, TRUE, TRUE, 0);
-	gtk_widget_show (label);
-	gtk_widget_add_accelerator (mts->autopick_button, "clicked", mts->accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (mts->autopick_button), "clicked",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_autopick_button_clicked), mts);
-
-	arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_OUT);
-	gtk_box_pack_start (GTK_BOX (child_hbox), arrow, FALSE, FALSE, 2);
-	gtk_widget_show (arrow);
-
-	button = gtk_button_new_with_label ("");
-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (button)->child),
-					   _(">_>"));
-	gtk_widget_add_accelerator (button, "clicked", mts->accel_group,
-				    accel_key, GDK_MOD1_MASK | GDK_SHIFT_MASK, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
-	gtk_widget_show (button);
-	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_next_button_clicked), mts);
-
-	/* Create the Autopick menu. */
-	mts->autopick_menu = gtk_menu_new ();
-	gtk_menu_attach_to_widget (GTK_MENU (mts->autopick_menu), mts->autopick_button,
-				   e_meeting_time_selector_autopick_menu_detacher);
-	menu_accel_group = gtk_menu_ensure_uline_accel_group (GTK_MENU (mts->autopick_menu));
-
-	menuitem = gtk_radio_menu_item_new_with_label (NULL, "");
-	mts->autopick_all_item = menuitem;
-	group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menuitem)->child), _("_All People and Resources"));
-	gtk_menu_append (GTK_MENU (mts->autopick_menu), menuitem);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, 0, 0);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (menuitem), "toggled",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_autopick_option_toggled), mts);
-	gtk_widget_show (menuitem);
-
-	menuitem = gtk_radio_menu_item_new_with_label (group, "");
-	mts->autopick_all_people_one_resource_item = menuitem;
-	group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menuitem)->child), _("All _People and One Resource"));
-	gtk_menu_append (GTK_MENU (mts->autopick_menu), menuitem);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, 0, 0);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (menuitem), "toggled",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_autopick_option_toggled), mts);
-	gtk_widget_show (menuitem);
-
-	menuitem = gtk_radio_menu_item_new_with_label (group, "");
-	mts->autopick_required_people_item = menuitem;
-	group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menuitem)->child), _("_Required People"));
-	gtk_menu_append (GTK_MENU (mts->autopick_menu), menuitem);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, 0, 0);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_autopick_option_toggled), mts);
-	gtk_widget_show (menuitem);
-
-	menuitem = gtk_radio_menu_item_new_with_label (group, "");
-	mts->autopick_required_people_one_resource_item = menuitem;
-	group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menuitem)->child), _("Required People and _One Resource"));
-	gtk_menu_append (GTK_MENU (mts->autopick_menu), menuitem);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, 0, 0);
-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-	gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_autopick_option_toggled), mts);
-	gtk_widget_show (menuitem);
-
-	/* Create the date entry fields on the right. */
-	alignment = gtk_alignment_new (0.5, 0.5, 0, 0);
-	gtk_table_attach (GTK_TABLE (mts), alignment,
-			  1, 4, 5, 6, GTK_FILL, 0, 0, 0);
-	gtk_widget_show (alignment);
-
-	table = gtk_table_new (2, 2, FALSE);
-	gtk_table_set_row_spacings (GTK_TABLE (table), 4);
-	gtk_container_add (GTK_CONTAINER (alignment), table);
-	gtk_widget_show (table);
-
-	label = gtk_label_new ("");
-	accel_key = gtk_label_parse_uline (GTK_LABEL (label),
-					   _("Meeting _start time:"));
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	gtk_table_attach (GTK_TABLE (table), label,
-			  0, 1, 0, 1, GTK_FILL, 0, 4, 0);
-	gtk_widget_show (label);
-
-	mts->start_date_edit = gnome_date_edit_new (0, TRUE, TRUE);
-	/* I don't like the 'Calendar' label. */
-	gtk_widget_hide (GNOME_DATE_EDIT (mts->start_date_edit)->cal_label);
-	gtk_table_attach (GTK_TABLE (table), mts->start_date_edit,
-			  1, 2, 0, 1, GTK_FILL, 0, 0, 0);
-	gtk_widget_show (mts->start_date_edit);
-	gtk_signal_connect (GTK_OBJECT (mts->start_date_edit), "date_changed",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_start_time_changed), mts);
-	gtk_signal_connect (GTK_OBJECT (mts->start_date_edit), "time_changed",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_start_time_changed), mts);
-	gtk_signal_connect (GTK_OBJECT (GNOME_DATE_EDIT (mts->start_date_edit)->date_entry), "activate", GTK_SIGNAL_FUNC (e_meeting_time_selector_on_start_time_changed), mts);
-	gtk_signal_connect (GTK_OBJECT (GNOME_DATE_EDIT (mts->start_date_edit)->time_entry), "activate", GTK_SIGNAL_FUNC (e_meeting_time_selector_on_start_time_changed), mts);
-	gtk_widget_add_accelerator (GNOME_DATE_EDIT (mts->start_date_edit)->date_entry,
-				    "grab_focus", mts->accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-
-	label = gtk_label_new ("");
-	accel_key = gtk_label_parse_uline (GTK_LABEL (label),
-					   _("Meeting _end time:"));
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	gtk_table_attach (GTK_TABLE (table), label,
-			  0, 1, 1, 2, GTK_FILL, 0, 4, 0);
-	gtk_widget_show (label);
-
-	mts->end_date_edit = gnome_date_edit_new (0, TRUE, TRUE);
-	gtk_widget_hide (GNOME_DATE_EDIT (mts->end_date_edit)->cal_label);
-	gtk_table_attach (GTK_TABLE (table), mts->end_date_edit,
-			  1, 2, 1, 2, GTK_FILL, 0, 0, 0);
-	gtk_widget_show (mts->end_date_edit);
-	gtk_signal_connect (GTK_OBJECT (mts->end_date_edit), "date_changed",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_end_time_changed), mts);
-	gtk_signal_connect (GTK_OBJECT (mts->end_date_edit), "time_changed",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_end_time_changed), mts);
-	gtk_signal_connect (GTK_OBJECT (GNOME_DATE_EDIT (mts->end_date_edit)->date_entry), "activate", GTK_SIGNAL_FUNC (e_meeting_time_selector_on_end_time_changed), mts);
-	gtk_signal_connect (GTK_OBJECT (GNOME_DATE_EDIT (mts->end_date_edit)->time_entry), "activate", GTK_SIGNAL_FUNC (e_meeting_time_selector_on_end_time_changed), mts);
-	gtk_widget_add_accelerator (GNOME_DATE_EDIT (mts->end_date_edit)->date_entry,
-				    "grab_focus", mts->accel_group,
-				    accel_key, GDK_MOD1_MASK, 0);
-
-	gtk_table_set_col_spacing (GTK_TABLE (mts), 0, 4);
-	gtk_table_set_row_spacing (GTK_TABLE (mts), 4, 12);
-
-	/* Allocate the colors. */
-	visual = gtk_widget_get_visual (GTK_WIDGET (mts));
-	colormap = gtk_widget_get_colormap (GTK_WIDGET (mts));
-	mts->color_context = gdk_color_context_new (visual, colormap);
-	e_meeting_time_selector_alloc_named_color (mts, "gray75", &mts->bg_color);
-	e_meeting_time_selector_alloc_named_color (mts, "gray50", &mts->all_attendees_bg_color);
-	gdk_color_black (colormap, &mts->grid_color);
-	gdk_color_white (colormap, &mts->grid_shadow_color);
-	e_meeting_time_selector_alloc_named_color (mts, "gray50", &mts->grid_unused_color);
-	gdk_color_white (colormap, &mts->meeting_time_bg_color);
-	gdk_color_white (colormap, &mts->stipple_bg_color);
-	gdk_color_white (colormap, &mts->attendee_list_bg_color);
-
-	e_meeting_time_selector_alloc_named_color (mts, "LightSkyBlue2", &mts->busy_colors[E_MEETING_TIME_SELECTOR_BUSY_TENTATIVE]);
-	e_meeting_time_selector_alloc_named_color (mts, "blue", &mts->busy_colors[E_MEETING_TIME_SELECTOR_BUSY_BUSY]);
-	e_meeting_time_selector_alloc_named_color (mts, "HotPink3", &mts->busy_colors[E_MEETING_TIME_SELECTOR_BUSY_OUT_OF_OFFICE]);
-
-	/* Create the stipple, for attendees with no data. */
-	mts->stipple = gdk_bitmap_create_from_data (NULL, (gchar*)stipple_bits,
-						    8, 8);
-
-	/* Connect handlers to the adjustments in the main canvas, so we can
-	   scroll the other 2 canvases. */
-	gtk_signal_connect (GTK_OBJECT (GTK_LAYOUT (mts->display_main)->hadjustment), "value_changed", GTK_SIGNAL_FUNC (e_meeting_time_selector_hadjustment_changed), mts);
-	gtk_signal_connect (GTK_OBJECT (GTK_LAYOUT (mts->display_main)->vadjustment), "value_changed", GTK_SIGNAL_FUNC (e_meeting_time_selector_vadjustment_changed), mts);
-	gtk_signal_connect (GTK_OBJECT (GTK_LAYOUT (mts->display_main)->vadjustment), "changed", GTK_SIGNAL_FUNC (e_meeting_time_selector_vadjustment_changed), mts);
-
-	e_meeting_time_selector_recalc_grid (mts);
-	e_meeting_time_selector_ensure_meeting_time_shown (mts);
-	e_meeting_time_selector_update_start_date_edit (mts);
-	e_meeting_time_selector_update_end_date_edit (mts);
-	e_meeting_time_selector_update_date_popup_menus (mts);
-}
-
-
-/* This adds a color to the color key beneath the main display. If color is
-   NULL, it displays the No Info stipple instead. */
-static void
-e_meeting_time_selector_add_key_color (EMeetingTimeSelector * mts,
-				       GtkWidget *hbox,
-				       gchar *label_text, GdkColor *color)
-{
-	GtkWidget *child_hbox, *darea, *label;
-
-	child_hbox = gtk_hbox_new (FALSE, 4);
-	gtk_box_pack_start (GTK_BOX (hbox), child_hbox, TRUE, TRUE, 0);
-	gtk_widget_show (child_hbox);
-
-	darea = gtk_drawing_area_new ();
-	gtk_box_pack_start (GTK_BOX (child_hbox), darea, FALSE, FALSE, 0);
-	gtk_object_set_user_data (GTK_OBJECT (darea), mts);
-	gtk_widget_set_usize (darea, 14, 14);
-	gtk_widget_show (darea);
-
-	label = gtk_label_new (label_text);
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	gtk_box_pack_start (GTK_BOX (child_hbox), label, TRUE, TRUE, 0);
-	gtk_widget_show (label);
-
-	gtk_signal_connect (GTK_OBJECT (darea), "expose_event",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_expose_key_color),
-			    color);
-}
-
-
-static gint
-e_meeting_time_selector_expose_title_bar (GtkWidget *widget,
-					  GdkEventExpose *event,
-					  gpointer data)
-{
-	EMeetingTimeSelector * mts;
-	GdkFont *font;
-
-	mts = E_MEETING_TIME_SELECTOR (data);
-
-	gtk_draw_shadow (widget->style, widget->window, GTK_STATE_NORMAL,
-			 GTK_SHADOW_OUT, 0, 0,
-			 E_MEETING_TIME_SELECTOR_ICON_COLUMN_WIDTH + 1,
-			 widget->allocation.height);
-	gtk_draw_shadow (widget->style, widget->window, GTK_STATE_NORMAL,
-			 GTK_SHADOW_OUT,
-			 E_MEETING_TIME_SELECTOR_ICON_COLUMN_WIDTH + 1, 0,
-			 widget->allocation.width - E_MEETING_TIME_SELECTOR_ICON_COLUMN_WIDTH - 1,
-			 widget->allocation.height);
-
-	font = widget->style->font;
-	gdk_draw_string (widget->window, font,
-			 widget->style->fg_gc[GTK_STATE_NORMAL],
-			 E_MEETING_TIME_SELECTOR_ICON_COLUMN_WIDTH + 4,
-			 4 + font->ascent, _("All Attendees"));
-
-	return FALSE;
-}
-
-
-static gint
-e_meeting_time_selector_expose_key_color (GtkWidget *darea,
-					  GdkEventExpose *event,
-					  GdkColor *color)
-{
-	EMeetingTimeSelector * mts;
-	GdkGC *gc;
-	gint width, height;
-
-	mts = gtk_object_get_user_data (GTK_OBJECT (darea));
-	gc = mts->color_key_gc;
-	width = darea->allocation.width;
-	height = darea->allocation.height;
-
-	gtk_draw_shadow (darea->style, darea->window, GTK_STATE_NORMAL,
-			 GTK_SHADOW_IN, 0, 0, width, height);
-
-	if (color) {
-		gdk_gc_set_foreground (gc, color);
-		gdk_draw_rectangle (darea->window, gc, TRUE, 1, 1,
-				    width - 2, height - 2);
-	} else {
-		gdk_gc_set_foreground (gc, &mts->grid_color);
-		gdk_gc_set_background (gc, &mts->stipple_bg_color);
-		gdk_gc_set_stipple (gc, mts->stipple);
-		gdk_gc_set_fill (gc, GDK_OPAQUE_STIPPLED);
-		gdk_draw_rectangle (darea->window, gc, TRUE, 1, 1,
-				    width - 2, height - 2);
-		gdk_gc_set_fill (gc, GDK_SOLID);
-	}
-
-	return TRUE;
-}
-
-
-static void
-e_meeting_time_selector_alloc_named_color (EMeetingTimeSelector * mts,
-					   const char *name, GdkColor *c)
-{
-	int failed;
-	
-	g_return_if_fail (name != NULL);
-	g_return_if_fail (c != NULL);
-
-	gdk_color_parse (name, c);
-	c->pixel = 0;
-	c->pixel = gdk_color_context_get_pixel (mts->color_context,
-						c->red, c->green, c->blue,
-						&failed);
-	if (failed)
-		g_warning ("Failed to allocate color: %s\n", name);
-}
-
-
-static void
-e_meeting_time_selector_options_menu_detacher (GtkWidget *widget,
-					       GtkMenu   *menu)
-{
-  EMeetingTimeSelector *mts;
-
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (widget));
-
-  mts = E_MEETING_TIME_SELECTOR (widget);
-  g_return_if_fail (mts->options_menu == (GtkWidget*) menu);
-
-  mts->options_menu = NULL;
-}
-
-
-static void
-e_meeting_time_selector_autopick_menu_detacher (GtkWidget *widget,
-						GtkMenu   *menu)
-{
-  EMeetingTimeSelector *mts;
-
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (widget));
-
-  mts = E_MEETING_TIME_SELECTOR (widget);
-  g_return_if_fail (mts->autopick_menu == (GtkWidget*) menu);
-
-  mts->autopick_menu = NULL;
-}
-
-
-GtkWidget *
-e_meeting_time_selector_new (void)
-{
-	GtkWidget *mts;
-
-	mts = GTK_WIDGET (gtk_type_new (e_meeting_time_selector_get_type ()));
-
-	return mts;
-}
-
-
-static void
-e_meeting_time_selector_destroy (GtkObject *object)
-{
-	EMeetingTimeSelector *mts;
-	EMeetingTimeSelectorAttendee *attendee;
-	gint row;
-
-	mts = E_MEETING_TIME_SELECTOR (object);
-
-	e_meeting_time_selector_remove_timeout (mts);
-
-	gdk_color_context_free (mts->color_context);
-	gdk_bitmap_unref (mts->stipple);
-
-	for (row = 0; row < mts->attendees->len; row++) {
-		attendee = &g_array_index (mts->attendees,
-					   EMeetingTimeSelectorAttendee, row);
-		g_free (attendee->name);
-		g_array_free (attendee->busy_periods, TRUE);
-	}
-
-	g_array_free (mts->attendees, TRUE);
-		
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(*GTK_OBJECT_CLASS (parent_class)->destroy)(object);
-}
-
-
-static void
-e_meeting_time_selector_realize (GtkWidget *widget)
-{
-	EMeetingTimeSelector *mts;
-
-	if (GTK_WIDGET_CLASS (parent_class)->realize)
-		(*GTK_WIDGET_CLASS (parent_class)->realize)(widget);
-
-	mts = E_MEETING_TIME_SELECTOR (widget);
-
-	mts->color_key_gc = gdk_gc_new (widget->window);
-}
-
-
-static void
-e_meeting_time_selector_unrealize (GtkWidget *widget)
-{
-	EMeetingTimeSelector *mts;
-
-	mts = E_MEETING_TIME_SELECTOR (widget);
-
-	gdk_gc_unref (mts->color_key_gc);
-	mts->color_key_gc = NULL;
-
-	if (GTK_WIDGET_CLASS (parent_class)->unrealize)
-		(*GTK_WIDGET_CLASS (parent_class)->unrealize)(widget);
-}
-
-
-static void
-e_meeting_time_selector_style_set (GtkWidget *widget,
-				   GtkStyle  *previous_style)
-{
-	EMeetingTimeSelector *mts;
-	EMeetingTimeSelectorTime saved_time;
-	GdkFont *font;
-	gint hour, max_hour_width;
-
-	if (GTK_WIDGET_CLASS (parent_class)->style_set)
-		(*GTK_WIDGET_CLASS (parent_class)->style_set)(widget, previous_style);
-
-	mts = E_MEETING_TIME_SELECTOR (widget);
-	font = widget->style->font;
-
-	/* Calculate the widths of the hour strings in the style's font. */
-	max_hour_width = 0;
-	for (hour = 0; hour < 24; hour++) {
-		mts->hour_widths[hour] = gdk_string_width (font, EMeetingTimeSelectorHours[hour]);
-		max_hour_width = MAX (max_hour_width, mts->hour_widths[hour]);
-	}
-
-	mts->row_height = font->ascent + font->descent
-		+ E_MEETING_TIME_SELECTOR_TEXT_Y_PAD * 2 + 1;
-	mts->col_width = max_hour_width + 4;
-
-	e_meeting_time_selector_save_position (mts, &saved_time);
-	e_meeting_time_selector_recalc_grid (mts);
-	e_meeting_time_selector_restore_position (mts, &saved_time);
-
-	gtk_widget_set_usize (mts->display_top, -1, mts->row_height * 3);
-	gtk_widget_set_usize (mts->attendees_title_bar, -1, mts->row_height);
-
-	GTK_LAYOUT (mts->display_main)->hadjustment->step_increment = mts->col_width;
-	GTK_LAYOUT (mts->display_main)->vadjustment->step_increment = mts->row_height;
-}
-
-
-/* This draws a shadow around the top display and main display. */
-static gint
-e_meeting_time_selector_expose_event (GtkWidget *widget,
-				      GdkEventExpose *event)
-{
-	EMeetingTimeSelector *mts;
-
-	mts = E_MEETING_TIME_SELECTOR (widget);
-
-	e_meeting_time_selector_draw_shadow (mts);
-
-	if (GTK_WIDGET_CLASS (parent_class)->expose_event)
-		(*GTK_WIDGET_CLASS (parent_class)->expose_event)(widget, event);
-
-	return FALSE;
-}
-
-
-static void
-e_meeting_time_selector_draw (GtkWidget    *widget,
-			      GdkRectangle *area)
-{
-	EMeetingTimeSelector *mts;
-
-	mts = E_MEETING_TIME_SELECTOR (widget);
-
-	e_meeting_time_selector_draw_shadow (mts);
-
-	if (GTK_WIDGET_CLASS (parent_class)->draw)
-		(*GTK_WIDGET_CLASS (parent_class)->draw)(widget, area);
-}
-
-
-static void
-e_meeting_time_selector_draw_shadow (EMeetingTimeSelector *mts)
-{
-	GtkWidget *widget;
-	gint x, y, w, h;
-
-	widget = GTK_WIDGET (mts);
-
-	/* Draw the shadow around the attendees title bar and list. */
-	x = mts->attendees_title_bar->allocation.x - 2;
-	y = mts->attendees_title_bar->allocation.y - 2;
-	w = mts->attendees_title_bar->allocation.width + 4;
-	h = mts->attendees_title_bar->allocation.height + mts->attendees_list->allocation.height + 4;
-
-	gtk_draw_shadow (widget->style, widget->window, GTK_STATE_NORMAL,
-			 GTK_SHADOW_IN, x, y, w, h);
-
-	/* Draw the shadow around the graphical displays. */
-	x = mts->display_top->allocation.x - 2;
-	y = mts->display_top->allocation.y - 2;
-	w = mts->display_top->allocation.width + 4;
-	h = mts->display_top->allocation.height + mts->display_main->allocation.height + 4;
-
-	gtk_draw_shadow (widget->style, widget->window, GTK_STATE_NORMAL,
-			 GTK_SHADOW_IN, x, y, w, h);
-}
-
-
-/* When the main canvas scrolls, we scroll the other canvases. */
-static void
-e_meeting_time_selector_hadjustment_changed (GtkAdjustment *adjustment,
-					     EMeetingTimeSelector *mts)
-{
-	GtkAdjustment *adj;
-
-	adj = GTK_LAYOUT (mts->display_top)->hadjustment;
-	if (adj->value != adjustment->value) {
-		adj->value = adjustment->value;
-		gtk_adjustment_value_changed (adj);
-	}
-}
-
-
-static void
-e_meeting_time_selector_vadjustment_changed (GtkAdjustment *adjustment,
-					     EMeetingTimeSelector *mts)
-{
-	GtkAdjustment *adj;
-
-	adj = GTK_LAYOUT (mts->attendees_list)->vadjustment;
-	if (adj->value != adjustment->value) {
-		adj->value = adjustment->value;
-		gtk_adjustment_value_changed (adj);
-	}
-}
-
-
-void
-e_meeting_time_selector_get_meeting_time (EMeetingTimeSelector *mts,
-					  gint *start_year,
-					  gint *start_month,
-					  gint *start_day,
-					  gint *start_hour,
-					  gint *start_minute,
-					  gint *end_year,
-					  gint *end_month,
-					  gint *end_day,
-					  gint *end_hour,
-					  gint *end_minute)
-{
-	*start_year = g_date_year (&mts->meeting_start_time.date);
-	*start_month = g_date_month (&mts->meeting_start_time.date);
-	*start_day = g_date_day (&mts->meeting_start_time.date);
-	*start_hour = mts->meeting_start_time.hour;
-	*start_minute = mts->meeting_start_time.minute;
-
-	*end_year = g_date_year (&mts->meeting_end_time.date);
-	*end_month = g_date_month (&mts->meeting_end_time.date);
-	*end_day = g_date_day (&mts->meeting_end_time.date);
-	*end_hour = mts->meeting_end_time.hour;
-	*end_minute = mts->meeting_end_time.minute;
-}
-
-
-gboolean
-e_meeting_time_selector_set_meeting_time (EMeetingTimeSelector *mts,
-					  gint start_year,
-					  gint start_month,
-					  gint start_day,
-					  gint start_hour,
-					  gint start_minute,
-					  gint end_year,
-					  gint end_month,
-					  gint end_day,
-					  gint end_hour,
-					  gint end_minute)
-{
-	g_return_val_if_fail (IS_E_MEETING_TIME_SELECTOR (mts), FALSE);
-
-	/* Check the dates are valid. */
-	if (!g_date_valid_dmy (start_day, start_month, start_year)
-	    || !g_date_valid_dmy (end_day, end_month, end_year)
-	    || start_hour < 0 || start_hour > 23
-	    || end_hour < 0 || end_hour > 23
-	    || start_minute < 0 || start_minute > 59
-	    || end_minute < 0 || end_minute > 59)
-		return FALSE;
-
-	g_date_set_dmy (&mts->meeting_start_time.date, start_day, start_month,
-			start_year);
-	mts->meeting_start_time.hour = start_hour;
-	mts->meeting_start_time.minute = start_minute;
-	g_date_set_dmy (&mts->meeting_end_time.date, end_day, end_month,
-			end_year);
-	mts->meeting_end_time.hour = end_hour;
-	mts->meeting_end_time.minute = end_minute;
-
-	mts->meeting_positions_valid = FALSE;
-
-	gtk_widget_queue_draw (mts->display_top);
-	gtk_widget_queue_draw (mts->display_main);
-
-	/* Set the times in the GnomeDateEdit widgets. */
-	e_meeting_time_selector_update_start_date_edit (mts);
-	e_meeting_time_selector_update_end_date_edit (mts);
-
-	return TRUE;
-}
-
-
-void
-e_meeting_time_selector_set_working_hours_only (EMeetingTimeSelector *mts,
-						gboolean working_hours_only)
-{
-	EMeetingTimeSelectorTime saved_time;
-
-	g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (mts));
-
-	if (mts->working_hours_only == working_hours_only)
-		return;
-
-	mts->working_hours_only = working_hours_only;
-
-	e_meeting_time_selector_save_position (mts, &saved_time);
-	e_meeting_time_selector_recalc_grid (mts);
-	e_meeting_time_selector_restore_position (mts, &saved_time);
-
-	gtk_widget_queue_draw (mts->display_top);
-	gtk_widget_queue_draw (mts->display_main);
-	e_meeting_time_selector_update_date_popup_menus (mts);
-}
-
-
-void
-e_meeting_time_selector_set_working_hours (EMeetingTimeSelector *mts,
-					   gint day_start_hour,
-					   gint day_start_minute,
-					   gint day_end_hour,
-					   gint day_end_minute)
-{
-	EMeetingTimeSelectorTime saved_time;
-
-	g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (mts));
-
-	if (mts->day_start_hour == day_start_hour
-	    && mts->day_start_minute == day_start_minute
-	    && mts->day_end_hour == day_end_hour
-	    && mts->day_end_minute == day_end_minute)
-		return;
-
-	mts->day_start_hour = day_start_hour;
-	mts->day_start_minute = day_start_minute;
-	mts->day_end_hour = day_end_hour;
-	mts->day_end_minute = day_end_minute;
-
-	e_meeting_time_selector_save_position (mts, &saved_time);
-	e_meeting_time_selector_recalc_grid (mts);
-	e_meeting_time_selector_restore_position (mts, &saved_time);
-
-	gtk_widget_queue_draw (mts->display_top);
-	gtk_widget_queue_draw (mts->display_main);
-	e_meeting_time_selector_update_date_popup_menus (mts);
-}
-
-
-void
-e_meeting_time_selector_set_zoomed_out (EMeetingTimeSelector *mts,
-					gboolean zoomed_out)
-{
-	EMeetingTimeSelectorTime saved_time;
-
-	g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (mts));
-
-	if (mts->zoomed_out == zoomed_out)
-		return;
-
-	mts->zoomed_out = zoomed_out;
-
-	e_meeting_time_selector_save_position (mts, &saved_time);
-	e_meeting_time_selector_recalc_grid (mts);
-	e_meeting_time_selector_restore_position (mts, &saved_time);
-
-	gtk_widget_queue_draw (mts->display_top);
-	gtk_widget_queue_draw (mts->display_main);
-}
-
-
-EMeetingTimeSelectorAutopickOption
-e_meeting_time_selector_get_autopick_option (EMeetingTimeSelector *mts)
-{
-	if (GTK_CHECK_MENU_ITEM (mts->autopick_all_item)->active)
-		return E_MEETING_TIME_SELECTOR_ALL_PEOPLE_AND_RESOURCES;
-	if (GTK_CHECK_MENU_ITEM (mts->autopick_all_people_one_resource_item)->active)
-		return E_MEETING_TIME_SELECTOR_ALL_PEOPLE_AND_ONE_RESOURCE;
-	if (GTK_CHECK_MENU_ITEM (mts->autopick_required_people_item)->active)
-		return E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE;
-	return E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE_AND_ONE_RESOURCE;
-}
-
-
-void
-e_meeting_time_selector_set_autopick_option (EMeetingTimeSelector *mts,
-					     EMeetingTimeSelectorAutopickOption autopick_option)
-{
-	g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (mts));
-
-	switch (autopick_option) {
-	case E_MEETING_TIME_SELECTOR_ALL_PEOPLE_AND_RESOURCES:
-		gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mts->autopick_all_item), TRUE);
-		break;
-	case E_MEETING_TIME_SELECTOR_ALL_PEOPLE_AND_ONE_RESOURCE:
-		gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mts->autopick_all_people_one_resource_item), TRUE);
-		break;
-	case E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE:
-		gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mts->autopick_required_people_item), TRUE);
-		break;
-	case E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE_AND_ONE_RESOURCE:
-		gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mts->autopick_required_people_one_resource_item), TRUE);
-		break;
-	}
-}
-
-
-/* Adds an attendee to the list, returning the row. The data is meant for
-   something like an address book id, though if the user edits the name this
-   will become invalid. We'll probably have to handle address book lookup
-   ourself. */
-gint
-e_meeting_time_selector_attendee_add (EMeetingTimeSelector *mts,
-				      gchar *attendee_name,
-				      gpointer data)
-{
-	EMeetingTimeSelectorAttendee attendee;
-	gint list_width, item_width;
-	GdkFont *font;
-
-	g_return_val_if_fail (IS_E_MEETING_TIME_SELECTOR (mts), -1);
-	g_return_val_if_fail (attendee_name != NULL, -1);
-
-	attendee.name = g_strdup (attendee_name);
-	attendee.type = E_MEETING_TIME_SELECTOR_REQUIRED_PERSON;
-	attendee.has_calendar_info = FALSE;
-	attendee.send_meeting_to = TRUE;
-	g_date_clear (&attendee.busy_periods_start.date, 1);
-	attendee.busy_periods_start.hour = 0;
-	attendee.busy_periods_start.minute = 0;
-	g_date_clear (&attendee.busy_periods_end.date, 1);
-	attendee.busy_periods_end.hour = 0;
-	attendee.busy_periods_end.minute = 0;
-	attendee.busy_periods = g_array_new (FALSE, FALSE,
-					     sizeof (EMeetingTimeSelectorPeriod));
-	attendee.busy_periods_sorted = TRUE;
-	attendee.longest_period_in_days = 0;
-	attendee.data = data;
-
-	/* Add to the list on the left. */
-	list_width = GTK_WIDGET (mts->attendees_list)->allocation.width;
-	item_width = MAX (1, list_width - E_MEETING_TIME_SELECTOR_ICON_COLUMN_WIDTH - E_MEETING_TIME_SELECTOR_TEXT_X_PAD * 2);
-	font = GTK_WIDGET (mts)->style->font;
-	attendee.text_item = gnome_canvas_item_new
-		(GNOME_CANVAS_GROUP (GNOME_CANVAS (mts->attendees_list)->root),
-		 e_text_get_type (),
-		 "font_gdk", font,
-		 "anchor", GTK_ANCHOR_NW,
-		 "clip", TRUE,
-		 "max_lines", 1,
-		 "editable", TRUE,
-		 "text", attendee_name ? attendee_name : "",
-		 "clip_width", (gdouble) item_width,
-		 "clip_height", (gdouble) font->ascent + font->descent,
-		 "draw_background", FALSE,
-		 NULL);
-	
-	e_canvas_item_move_absolute(attendee.text_item,
-				    E_MEETING_TIME_SELECTOR_ICON_COLUMN_WIDTH
-				    + E_MEETING_TIME_SELECTOR_TEXT_X_PAD,
-				    mts->attendees->len * mts->row_height + 1
-				    + E_MEETING_TIME_SELECTOR_TEXT_Y_PAD);
-#if 0
-	gnome_canvas_item_hide (attendee.text_item);
-#endif
-
-	gtk_signal_connect (GTK_OBJECT (attendee.text_item), "event",
-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_text_item_event),
-			    mts);
-	
-	g_array_append_val (mts->attendees, attendee);
-
-	/* Update the scroll region. */
-	e_meeting_time_selector_update_attendees_list_scroll_region (mts);
-	e_meeting_time_selector_update_main_canvas_scroll_region (mts);
-
-	/* Redraw the canvases. */
-	gtk_widget_queue_draw (mts->display_top);
-	gtk_widget_queue_draw (mts->display_main);
-
-
-	return mts->attendees->len - 1;
-}
-
-
-gint
-e_meeting_time_selector_attendee_find_by_name (EMeetingTimeSelector *mts,
-					       gchar *attendee_name,
-					       gint start_row)
-{
-	EMeetingTimeSelectorAttendee *attendee;
-	gint row;
-
-	g_return_val_if_fail (IS_E_MEETING_TIME_SELECTOR (mts), -1);
-	g_return_val_if_fail (start_row >= 0, -1);
-	g_return_val_if_fail (start_row < mts->attendees->len, -1);
-
-	for (row = start_row; row < mts->attendees->len; row++) {
-		attendee = &g_array_index (mts->attendees,
-					   EMeetingTimeSelectorAttendee, row);
-		if (!strcmp (attendee->name, attendee_name))
-			return row;
-	}
-
-	return -1;
-}
-
-
-gint
-e_meeting_time_selector_attendee_find_by_data (EMeetingTimeSelector *mts,
-					       gpointer data,
-					       gint start_row)
-{
-	EMeetingTimeSelectorAttendee *attendee;
-	gint row;
-
-	g_return_val_if_fail (IS_E_MEETING_TIME_SELECTOR (mts), -1);
-	g_return_val_if_fail (start_row >= 0, -1);
-	g_return_val_if_fail (start_row < mts->attendees->len, -1);
-
-	for (row = start_row; row < mts->attendees->len; row++) {
-		attendee = &g_array_index (mts->attendees,
-					   EMeetingTimeSelectorAttendee, row);
-		if (attendee->data == data)
-			return row;
-	}
-
-	return -1;
-}
-
-
-void
-e_meeting_time_selector_attendee_remove (EMeetingTimeSelector *mts,
-					 gint row)
-{
-	EMeetingTimeSelectorAttendee *attendee;
-
-	g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (mts));
-	g_return_if_fail (row >= 0);
-	g_return_if_fail (row < mts->attendees->len);
-
-	attendee = &g_array_index (mts->attendees,
-				   EMeetingTimeSelectorAttendee, row);
-
-	g_free (attendee->name);
-	g_array_free (attendee->busy_periods, TRUE);
-
-	/* Destroy the GtkEntry in the list. */
-	gtk_object_destroy (GTK_OBJECT (attendee->text_item));
-
-	g_array_remove_index (mts->attendees, row);
-
-	/* Update the positions of all the other GtkEntry widgets. */
-	e_meeting_time_selector_update_attendees_list_positions (mts);
-
-	e_meeting_time_selector_update_attendees_list_scroll_region (mts);
-	e_meeting_time_selector_update_main_canvas_scroll_region (mts);
-	gtk_widget_queue_draw (mts->display_top);
-	gtk_widget_queue_draw (mts->display_main);
-}
-
-
-void
-e_meeting_time_selector_attendee_set_type (EMeetingTimeSelector *mts,
-					   gint row,
-					   EMeetingTimeSelectorAttendeeType type)
-{
-	EMeetingTimeSelectorAttendee *attendee;
-
-	g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (mts));
-	g_return_if_fail (row >= 0);
-	g_return_if_fail (row < mts->attendees->len);
-
-	attendee = &g_array_index (mts->attendees,
-				   EMeetingTimeSelectorAttendee, row);
-	attendee->type = type;
-}
-
-
-void
-e_meeting_time_selector_attendee_set_has_calendar_info (EMeetingTimeSelector *mts,
-							gint row,
-							gboolean has_calendar_info)
-{
-	EMeetingTimeSelectorAttendee *attendee;
-
-	g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (mts));
-	g_return_if_fail (row >= 0);
-	g_return_if_fail (row < mts->attendees->len);
-
-	attendee = &g_array_index (mts->attendees,
-				   EMeetingTimeSelectorAttendee, row);
-	attendee->has_calendar_info = has_calendar_info;
-}
-
-
-void
-e_meeting_time_selector_attendee_set_send_meeting_to (EMeetingTimeSelector *mts,
-						      gint row,
-						      gboolean send_meeting_to)
-{
-	EMeetingTimeSelectorAttendee *attendee;
-
-	g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (mts));
-	g_return_if_fail (row >= 0);
-	g_return_if_fail (row < mts->attendees->len);
-
-	attendee = &g_array_index (mts->attendees,
-				   EMeetingTimeSelectorAttendee, row);
-	attendee->send_meeting_to = send_meeting_to;
-}
-
-
-gboolean
-e_meeting_time_selector_attendee_set_busy_range	(EMeetingTimeSelector *mts,
-						 gint row,
-						 gint start_year,
-						 gint start_month,
-						 gint start_day,
-						 gint start_hour,
-						 gint start_minute,
-						 gint end_year,
-						 gint end_month,
-						 gint end_day,
-						 gint end_hour,
-						 gint end_minute)
-{
-	EMeetingTimeSelectorAttendee *attendee;
-
-	g_return_val_if_fail (IS_E_MEETING_TIME_SELECTOR (mts), FALSE);
-	g_return_val_if_fail (row >= 0, FALSE);
-	g_return_val_if_fail (row < mts->attendees->len, FALSE);
-
-	/* Check the dates are valid. */
-	if (!g_date_valid_dmy (start_day, start_month, start_year))
-		return FALSE;
-	if (!g_date_valid_dmy (end_day, end_month, end_year))
-		return FALSE;
-	if (start_hour < 0 || start_hour > 23)
-		return FALSE;
-	if (end_hour < 0 || end_hour > 23)
-		return FALSE;
-	if (start_minute < 0 || start_minute > 59)
-		return FALSE;
-	if (end_minute < 0 || end_minute > 59)
-		return FALSE;
-
-	attendee = &g_array_index (mts->attendees,
-				   EMeetingTimeSelectorAttendee, row);
-
-	g_date_clear (&attendee->busy_periods_start.date, 1);
-	g_date_clear (&attendee->busy_periods_end.date, 1);
-	g_date_set_dmy (&attendee->busy_periods_start.date,
-			start_day, start_month, start_year);
-	g_date_set_dmy (&attendee->busy_periods_end.date,
-			end_day, end_month, end_year);
-	attendee->busy_periods_start.hour = start_hour;
-	attendee->busy_periods_start.minute = start_minute;
-	attendee->busy_periods_end.hour = end_hour;
-	attendee->busy_periods_end.minute = end_minute;
-
-	return TRUE;
-}
-
-
-/* Clears all busy times for the given attendee. */
-void
-e_meeting_time_selector_attendee_clear_busy_periods (EMeetingTimeSelector *mts,
-						     gint row)
-{
-	EMeetingTimeSelectorAttendee *attendee;
-
-	g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (mts));
-	g_return_if_fail (row >= 0);
-	g_return_if_fail (row < mts->attendees->len);
-
-	attendee = &g_array_index (mts->attendees,
-				   EMeetingTimeSelectorAttendee, row);
-
-	g_array_set_size (attendee->busy_periods, 0);
-	attendee->busy_periods_sorted = TRUE;
-	attendee->longest_period_in_days = 0;
-}
-
-
-/* Adds one busy time for the given attendee. It returns FALSE if the date
-   or time is invalid. Months and days count from 1. */
-gboolean
-e_meeting_time_selector_attendee_add_busy_period (EMeetingTimeSelector *mts,
-						  gint row,
-						  gint start_year,
-						  gint start_month,
-						  gint start_day,
-						  gint start_hour,
-						  gint start_minute,
-						  gint end_year,
-						  gint end_month,
-						  gint end_day,
-						  gint end_hour,
-						  gint end_minute,
-						  EMeetingTimeSelectorBusyType busy_type)
-{
-	EMeetingTimeSelectorAttendee *attendee;
-	EMeetingTimeSelectorPeriod period;
-	gint period_in_days;
-
-	g_return_val_if_fail (IS_E_MEETING_TIME_SELECTOR (mts), FALSE);
-	g_return_val_if_fail (row >= 0, FALSE);
-	g_return_val_if_fail (row < mts->attendees->len, FALSE);
-	g_return_val_if_fail (busy_type >= 0, FALSE);
-	g_return_val_if_fail (busy_type < E_MEETING_TIME_SELECTOR_BUSY_LAST, FALSE);
-
-	/* Check the dates are valid. */
-	if (!g_date_valid_dmy (start_day, start_month, start_year))
-		return FALSE;
-	if (!g_date_valid_dmy (end_day, end_month, end_year))
-		return FALSE;
-	if (start_hour < 0 || start_hour > 23)
-		return FALSE;
-	if (end_hour < 0 || end_hour > 23)
-		return FALSE;
-	if (start_minute < 0 || start_minute > 59)
-		return FALSE;
-	if (end_minute < 0 || end_minute > 59)
-		return FALSE;
-
-	g_date_clear (&period.start.date, 1);
-	g_date_clear (&period.end.date, 1);
-	g_date_set_dmy (&period.start.date, start_day, start_month, start_year);
-	g_date_set_dmy (&period.end.date, end_day, end_month, end_year);
-	period.start.hour = start_hour;
-	period.start.minute = start_minute;
-	period.end.hour = end_hour;
-	period.end.minute = end_minute;
-	period.busy_type = busy_type;
-
-	/* Check that the start time is before or equal to the end time. */
-	if (e_meeting_time_selector_compare_times (&period.start, &period.end) > 0)
-		return FALSE;
-
-	attendee = &g_array_index (mts->attendees,
-				   EMeetingTimeSelectorAttendee, row);
-	g_array_append_val (attendee->busy_periods, period);
-	attendee->has_calendar_info = TRUE;
-	attendee->busy_periods_sorted = FALSE;
-
-	period_in_days = g_date_julian (&period.end.date) - g_date_julian (&period.start.date) + 1;
-	attendee->longest_period_in_days = MAX (attendee->longest_period_in_days, period_in_days);
-
-	return TRUE;
-}
-
-
-void
-e_meeting_time_selector_attendee_ensure_periods_sorted (EMeetingTimeSelector *mts,
-							EMeetingTimeSelectorAttendee *attendee)
-{
-	if (attendee->busy_periods_sorted)
-		return;
-
-	qsort (attendee->busy_periods->data, attendee->busy_periods->len,
-	       sizeof (EMeetingTimeSelectorPeriod),
-	       e_meeting_time_selector_compare_period_starts);
-	attendee->busy_periods_sorted = TRUE;
-}
-
-
-/* This compares two time periods, using their end times. */
-static gint
-e_meeting_time_selector_compare_period_starts (const void *arg1,
-					       const void *arg2)
-{
-	EMeetingTimeSelectorPeriod *period1, *period2;
-
-	period1 = (EMeetingTimeSelectorPeriod *) arg1;
-	period2 = (EMeetingTimeSelectorPeriod *) arg2;
-
-	return e_meeting_time_selector_compare_times (&period1->start,
-						    &period2->start);
-}
-
-
-/* This compares two time periods, using start and end times, mainly to see if
-   they overlap at all. If they overlap it returns 0. Or -1 if arg1 < arg2.
-   Or 1 if arg1 > arg2. */
-/* Currently unused. */
-#if 0
-static gint
-e_meeting_time_selector_compare_periods (const void *arg1,
-					 const void *arg2)
-{
-	EMeetingTimeSelectorPeriod *period1, *period2;
-
-	period1 = (EMeetingTimeSelectorPeriod *) arg1;
-	period2 = (EMeetingTimeSelectorPeriod *) arg2;
-
-	/* If period 2 starts after period 1 ends, return 1. */
-	if (e_meeting_time_selector_compare_times (&period2->start, &period1->end) >= 0)
-		return 1;
-
-	/* If period 1 starts after period 2 ends, return -1. */
-	if (e_meeting_time_selector_compare_times (&period1->start, &period2->end) >= 0)
-		return -1;
-
-	/* They must overlap so return 0. */
-	return 0;
-}
-#endif
-
-
-static gint
-e_meeting_time_selector_compare_times (EMeetingTimeSelectorTime *time1,
-				       EMeetingTimeSelectorTime *time2)
-{
-	gint day_comparison;
-
-	day_comparison = g_date_compare (&time1->date,
-					 &time2->date);
-	if (day_comparison != 0)
-		return day_comparison;
-
-	if (time1->hour < time2->hour)
-		return -1;
-	if (time1->hour > time2->hour)
-		return 1;
-
-	if (time1->minute < time2->minute)
-		return -1;
-	if (time1->minute > time2->minute)
-		return 1;
-
-	/* The start times are exactly the same. */
-	return 0;
-}
-
-
-/*
- * DEBUGGING ROUTINES - functions to output various bits of data.
- */
-
-#ifdef E_MEETING_TIME_SELECTOR_DEBUG
-
-/* Debugging function to dump information on all attendees. */
-void
-e_meeting_time_selector_dump (EMeetingTimeSelector *mts)
-{
-	EMeetingTimeSelectorAttendee *attendee;
-	EMeetingTimeSelectorPeriod *period;
-	gint row, period_num;
-	gchar buffer[128];
-
-	g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (mts));
-
-	g_print ("\n\nAttendee Information:\n");
-
-	for (row = 0; row < mts->attendees->len; row++) {
-		attendee = &g_array_index (mts->attendees,
-					   EMeetingTimeSelectorAttendee, row);
-		g_print ("Attendee: %s\n", attendee->name);
-		g_print ("  Longest Busy Period: %i days\n",
-			 attendee->longest_period_in_days);
-
-		e_meeting_time_selector_attendee_ensure_periods_sorted (mts, attendee);
-#if 1
-		for (period_num = 0;
-		     period_num < attendee->busy_periods->len;
-		     period_num++) {
-			period = &g_array_index (attendee->busy_periods,
-						 EMeetingTimeSelectorPeriod,
-						 period_num);
-
-			/* These are just for debugging so don't need i18n. */
-			g_date_strftime (buffer, sizeof (buffer),
-					 "%A, %B %d, %Y", &period->start.date);
-			g_print ("  Start: %s %i:%02i\n", buffer,
-				 period->start.hour, period->start.minute);
-
-			g_date_strftime (buffer, sizeof (buffer),
-					 "%A, %B %d, %Y", &period->end.date);
-			g_print ("  End  : %s %i:%02i\n", buffer,
-				 period->end.hour, period->end.minute);
-		}
-#endif
-	}
-
-}
-
-
-/* This formats a EMeetingTimeSelectorTime in a string and returns it.
-   Note that it uses a static buffer. */
-gchar*
-e_meeting_time_selector_dump_time (EMeetingTimeSelectorTime *mtstime)
-{
-	static gchar buffer[128];
-
-	gchar buffer2[128];
-
-	/* This is just for debugging so doesn't need i18n. */
-	g_date_strftime (buffer, sizeof (buffer), "%A, %B %d, %Y",
-			 &mtstime->date);
-	sprintf (buffer2, " at %i:%02i", (gint) mtstime->hour,
-		 (gint) mtstime->minute);
-	strcat (buffer, buffer2);
-
-	return buffer;
-}
-
-
-/* This formats a GDate in a string and returns it.
-   Note that it uses a static buffer. */
-gchar*
-e_meeting_time_selector_dump_date (GDate *date)
-{
-	static gchar buffer[128];
-
-	/* This is just for debugging so doesn't need i18n. */
-	g_date_strftime (buffer, sizeof (buffer), "%A, %B %d, %Y", date);
-	return buffer;
-}
-
-#endif /* E_MEETING_TIME_SELECTOR_DEBUG */
-
-
-static void
-e_meeting_time_selector_on_invite_others_button_clicked (GtkWidget *button,
-							 EMeetingTimeSelector *mts)
-{
-
-
-}
-
-
-static void
-e_meeting_time_selector_on_options_button_clicked (GtkWidget *button,
-						   EMeetingTimeSelector *mts)
-{
-	gtk_menu_popup (GTK_MENU (mts->options_menu), NULL, NULL,
-			e_meeting_time_selector_options_menu_position_callback,
-			mts, 1, GDK_CURRENT_TIME);
-}
-
-
-static void
-e_meeting_time_selector_options_menu_position_callback (GtkMenu *menu,
-							gint *x,
-							gint *y,
-							gpointer user_data)
-{
-	EMeetingTimeSelector *mts;
-	GtkRequisition menu_requisition;
-	gint max_x, max_y;
-
-	mts = E_MEETING_TIME_SELECTOR (user_data);
-
-	/* Calculate our preferred position. */
-	gdk_window_get_origin (mts->options_button->window, x, y);
-	*y += mts->options_button->allocation.height;
-
-	/* Now make sure we are on the screen. */
-	gtk_widget_size_request (mts->options_menu, &menu_requisition);
-	max_x = MAX (0, gdk_screen_width () - menu_requisition.width);
-	max_y = MAX (0, gdk_screen_height () - menu_requisition.height);
-	*x = CLAMP (*x, 0, max_x);
-	*y = CLAMP (*y, 0, max_y);
-}
-
-
-static void
-e_meeting_time_selector_on_update_free_busy (GtkWidget *button,
-					     EMeetingTimeSelector *mts)
-{
-
-	/* Make sure the menu pops down, which doesn't happen by default if
-	   keyboard accelerators are used. */
-	if (GTK_WIDGET_VISIBLE (mts->options_menu))
-		gtk_menu_popdown (GTK_MENU (mts->options_menu));
-}
-
-
-static void
-e_meeting_time_selector_on_autopick_button_clicked (GtkWidget *button,
-						    EMeetingTimeSelector *mts)
-{
-	gtk_menu_popup (GTK_MENU (mts->autopick_menu), NULL, NULL,
-			e_meeting_time_selector_autopick_menu_position_callback,
-			mts, 1, GDK_CURRENT_TIME);
-}
-
-
-static void
-e_meeting_time_selector_autopick_menu_position_callback (GtkMenu *menu,
-							 gint *x,
-							 gint *y,
-							 gpointer user_data)
-{
-	EMeetingTimeSelector *mts;
-	GtkRequisition menu_requisition;
-	gint max_x, max_y;
-
-	mts = E_MEETING_TIME_SELECTOR (user_data);
-
-	/* Calculate our preferred position. */
-	gdk_window_get_origin (mts->autopick_button->window, x, y);
-	*y += mts->autopick_button->allocation.height;
-
-	/* Now make sure we are on the screen. */
-	gtk_widget_size_request (mts->autopick_menu, &menu_requisition);
-	max_x = MAX (0, gdk_screen_width () - menu_requisition.width);
-	max_y = MAX (0, gdk_screen_height () - menu_requisition.height);
-	*x = CLAMP (*x, 0, max_x);
-	*y = CLAMP (*y, 0, max_y);
-}
-
-
-static void
-e_meeting_time_selector_on_autopick_option_toggled (GtkWidget *button,
-						    EMeetingTimeSelector *mts)
-{
-	/* Make sure the menu pops down, which doesn't happen by default if
-	   keyboard accelerators are used. */
-	if (GTK_WIDGET_VISIBLE (mts->autopick_menu))
-		gtk_menu_popdown (GTK_MENU (mts->autopick_menu));
-}
-
-
-static void
-e_meeting_time_selector_on_prev_button_clicked (GtkWidget *button,
-						EMeetingTimeSelector *mts)
-{
-	e_meeting_time_selector_autopick (mts, FALSE);
-}
-
-
-static void
-e_meeting_time_selector_on_next_button_clicked (GtkWidget *button,
-						EMeetingTimeSelector *mts)
-{
-	e_meeting_time_selector_autopick (mts, TRUE);
-}
-
-
-/* This tries to find the previous or next meeting time for which all
-   attendees will be available. */
-static void
-e_meeting_time_selector_autopick (EMeetingTimeSelector *mts,
-				  gboolean forward)
-{
-	EMeetingTimeSelectorTime start_time, end_time, *resource_free;
-	EMeetingTimeSelectorAttendee *attendee;
-	EMeetingTimeSelectorPeriod *period;
-	EMeetingTimeSelectorAutopickOption autopick_option;
-	gint duration_days, duration_hours, duration_minutes, row;
-	gboolean meeting_time_ok, skip_optional = FALSE;
-	gboolean need_one_resource = FALSE, found_resource;
-
-	/* Get the current meeting duration in days + hours + minutes. */
-	e_meeting_time_selector_calculate_time_difference (&mts->meeting_start_time, &mts->meeting_end_time, &duration_days, &duration_hours, &duration_minutes);
-
-	/* Find the first appropriate start time. */
-	start_time = mts->meeting_start_time;
-	if (forward)
-		e_meeting_time_selector_find_nearest_interval (mts, &start_time, &end_time, duration_days, duration_hours, duration_minutes);
-	else
-		e_meeting_time_selector_find_nearest_interval_backward (mts, &start_time, &end_time, duration_days, duration_hours, duration_minutes);
-
-	/* Determine if we can skip optional people and if we only need one
-	   resource based on the autopick option. */
-	autopick_option = e_meeting_time_selector_get_autopick_option (mts);
-	if (autopick_option == E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE
-	    || autopick_option == E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE_AND_ONE_RESOURCE)
-		skip_optional = TRUE;
-	if (autopick_option == E_MEETING_TIME_SELECTOR_ALL_PEOPLE_AND_ONE_RESOURCE
-	    || autopick_option == E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE_AND_ONE_RESOURCE)
-		need_one_resource = TRUE;
-
-	/* Keep moving forward or backward until we find a possible meeting
-	   time. */
-	for (;;) {
-		meeting_time_ok = TRUE;
-		found_resource = FALSE;
-		resource_free = NULL;
-
-		/* Step through each attendee, checking if the meeting time
-		   intersects one of the attendees busy periods. */
-		for (row = 0; row < mts->attendees->len; row++) {
-			attendee = &g_array_index (mts->attendees,
-						   EMeetingTimeSelectorAttendee,
-						   row);
-
-			/* Skip optional people if they don't matter. */
-			if (skip_optional && attendee->type == E_MEETING_TIME_SELECTOR_OPTIONAL_PERSON)
-				continue;
-
-			period = e_meeting_time_selector_find_time_clash (mts, attendee, &start_time, &end_time);
-
-			if (need_one_resource && attendee->type == E_MEETING_TIME_SELECTOR_RESOURCE) {
-				if (period) {
-					/* We want to remember the closest
-					   prev/next time that one resource is
-					   available, in case we don't find any
-					   free resources. */
-					if (forward) {
-						if (!resource_free || e_meeting_time_selector_compare_times (resource_free, &period->end) > 0)
-							resource_free = &period->end;
-					} else {
-						if (!resource_free || e_meeting_time_selector_compare_times (resource_free, &period->start) < 0)
-							resource_free = &period->start;
-					}
-
-				} else {
-					found_resource = TRUE;
-				}
-			} else if (period) {
-				/* Skip the period which clashed. */
-				if (forward) {
-					start_time = period->end;
-				} else {
-					start_time = period->start;
-					e_meeting_time_selector_adjust_time (&start_time, -duration_days, -duration_hours, -duration_minutes);
-				}
-				meeting_time_ok = FALSE;
-				break;
-			}
-		}
-
-		/* Check that we found one resource if necessary. If not, skip
-		   to the closest time that a resource is free. Note that if
-		   there are no resources, resource_free will never get set,
-		   so we assume the meeting time is OK. */
-		if (meeting_time_ok && need_one_resource && !found_resource
-		    && resource_free) {
-			if (forward) {
-				start_time = *resource_free;
-			} else {
-				start_time = *resource_free;
-				e_meeting_time_selector_adjust_time (&start_time, -duration_days, -duration_hours, -duration_minutes);
-				}
-			meeting_time_ok = FALSE;
-		}
-
-		if (meeting_time_ok) {
-			mts->meeting_start_time = start_time;
-			mts->meeting_end_time = end_time;
-			mts->meeting_positions_valid = FALSE;
-			gtk_widget_queue_draw (mts->display_top);
-			gtk_widget_queue_draw (mts->display_main);
-
-			/* Make sure the time is shown. */
-			e_meeting_time_selector_ensure_meeting_time_shown (mts);
-
-			/* Set the times in the GnomeDateEdit widgets. */
-			e_meeting_time_selector_update_start_date_edit (mts);
-			e_meeting_time_selector_update_end_date_edit (mts);
-			return;
-		}
-
-		/* Move forward to the next possible interval. */
-		if (forward)
-			e_meeting_time_selector_find_nearest_interval (mts, &start_time, &end_time, duration_days, duration_hours, duration_minutes);
-		else
-			e_meeting_time_selector_find_nearest_interval_backward (mts, &start_time, &end_time, duration_days, duration_hours, duration_minutes);
-	}
-}
-
-
-static void
-e_meeting_time_selector_calculate_time_difference (EMeetingTimeSelectorTime *start,
-						   EMeetingTimeSelectorTime *end,
-						   gint *days,
-						   gint *hours,
-						   gint *minutes)
-{
-	*days = g_date_julian (&end->date) - g_date_julian (&start->date);
-	*hours = end->hour - start->hour;
-	*minutes = end->minute - start->minute;
-	if (*minutes < 0) {
-		*minutes += 60;
-		*hours = *hours - 1;
-	}
-	if (*hours < 0) {
-		*hours += 24;
-		*days = *days - 1;
-	}
-}
-
-
-/* This moves the given time forward to the next suitable start of a meeting.
-   If zoomed_out is set, this means every hour. If not every half-hour. */
-static void
-e_meeting_time_selector_find_nearest_interval (EMeetingTimeSelector *mts,
-					       EMeetingTimeSelectorTime *start_time,
-					       EMeetingTimeSelectorTime *end_time,
-					       gint days, gint hours, gint mins)
-{
-	gint minutes_shown;
-	gboolean set_to_start_of_working_day = FALSE;
-
-	if (mts->zoomed_out) {
-		start_time->hour++;
-		start_time->minute = 0;
-	} else {
-		start_time->minute += 30;
-		start_time->minute -= start_time->minute % 30;
-	}
-	e_meeting_time_selector_fix_time_overflows (start_time);
-
-	*end_time = *start_time;
-	e_meeting_time_selector_adjust_time (end_time, days, hours, mins);
-
-	/* Check if the interval is less than a day as seen in the display.
-	   If it isn't we don't worry about the working day. */
-	if (!mts->working_hours_only || days > 0)
-		return;
-	minutes_shown = (mts->day_end_hour - mts->day_start_hour) * 60;
-	minutes_shown += mts->day_end_minute - mts->day_start_minute;
-	if (hours * 60 + mins > minutes_shown)
-		return;
-
-	/* If the meeting time finishes past the end of the working day, move
-	   onto the start of the next working day. If the meeting time starts
-	   before the working day, move it on as well. */
-	if (start_time->hour > mts->day_end_hour
-	    || (start_time->hour == mts->day_end_hour
-		&& start_time->minute > mts->day_end_minute)
-	    || end_time->hour > mts->day_end_hour
-	    || (end_time->hour == mts->day_end_hour
-		&& end_time->minute > mts->day_end_minute)) {
-		g_date_add_days (&start_time->date, 1);
-		set_to_start_of_working_day = TRUE;
-	} else if (start_time->hour < mts->day_start_hour
-		   || (start_time->hour == mts->day_start_hour
-		       && start_time->minute < mts->day_start_minute)) {
-		set_to_start_of_working_day = TRUE;
-	}
-
-	if (set_to_start_of_working_day) {
-		start_time->hour = mts->day_start_hour;
-		start_time->minute = mts->day_start_minute;
-
-		if (mts->zoomed_out) {
-			if (start_time->minute > 0) {
-				start_time->hour++;
-				start_time->minute = 0;
-			}
-		} else {
-			start_time->minute += 29;
-			start_time->minute -= start_time->minute % 30;
-		}
-		e_meeting_time_selector_fix_time_overflows (start_time);
-
-		*end_time = *start_time;
-		e_meeting_time_selector_adjust_time (end_time, days, hours, mins);
-	}
-}
-
-
-/* This moves the given time backward to the next suitable start of a meeting.
-   If zoomed_out is set, this means every hour. If not every half-hour. */
-static void
-e_meeting_time_selector_find_nearest_interval_backward (EMeetingTimeSelector *mts,
-							EMeetingTimeSelectorTime *start_time,
-							EMeetingTimeSelectorTime *end_time,
-							gint days, gint hours, gint mins)
-{
-	gint new_hour, minutes_shown;
-	gboolean set_to_end_of_working_day = FALSE;
-
-	new_hour = start_time->hour;
-	if (mts->zoomed_out) {
-		if (start_time->minute == 0)
-			new_hour--;
-		start_time->minute = 0;
-	} else {
-		if (start_time->minute == 0) {
-			start_time->minute = 30;
-			new_hour--;
-		} else if (start_time->minute <= 30)
-			start_time->minute = 0;
-		else
-			start_time->minute = 30;
-	}
-	if (new_hour < 0) {
-		new_hour += 24;
-		g_date_subtract_days (&start_time->date, 1);
-	}
-	start_time->hour = new_hour;
-
-	*end_time = *start_time;
-	e_meeting_time_selector_adjust_time (end_time, days, hours, mins);
-
-	/* Check if the interval is less than a day as seen in the display.
-	   If it isn't we don't worry about the working day. */
-	if (!mts->working_hours_only || days > 0)
-		return;
-	minutes_shown = (mts->day_end_hour - mts->day_start_hour) * 60;
-	minutes_shown += mts->day_end_minute - mts->day_start_minute;
-	if (hours * 60 + mins > minutes_shown)
-		return;
-
-	/* If the meeting time finishes past the end of the working day, move
-	   back to the end of the working day. If the meeting time starts
-	   before the working day, move it back to the end of the previous
-	   working day. */
-	if (start_time->hour > mts->day_end_hour
-	    || (start_time->hour == mts->day_end_hour
-		&& start_time->minute > mts->day_end_minute)
-	    || end_time->hour > mts->day_end_hour
-	    || (end_time->hour == mts->day_end_hour
-		&& end_time->minute > mts->day_end_minute)) {
-		set_to_end_of_working_day = TRUE;
-	} else if (start_time->hour < mts->day_start_hour
-		   || (start_time->hour == mts->day_start_hour
-		       && start_time->minute < mts->day_start_minute)) {
-		g_date_subtract_days (&end_time->date, 1);
-		set_to_end_of_working_day = TRUE;
-	}
-
-	if (set_to_end_of_working_day) {
-		end_time->hour = mts->day_end_hour;
-		end_time->minute = mts->day_end_minute;
-		*start_time = *end_time;
-		e_meeting_time_selector_adjust_time (start_time, -days, -hours, -mins);
-
-		if (mts->zoomed_out) {
-			start_time->minute = 0;
-		} else {
-			start_time->minute -= start_time->minute % 30;
-		}
-
-		*end_time = *start_time;
-		e_meeting_time_selector_adjust_time (end_time, days, hours, mins);
-	}
-}
-
-
-/* This adds on the given days, hours & minutes to a EMeetingTimeSelectorTime.
-   It is used to calculate the end of a period given a start & duration.
-   Days, hours & minutes can be negative, to move backwards, but they should
-   be within normal ranges, e.g. hours should be between -23 and 23. */
-static void
-e_meeting_time_selector_adjust_time (EMeetingTimeSelectorTime *mtstime,
-				     gint days, gint hours, gint minutes)
-{
-	gint new_hours, new_minutes;
-
-	/* We have to handle negative values for hous and minutes here, since
-	   EMeetingTimeSelectorTime uses guint8s to store them. */
-	new_minutes = mtstime->minute + minutes;
-	if (new_minutes < 0) {
-		new_minutes += 60;
-		hours -= 1;
-	}
-
-	new_hours = mtstime->hour + hours;
-	if (new_hours < 0) {
-		new_hours += 24;
-		days -= 1;
-	}
-
-	g_date_add_days (&mtstime->date, days);
-	mtstime->hour = new_hours;
-	mtstime->minute = new_minutes;
-
-	e_meeting_time_selector_fix_time_overflows (mtstime);
-}
-
-
-/* This looks for any busy period of the given attendee which clashes with
-   the start and end time. It uses a binary search. */
-static EMeetingTimeSelectorPeriod*
-e_meeting_time_selector_find_time_clash (EMeetingTimeSelector *mts,
-					 EMeetingTimeSelectorAttendee *attendee,
-					 EMeetingTimeSelectorTime *start_time,
-					 EMeetingTimeSelectorTime *end_time)
-{
-	EMeetingTimeSelectorPeriod *period;
-	gint period_num;
-
-	period_num = e_meeting_time_selector_find_first_busy_period (mts, attendee, &start_time->date);
-
-	if (period_num == -1)
-		return NULL;
-
-	/* Step forward through the busy periods until we find a clash or we
-	   go past the end_time. */
-	while (period_num < attendee->busy_periods->len) {
-		period = &g_array_index (attendee->busy_periods,
-					 EMeetingTimeSelectorPeriod,
-					 period_num);
-
-		/* If the period starts at or after the end time, there is no
-		   clash and we are finished. The busy periods are sorted by
-		   their start times, so all the rest will be later. */
-		if (e_meeting_time_selector_compare_times (&period->start,
-							 end_time) >= 0)
-			return NULL;
-
-		/* If the period ends after the start time, we have found a
-		   clash. From the above test we already know the busy period
-		   isn't completely after the meeting time. */
-		if (e_meeting_time_selector_compare_times (&period->end,
-							 start_time) > 0) {
-			return period;
-		}
-
-		period_num++;
-	}
-
-	return NULL;
-}
-
-
-/* This subtracts the attendees longest_period_in_days from the given date,
-   and does a binary search of the attendee's busy periods array to find the
-   first one which could possible end on the given day or later.
-   If none are found it returns -1. */
-gint
-e_meeting_time_selector_find_first_busy_period (EMeetingTimeSelector *mts,
-						EMeetingTimeSelectorAttendee *attendee,
-						GDate *date)
-{
-	EMeetingTimeSelectorPeriod *period;
-	gint lower, upper, middle = 0, cmp = 0;
-	GDate tmp_date;
-
-	/* Make sure the busy periods have been sorted. */
-	e_meeting_time_selector_attendee_ensure_periods_sorted (mts, attendee);
-
-	/* Calculate the first day which could have a busy period which
-	   continues onto our given date. */
-	tmp_date = *date;
-	g_date_subtract_days (&tmp_date, attendee->longest_period_in_days);
-
-	/* We want the first busy period which starts on tmp_date. */
-	lower = 0;
-	upper = attendee->busy_periods->len;
-
-	if (upper == 0)
-		return -1;
-
-	while (lower < upper) {
-		middle = (lower + upper) >> 1;
-	  
-		period = &g_array_index (attendee->busy_periods,
-					 EMeetingTimeSelectorPeriod, middle);
-
-		cmp = g_date_compare (&tmp_date, &period->start.date);
-	  
-		if (cmp == 0)
-			break;
-		else if (cmp < 0)
-			upper = middle;
-		else
-			lower = middle + 1;
-	}
-
-	/* There may be several busy periods on the same day so we step
-	   backwards to the first one. */
-	if (cmp == 0) {
-		while (middle > 0) {
-			period = &g_array_index (attendee->busy_periods,
-						 EMeetingTimeSelectorPeriod, middle - 1);
-			if (g_date_compare (&tmp_date, &period->start.date) != 0)
-				break;
-			middle--;
-		}
-	} else if (cmp > 0) {
-		/* This means we couldn't find a period on the given day, and
-		   the last one we looked at was before it, so if there are
-		   any more periods after this one we return it. */
-		middle++;
-		if (attendee->busy_periods->len <= middle)
-			return -1;
-	}
-
-	return middle;
-}
-
-
-static void
-e_meeting_time_selector_on_zoomed_out_toggled (GtkWidget *menuitem,
-					       EMeetingTimeSelector *mts)
-{
-	/* Make sure the menu pops down, which doesn't happen by default if
-	   keyboard accelerators are used. */
-	if (GTK_WIDGET_VISIBLE (mts->options_menu))
-		gtk_menu_popdown (GTK_MENU (mts->options_menu));
-
-	e_meeting_time_selector_set_zoomed_out (mts, GTK_CHECK_MENU_ITEM (menuitem)->active);
-}
-
-
-static void
-e_meeting_time_selector_on_working_hours_toggled (GtkWidget *menuitem,
-						  EMeetingTimeSelector *mts)
-{
-	/* Make sure the menu pops down, which doesn't happen by default if
-	   keyboard accelerators are used. */
-	if (GTK_WIDGET_VISIBLE (mts->options_menu))
-		gtk_menu_popdown (GTK_MENU (mts->options_menu));
-
-	e_meeting_time_selector_set_working_hours_only (mts, GTK_CHECK_MENU_ITEM (menuitem)->active);
-}
-
-
-/* This recalculates day_width, first_hour_shown and last_hour_shown. */
-static void
-e_meeting_time_selector_recalc_grid (EMeetingTimeSelector *mts)
-{
-	if (mts->working_hours_only) {
-		mts->first_hour_shown = mts->day_start_hour;
-		mts->last_hour_shown = mts->day_end_hour;
-		if (mts->day_end_minute != 0)
-			mts->last_hour_shown += 1;
-	} else {
-		mts->first_hour_shown = 0;
-		mts->last_hour_shown = 24;
-	}
-
-	/* In the brief view we use the nearest hours divisible by 3. */
-	if (mts->zoomed_out) {
-		mts->first_hour_shown -= mts->first_hour_shown % 3;
-		mts->last_hour_shown += 2;
-		mts->last_hour_shown -= mts->last_hour_shown % 3;
-	}
-
-	mts->day_width = mts->col_width	* (mts->last_hour_shown - mts->first_hour_shown);
-	if (mts->zoomed_out)
-		mts->day_width /= 3;
-
-	/* Add one pixel for the extra vertical grid line. */
-	mts->day_width++;
-
-	gnome_canvas_set_scroll_region (GNOME_CANVAS (mts->display_top),
-					0, 0,
-					mts->day_width * E_MEETING_TIME_SELECTOR_DAYS_SHOWN,
-					mts->row_height * 3);
-	e_meeting_time_selector_update_main_canvas_scroll_region (mts);
-
-	e_meeting_time_selector_recalc_date_format (mts);
-	mts->meeting_positions_valid = FALSE;
-}
-
-
-/* This saves the first visible time in the given EMeetingTimeSelectorTime. */
-static void
-e_meeting_time_selector_save_position (EMeetingTimeSelector *mts,
-				       EMeetingTimeSelectorTime *mtstime)
-{
-	gint scroll_x, scroll_y;
-
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (mts->display_main),
-					 &scroll_x, &scroll_y);
-	e_meeting_time_selector_calculate_time (mts, scroll_x, mtstime);
-}
-
-
-/* This restores a saved position. */
-static void
-e_meeting_time_selector_restore_position (EMeetingTimeSelector *mts,
-					  EMeetingTimeSelectorTime *mtstime)
-{
-	gint scroll_x, scroll_y, new_scroll_x;
-
-	new_scroll_x = e_meeting_time_selector_calculate_time_position (mts,
-								      mtstime);
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (mts->display_main),
-					 &scroll_x, &scroll_y);
-	gnome_canvas_scroll_to (GNOME_CANVAS (mts->display_main),
-				new_scroll_x, scroll_y);
-}
-
-
-/* This returns the x pixel coords of the meeting time in the entire scroll
-   region. It recalculates them if they have been marked as invalid.
-   If it returns FALSE then no meeting time is set or the meeting time is
-   not visible in the current scroll area. */
-gboolean
-e_meeting_time_selector_get_meeting_time_positions (EMeetingTimeSelector *mts,
-						    gint *start_x,
-						    gint *end_x)
-{
-	if (mts->meeting_positions_valid) {
-		if (mts->meeting_positions_in_scroll_area) {
-			*start_x = mts->meeting_start_x;
-			*end_x = mts->meeting_end_x;
-			return TRUE;
-		} else {
-			return FALSE;
-		}
-	}
-
-	mts->meeting_positions_valid = TRUE;
-
-	/* Check if the days aren't in our current range. */
-	if (g_date_compare (&mts->meeting_start_time.date, &mts->last_date_shown) > 0
-	    || g_date_compare (&mts->meeting_end_time.date, &mts->first_date_shown) < 0) {
-		mts->meeting_positions_in_scroll_area = FALSE;
-		return FALSE;
-	}
-
-	mts->meeting_positions_in_scroll_area = TRUE;
-	*start_x = mts->meeting_start_x = e_meeting_time_selector_calculate_time_position (mts, &mts->meeting_start_time);
-	*end_x = mts->meeting_end_x = e_meeting_time_selector_calculate_time_position (mts, &mts->meeting_end_time);
-
-	return TRUE;
-}
-
-
-/* This recalculates the date format to used, by computing the width of the
-   longest date strings in the widget's font and seeing if they fit. */
-static void
-e_meeting_time_selector_recalc_date_format (EMeetingTimeSelector *mts)
-{
-	/* An array of dates, one for each month in the year 2000. They must
-	   all be Sundays. */
-	static const int days[12] = { 23, 20, 19, 23, 21, 18,
-				      23, 20, 17, 22, 19, 24 };
-	GDate date;
-	gint max_date_width, longest_weekday_width, longest_month_width, width;
-	gint day, longest_weekday, month, longest_month;
-	gchar buffer[128];
-	GdkFont *font;
-
-	font = GTK_WIDGET (mts)->style->font;
-
-	/* Calculate the maximum date width we can fit into the display. */
-	max_date_width = mts->day_width - 2;
-
-	/* Find the biggest full weekday name. We start on a particular
-	   Monday and go through seven days. */
-	g_date_clear (&date, 1);
-	g_date_set_dmy (&date, 3, 1, 2000);	/* Monday 3rd Jan 2000. */
-	longest_weekday_width = 0;
-	longest_weekday = G_DATE_MONDAY;
-	for (day = G_DATE_MONDAY; day <= G_DATE_SUNDAY; day++) {
-		g_date_strftime (buffer, sizeof (buffer), "%A", &date);
-		width = gdk_string_width (font, buffer);
-		if (width > longest_weekday_width) {
-			longest_weekday = day;
-			longest_weekday_width = width;
-		}
-		g_date_add_days (&date, 1);
-	}
-
-	/* Now find the biggest month name. */
-	longest_month_width = 0;
-	longest_month = G_DATE_JANUARY;
-	for (month = G_DATE_JANUARY; month <= G_DATE_DECEMBER; month++) {
-		g_date_set_month (&date, month);
-		g_date_strftime (buffer, sizeof (buffer), "%B", &date);
-		width = gdk_string_width (font, buffer);
-		if (width > longest_month_width) {
-			longest_month = month;
-			longest_month_width = width;
-		}
-	}
-
-	/* See if we can use the full date. We want to use a date with a
-	   month day > 20 and also the longest weekday. We use a
-	   pre-calculated array of days for each month and add on the
-	   weekday (which is 1 (Mon) to 7 (Sun). */
-	g_date_set_dmy (&date, days[longest_month - 1] + longest_weekday,
-			longest_month, 2000);
-	/* This is a strftime() format string %A = full weekday name,
-	   %B = full month name, %d = month day, %Y = full year. */
-	g_date_strftime (buffer, sizeof (buffer), _("%A, %B %d, %Y"), &date);
-
-	g_print ("longest_month: %i longest_weekday: %i date: %s\n",
-		 longest_month, longest_weekday, buffer);
-	
-	if (gdk_string_width (font, buffer) < max_date_width) {
-		mts->date_format = E_MEETING_TIME_SELECTOR_DATE_FULL;
-		return;
-	}
-
-	/* Now try it with abbreviated weekday names. */
-	longest_weekday_width = 0;
-	longest_weekday = G_DATE_MONDAY;
-	g_date_set_dmy (&date, 3, 1, 2000);	/* Monday 3rd Jan 2000. */
-	for (day = G_DATE_MONDAY; day <= G_DATE_SUNDAY; day++) {
-		g_date_strftime (buffer, sizeof (buffer), "%a", &date);
-		width = gdk_string_width (font, buffer);
-		if (width > longest_weekday_width) {
-			longest_weekday = day;
-			longest_weekday_width = width;
-		}
-		g_date_add_days (&date, 1);
-	}
-
-	g_date_set_dmy (&date, days[longest_month - 1] + longest_weekday,
-			longest_month, 2000);
-	/* This is a strftime() format string %a = abbreviated weekday name,
-	   %m = month number, %d = month day, %Y = full year. */
-	g_date_strftime (buffer, sizeof (buffer), _("%a %m/%d/%Y"), &date);
-
-	g_print ("longest_month: %i longest_weekday: %i date: %s\n",
-		 longest_month, longest_weekday, buffer);
-	
-	if (gdk_string_width (font, buffer) < max_date_width)
-		mts->date_format = E_MEETING_TIME_SELECTOR_DATE_ABBREVIATED_DAY;
-	else
-		mts->date_format = E_MEETING_TIME_SELECTOR_DATE_SHORT;
-}
-
-
-/* Turn off the background of the canvas windows. This reduces flicker
-   considerably when scrolling. (Why isn't it in GnomeCanvas?). */
-static void
-e_meeting_time_selector_on_canvas_realized (GtkWidget *widget,
-					    EMeetingTimeSelector *mts)
-{
-	gdk_window_set_back_pixmap (GTK_LAYOUT (widget)->bin_window,
-				    NULL, FALSE);
-}
-
-
-/* This is called when the meeting start time GnomeDateEdit is changed,
-   either via the "date_changed". "time_changed" or "activate" signals on one
-   of the GtkEntry widgets. So don't use the widget parameter since it may be
-   one of the child GtkEntry widgets. */
-static void
-e_meeting_time_selector_on_start_time_changed (GtkWidget *widget,
-					       EMeetingTimeSelector *mts)
-{
-	gint duration_days, duration_hours, duration_minutes;
-	EMeetingTimeSelectorTime mtstime;
-	time_t newtime;
-	struct tm *newtime_tm;
-
-	newtime = gnome_date_edit_get_date (GNOME_DATE_EDIT (mts->start_date_edit));
-	newtime_tm = localtime (&newtime);
-	g_date_clear (&mtstime.date, 1);
-	g_date_set_time (&mtstime.date, newtime);
-	mtstime.hour = newtime_tm->tm_hour;
-	mtstime.minute = newtime_tm->tm_min;
-
-	/* If the time hasn't changed, just return. */
-	if (e_meeting_time_selector_compare_times (&mtstime, &mts->meeting_start_time) == 0)
-		return;
-
-	/* Calculate the current meeting duration. */
-	e_meeting_time_selector_calculate_time_difference (&mts->meeting_start_time, &mts->meeting_end_time, &duration_days, &duration_hours, &duration_minutes);
-
-	/* Set the new start time. */
-	mts->meeting_start_time = mtstime;
-
-	/* Update the end time so the meeting duration stays the same. */
-	mts->meeting_end_time = mts->meeting_start_time;
-	e_meeting_time_selector_adjust_time (&mts->meeting_end_time, duration_days, duration_hours, duration_minutes);
-	e_meeting_time_selector_update_end_date_edit (mts);
-
-	mts->meeting_positions_valid = FALSE;
-	e_meeting_time_selector_ensure_meeting_time_shown (mts);
-	gtk_widget_queue_draw (mts->display_top);
-	gtk_widget_queue_draw (mts->display_main);
-}
-
-
-/* This is called when the meeting end time GnomeDateEdit is changed,
-   either via the "date_changed", "time_changed" or "activate" signals on one
-   of the GtkEntry widgets. So don't use the widget parameter since it may be
-   one of the child GtkEntry widgets. */
-static void
-e_meeting_time_selector_on_end_time_changed (GtkWidget *widget,
-					     EMeetingTimeSelector *mts)
-{
-	EMeetingTimeSelectorTime mtstime;
-	time_t newtime;
-	struct tm *newtime_tm;
-
-	newtime = gnome_date_edit_get_date (GNOME_DATE_EDIT (mts->end_date_edit));
-	newtime_tm = localtime (&newtime);
-	g_date_clear (&mtstime.date, 1);
-	g_date_set_time (&mtstime.date, newtime);
-	mtstime.hour = newtime_tm->tm_hour;
-	mtstime.minute = newtime_tm->tm_min;
-
-	/* If the time hasn't changed, just return. */
-	if (e_meeting_time_selector_compare_times (&mtstime, &mts->meeting_end_time) == 0)
-		return;
-
-	/* Set the new end time. */
-	mts->meeting_end_time = mtstime;
-
-	/* If the start time is after the end time, set it to the same time. */
-	if (e_meeting_time_selector_compare_times (&mtstime, &mts->meeting_start_time) < 0) {
-		/* We set it first, before updating the widget, so the signal
-		   handler will just return. */
-		mts->meeting_start_time = mtstime;
-		e_meeting_time_selector_update_start_date_edit (mts);
-	}
-
-	mts->meeting_positions_valid = FALSE;
-	e_meeting_time_selector_ensure_meeting_time_shown (mts);
-	gtk_widget_queue_draw (mts->display_top);
-	gtk_widget_queue_draw (mts->display_main);
-}
-
-
-/* This updates the ranges shown in the GnomeDateEdit popup menus, according
-   to working_hours_only etc. */
-static void
-e_meeting_time_selector_update_date_popup_menus (EMeetingTimeSelector *mts)
-{
-	GnomeDateEdit *start_edit, *end_edit;
-	gint low_hour, high_hour;
-
-	start_edit = GNOME_DATE_EDIT (mts->start_date_edit);
-	end_edit = GNOME_DATE_EDIT (mts->end_date_edit);
-
-	if (mts->working_hours_only) {
-		low_hour = mts->day_start_hour;
-		high_hour = mts->day_end_hour;
-	} else {
-		low_hour = 0;
-		high_hour = 23;
-	}
-
-	gnome_date_edit_set_popup_range (start_edit, low_hour, high_hour);
-	gnome_date_edit_set_popup_range (end_edit, low_hour, high_hour);
-}
-
-
-static void
-e_meeting_time_selector_on_canvas_size_allocate (GtkWidget *widget,
-						 GtkAllocation *allocation,
-						 EMeetingTimeSelector *mts)
-{
-	e_meeting_time_selector_update_main_canvas_scroll_region (mts);
-
-	e_meeting_time_selector_ensure_meeting_time_shown (mts);
-}
-
-
-static void
-e_meeting_time_selector_on_attendees_list_size_allocate (GtkWidget *widget,
-							 GtkAllocation *allocation,
-							 EMeetingTimeSelector *mts)
-{
-	e_meeting_time_selector_update_attendees_list_scroll_region (mts);
-	e_meeting_time_selector_update_attendees_list_positions (mts);
-}
-
-
-/* This updates the list canvas scroll region according to the number of
-   attendees. If the total height needed is less than the height of the canvas,
-   we must use the height of the canvas, or it causes problems. */
-static void
-e_meeting_time_selector_update_attendees_list_scroll_region (EMeetingTimeSelector *mts)
-{
-	gint height, canvas_width, canvas_height;
-
-	height = mts->row_height * mts->attendees->len;
-	canvas_width = GTK_WIDGET (mts->attendees_list)->allocation.width;
-	canvas_height = GTK_WIDGET (mts->attendees_list)->allocation.height;
-
-	height = MAX (height,  canvas_height);
-
-	gnome_canvas_set_scroll_region (GNOME_CANVAS (mts->attendees_list),
-					0, 0,
-					canvas_width,
-					height);
-}
-
-
-/* This updates the canvas scroll regions according to the number of attendees.
-   If the total height needed is less than the height of the canvas, we must
-   use the height of the canvas, or it causes problems. */
-static void
-e_meeting_time_selector_update_main_canvas_scroll_region (EMeetingTimeSelector *mts)
-{
-	gint height, canvas_height, list_width;
-
-	height = mts->row_height * (mts->attendees->len + 1);
-	canvas_height = GTK_WIDGET (mts->display_main)->allocation.height;
-	list_width = GTK_WIDGET (mts->attendees_list)->allocation.width;
-
-	height = MAX (height,  canvas_height);
-
-	gnome_canvas_set_scroll_region (GNOME_CANVAS (mts->attendees_list),
-					0, 0,
-					list_width,
-					height);
-	gnome_canvas_set_scroll_region (GNOME_CANVAS (mts->display_main),
-					0, 0,
-					mts->day_width * E_MEETING_TIME_SELECTOR_DAYS_SHOWN,
-					height);
-}
-
-
-/* This changes the meeting time based on the given x coordinate and whether
-   we are dragging the start or end bar. It returns the new position, which
-   will be swapped if the start bar is dragged past the end bar or vice versa.
-   It make sure the meeting time is never dragged outside the visible canvas
-   area. */
-void
-e_meeting_time_selector_drag_meeting_time (EMeetingTimeSelector *mts,
-					   gint x)
-{
-	EMeetingTimeSelectorTime first_time, last_time, drag_time, *time_to_set;
-	gint scroll_x, scroll_y, canvas_width;
-	gboolean set_both_times = FALSE;
-
-	/* Get the x coords of visible part of the canvas. */
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (mts->display_main),
-					 &scroll_x, &scroll_y);
-	canvas_width = mts->display_main->allocation.width;
-
-	/* Save the x coordinate for the timeout handler. */
-	mts->last_drag_x = (x < scroll_x) ? x - scroll_x
-		: x - scroll_x - canvas_width + 1;
-
-	/* Check if the mouse is off the edge of the canvas. */
-	if (x < scroll_x || x > scroll_x + canvas_width) {
-		/* If we haven't added a timeout function, add one. */
-		if (mts->auto_scroll_timeout_id == 0) {
-			mts->auto_scroll_timeout_id = g_timeout_add (60, e_meeting_time_selector_timeout_handler, mts);
-			mts->scroll_count = 0;
-
-			/* Call the handler to start scrolling now. */
-			e_meeting_time_selector_timeout_handler (mts);
-			return;
-		}
-	} else {
-		e_meeting_time_selector_remove_timeout (mts);
-	}
-
-	/* Calculate the minimum & maximum times we can use, based on the
-	   scroll offsets and whether zoomed_out is set. */
-	e_meeting_time_selector_calculate_time (mts, scroll_x, &first_time);
-	e_meeting_time_selector_calculate_time (mts, scroll_x + canvas_width - 1,
-						&last_time);
-	if (mts->zoomed_out) {
-		if (first_time.minute > 30)
-			first_time.hour++;
-		first_time.minute = 0;
-		last_time.minute = 0;
-	} else {
-		first_time.minute += 15;
-		first_time.minute -= first_time.minute % 30;
-		last_time.minute -= last_time.minute % 30;
-	}
-	e_meeting_time_selector_fix_time_overflows (&first_time);
-	e_meeting_time_selector_fix_time_overflows (&last_time);
-
-	/* Calculate the time from x coordinate. */
-	e_meeting_time_selector_calculate_time (mts, x, &drag_time);
-
-	/* Calculate the nearest half-hour or hour, depending on whether
-	   zoomed_out is set. */
-	if (mts->zoomed_out) {
-		if (drag_time.minute > 30)
-			drag_time.hour++;
-		drag_time.minute = 0;
-	} else {
-		drag_time.minute += 15;
-		drag_time.minute -= drag_time.minute % 30;
-	}
-	e_meeting_time_selector_fix_time_overflows (&drag_time);
-
-	/* Now make sure we are between first_time & last_time. */
-	if (e_meeting_time_selector_compare_times (&drag_time, &first_time) < 0)
-		drag_time = first_time;
-	if (e_meeting_time_selector_compare_times (&drag_time, &last_time) > 0)
-		drag_time = last_time;
-
-	/* Set the meeting start or end time to drag_time. */
-	if (mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_START)
-		time_to_set = &mts->meeting_start_time;
-	else
-		time_to_set = &mts->meeting_end_time;
-
-	/* If the time is unchanged, just return. */
-	if (e_meeting_time_selector_compare_times (time_to_set, &drag_time) == 0)
-		return;
-
-	*time_to_set = drag_time;
-
-	/* Check if the start time and end time need to be switched. */
-	if (e_meeting_time_selector_compare_times (&mts->meeting_start_time,
-						 &mts->meeting_end_time) > 0) {
-		drag_time = mts->meeting_start_time;
-		mts->meeting_start_time = mts->meeting_end_time;
-		mts->meeting_end_time = drag_time;
-
-		if (mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_START)
-			mts->dragging_position = E_MEETING_TIME_SELECTOR_POS_END;
-		else
-			mts->dragging_position = E_MEETING_TIME_SELECTOR_POS_START;
-
-		set_both_times = TRUE;
-	}
-
-	/* Mark the calculated positions as invalid. */
-	mts->meeting_positions_valid = FALSE;
-
-	/* Redraw the canvases. */
-	gtk_widget_queue_draw (mts->display_top);
-	gtk_widget_queue_draw (mts->display_main);
-
-	/* Set the times in the GnomeDateEdit widgets. */
-	if (set_both_times
-	    || mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_START)
-		e_meeting_time_selector_update_start_date_edit (mts);
-
-	if (set_both_times
-	    || mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_END)
-		e_meeting_time_selector_update_end_date_edit (mts);
-}
-
-
-/* This is the timeout function which handles auto-scrolling when the user is
-   dragging one of the meeting time vertical bars outside the left or right
-   edge of the canvas. */
-static gboolean
-e_meeting_time_selector_timeout_handler (gpointer data)
-{
-	EMeetingTimeSelector *mts;
-	EMeetingTimeSelectorTime drag_time, *time_to_set;
-	gint scroll_x, max_scroll_x, scroll_y, canvas_width;
-	gint scroll_speed, scroll_offset;
-	gboolean set_both_times = FALSE;
-
-	mts = E_MEETING_TIME_SELECTOR (data);
-
-	GDK_THREADS_ENTER ();
-
-	/* Return if we don't need to scroll yet. */
-	if (mts->scroll_count-- > 0) {
-		GDK_THREADS_LEAVE ();
-		return TRUE;
-	}
-
-	/* Get the x coords of visible part of the canvas. */
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (mts->display_main),
-					 &scroll_x, &scroll_y);
-	canvas_width = mts->display_main->allocation.width;
-
-	/* Calculate the scroll delay, between 0 and MAX_SCROLL_SPEED. */
-	scroll_speed = abs (mts->last_drag_x / E_MEETING_TIME_SELECTOR_SCROLL_INCREMENT_WIDTH);
-	scroll_speed = MIN (scroll_speed,
-			    E_MEETING_TIME_SELECTOR_MAX_SCROLL_SPEED);
-
-	/* Reset the scroll count. */
-	mts->scroll_count = E_MEETING_TIME_SELECTOR_MAX_SCROLL_SPEED - scroll_speed;
-
-	/* Calculate how much we need to scroll. */
-	if (mts->last_drag_x >= 0)
-		scroll_offset = mts->col_width;
-	else
-		scroll_offset = -mts->col_width;
-
-	scroll_x += scroll_offset;
-	max_scroll_x = (mts->day_width * E_MEETING_TIME_SELECTOR_DAYS_SHOWN)
-		- canvas_width;
-	scroll_x = CLAMP (scroll_x, 0, max_scroll_x);
-
-	/* Calculate the minimum or maximum visible time in the canvas, which
-	   we will now set the dragged time to. */
-	if (scroll_offset > 0) {
-		e_meeting_time_selector_calculate_time (mts,
-						      scroll_x + canvas_width - 1,
-						      &drag_time);
-		if (mts->zoomed_out) {
-			drag_time.minute = 0;
-		} else {
-			drag_time.minute -= drag_time.minute % 30;
-		}
-	} else {
-		e_meeting_time_selector_calculate_time (mts, scroll_x,
-							&drag_time);
-		if (mts->zoomed_out) {
-			if (drag_time.minute > 30)
-				drag_time.hour++;
-			drag_time.minute = 0;
-		} else {
-			drag_time.minute += 15;
-			drag_time.minute -= drag_time.minute % 30;
-		}
-	}
-	e_meeting_time_selector_fix_time_overflows (&drag_time);
-
-	/* Set the meeting start or end time to drag_time. */
-	if (mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_START)
-		time_to_set = &mts->meeting_start_time;
-	else
-		time_to_set = &mts->meeting_end_time;
-
-	/* If the time is unchanged, just return. */
-	if (e_meeting_time_selector_compare_times (time_to_set, &drag_time) == 0) {
-		GDK_THREADS_LEAVE ();
-		return TRUE;
-	}
-
-	*time_to_set = drag_time;
-
-	/* Check if the start time and end time need to be switched. */
-	if (e_meeting_time_selector_compare_times (&mts->meeting_start_time, &mts->meeting_end_time) > 0) {
-		drag_time = mts->meeting_start_time;
-		mts->meeting_start_time = mts->meeting_end_time;
-		mts->meeting_end_time = drag_time;
-
-		if (mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_START)
-			mts->dragging_position = E_MEETING_TIME_SELECTOR_POS_END;
-		else
-			mts->dragging_position = E_MEETING_TIME_SELECTOR_POS_START;
-
-		set_both_times = TRUE;
-	}
-
-	/* Mark the calculated positions as invalid. */
-	mts->meeting_positions_valid = FALSE;
-
-	/* Set the times in the GnomeDateEdit widgets. */
-	if (set_both_times
-	    || mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_START)
-		e_meeting_time_selector_update_start_date_edit (mts);
-
-	if (set_both_times
-	    || mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_END)
-		e_meeting_time_selector_update_end_date_edit (mts);
-
-	/* Redraw the canvases. We freeze and thaw the layouts so that they
-	   get redrawn completely. Otherwise the pixels get scrolled left or
-	   right which is not good for us (since our vertical bars have been
-	   moved) and causes flicker. */
-	gtk_layout_freeze (GTK_LAYOUT (mts->display_main));
-	gtk_layout_freeze (GTK_LAYOUT (mts->display_top));
-	gnome_canvas_scroll_to (GNOME_CANVAS (mts->display_main),
-				scroll_x, scroll_y);
-	gnome_canvas_scroll_to (GNOME_CANVAS (mts->display_top),
-				scroll_x, scroll_y);
-	gtk_layout_thaw (GTK_LAYOUT (mts->display_main));
-	gtk_layout_thaw (GTK_LAYOUT (mts->display_top));
-
-	GDK_THREADS_LEAVE ();
-	return TRUE;
-}
-
-
-/* This removes our auto-scroll timeout function, if we have one installed. */
-void
-e_meeting_time_selector_remove_timeout (EMeetingTimeSelector *mts)
-{
-	if (mts->auto_scroll_timeout_id) {
-		g_source_remove (mts->auto_scroll_timeout_id);
-		mts->auto_scroll_timeout_id = 0;
-	}
-}
-
-
-/* This updates the GnomeDateEdit widget displaying the meeting start time. */
-static void
-e_meeting_time_selector_update_start_date_edit (EMeetingTimeSelector *mts)
-{
-	struct tm start_tm;
-	time_t start_time_t;
-
-	g_date_to_struct_tm (&mts->meeting_start_time.date, &start_tm);
-	start_tm.tm_hour = mts->meeting_start_time.hour;
-	start_tm.tm_min = mts->meeting_start_time.minute;
-	start_time_t = mktime (&start_tm);
-	gnome_date_edit_set_time (GNOME_DATE_EDIT (mts->start_date_edit),
-				  start_time_t);
-}
-
-
-/* This updates the GnomeDateEdit widget displaying the meeting end time. */
-static void
-e_meeting_time_selector_update_end_date_edit (EMeetingTimeSelector *mts)
-{
-	struct tm end_tm;
-	time_t end_time_t;
-
-	g_date_to_struct_tm (&mts->meeting_end_time.date, &end_tm);
-	end_tm.tm_hour = mts->meeting_end_time.hour;
-	end_tm.tm_min = mts->meeting_end_time.minute;
-	end_time_t = mktime (&end_tm);
-	gnome_date_edit_set_time (GNOME_DATE_EDIT (mts->end_date_edit),
-				  end_time_t);
-}
-
-
-/* This ensures that the meeting time is shown on screen, by scrolling the
-   canvas and possibly by changing the range of dates shown in the canvas. */
-static void
-e_meeting_time_selector_ensure_meeting_time_shown (EMeetingTimeSelector *mts)
-{
-	gint start_x, end_x, scroll_x, scroll_y, canvas_width;
-	gint new_scroll_x;
-	gboolean fits_in_canvas;
-
-	/* Check if we need to change the range of dates shown. */
-	if (g_date_compare (&mts->meeting_start_time.date,
-			    &mts->first_date_shown) < 0
-	    || g_date_compare (&mts->meeting_end_time.date,
-			       &mts->last_date_shown) > 0) {
-		e_meeting_time_selector_update_dates_shown (mts);
-		gtk_widget_queue_draw (mts->display_top);
-		gtk_widget_queue_draw (mts->display_main);
-	}
-
-	/* If all of the meeting time is visible, just return. */
-	e_meeting_time_selector_get_meeting_time_positions (mts, &start_x,
-							    &end_x);
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (mts->display_main),
-					 &scroll_x, &scroll_y);
-	canvas_width = mts->display_main->allocation.width;
-	if (start_x > scroll_x && end_x <= scroll_x + canvas_width)
-		return;
-
-	fits_in_canvas = end_x - start_x < canvas_width ? TRUE : FALSE;
-
-	/* If the meeting is not entirely visible, either center it if it is
-	   smaller than the canvas, or show the start of it if it is big. */
-	if (fits_in_canvas) {
-		new_scroll_x = (start_x + end_x - canvas_width) / 2;
-	} else {
-		new_scroll_x = start_x;
-	}
-	gnome_canvas_scroll_to (GNOME_CANVAS (mts->display_main),
-				new_scroll_x, scroll_y);
-}
-
-
-/* This updates the range of dates shown in the canvas, to make sure that the
-   currently selected meeting time is in the range. */
-static void
-e_meeting_time_selector_update_dates_shown (EMeetingTimeSelector *mts)
-{
-	mts->first_date_shown = mts->meeting_start_time.date;
-	g_date_subtract_days (&mts->first_date_shown, 60);
-
-	mts->last_date_shown = mts->first_date_shown;
-	g_date_add_days (&mts->last_date_shown, E_MEETING_TIME_SELECTOR_DAYS_SHOWN - 1);
-}
-
-
-/* This checks if the time's hour is over 24 or its minute is over 60 and if
-   so it updates the day/hour appropriately. Note that hours and minutes are
-   stored in guint8's so they can't overflow by much. */
-void
-e_meeting_time_selector_fix_time_overflows (EMeetingTimeSelectorTime *mtstime)
-{
-	gint hours_to_add, days_to_add;
-
-	hours_to_add = mtstime->minute / 60;
-	if (hours_to_add > 0) {
-		mtstime->minute -= hours_to_add * 60;
-		mtstime->hour += hours_to_add;
-	}
-
-	days_to_add = mtstime->hour / 24;
-	if (days_to_add > 0) {
-		mtstime->hour -= days_to_add * 24;
-		g_date_add_days (&mtstime->date, days_to_add);
-	}
-}
-
-
-static void
-e_meeting_time_selector_update_attendees_list_positions (EMeetingTimeSelector *mts)
-{
-	EMeetingTimeSelectorAttendee *attendee;
-	gint list_width, item_width;
-	gint row;
-	GdkFont *font;
-
-	list_width = GTK_WIDGET (mts->attendees_list)->allocation.width;
-	item_width = MAX (1, list_width - E_MEETING_TIME_SELECTOR_ICON_COLUMN_WIDTH - E_MEETING_TIME_SELECTOR_TEXT_X_PAD * 2);
-	font = GTK_WIDGET (mts)->style->font;
-	for (row = 0; row < mts->attendees->len; row++) {
-		attendee = &g_array_index (mts->attendees,
-					   EMeetingTimeSelectorAttendee, row);
-
-		gnome_canvas_item_set
-			(attendee->text_item,
-			 "font_gdk", font,
-			 "clip_width", (gdouble) item_width,
-			 "clip_height", (gdouble) (font->ascent
-						   + font->descent),
-			 NULL);
-
-		e_canvas_item_move_absolute (attendee->text_item,
-					     E_MEETING_TIME_SELECTOR_ICON_COLUMN_WIDTH
-					     + E_MEETING_TIME_SELECTOR_TEXT_X_PAD,
-					     row * mts->row_height + 1 + E_MEETING_TIME_SELECTOR_TEXT_Y_PAD);
-
-		gnome_canvas_item_show (attendee->text_item);
-	}
-}
-
-
-/*
- * CONVERSION ROUTINES - functions to convert between different coordinate
- *			 spaces and dates.
- */
-
-/* This takes an x pixel coordinate within the entire canvas scroll region and
-   returns the date in which it falls. If day_position is not NULL it also
-   returns the x coordinate within the date, relative to the visible part of
-   the canvas. It is used when painting the days in the item_draw function.
-   Note that it must handle negative x coordinates in case we are dragging off
-   the edge of the canvas. */
-void
-e_meeting_time_selector_calculate_day_and_position (EMeetingTimeSelector *mts,
-						    gint x,
-						    GDate *date,
-						    gint *day_position)
-{
-	gint days_from_first_shown;
-
-	*date = mts->first_date_shown;
-
-	if (x >= 0) {
-		days_from_first_shown = x / mts->day_width;
-		g_date_add_days (date, days_from_first_shown);
-		if (day_position)
-			*day_position = - x % mts->day_width;
-	} else {
-		days_from_first_shown = -x / mts->day_width + 1;
-		g_date_subtract_days (date, days_from_first_shown);
-		if (day_position)
-			*day_position = -mts->day_width - x % mts->day_width;
-	}
-}
-
-
-/* This takes an x pixel coordinate within a day, and converts it to hours
-   and minutes, depending on working_hours_only and zoomed_out. */
-void
-e_meeting_time_selector_convert_day_position_to_hours_and_mins (EMeetingTimeSelector *mts, gint day_position, guint8 *hours, guint8 *minutes)
-{
-	if (mts->zoomed_out)
-		day_position *= 3;
-
-	/* Calculate the hours & minutes from the first displayed. */
-	*hours = day_position / mts->col_width;
-	*minutes = (day_position % mts->col_width) * 60 / mts->col_width;
-
-	/* Now add on the first hour shown. */
-	*hours += mts->first_hour_shown;
-}
-
-
-/* This takes an x pixel coordinate within the entire canvas scroll region and
-   returns the time in which it falls. Note that it won't be extremely
-   accurate since hours may only be a few pixels wide in the display.
-   With zoomed_out set each pixel may represent 5 minutes or more, depending
-   on how small the font is. */
-void
-e_meeting_time_selector_calculate_time (EMeetingTimeSelector *mts,
-					gint x,
-					EMeetingTimeSelectorTime *time)
-{
-	gint day_position;
-
-	/* First get the day and the x position within the day. */
-	e_meeting_time_selector_calculate_day_and_position (mts, x, &time->date,
-							    NULL);
-
-	/* Now convert the day_position into an hour and minute. */
-	if (x >= 0)
-		day_position = x % mts->day_width;
-	else
-		day_position = mts->day_width + x % mts->day_width;
-
-	e_meeting_time_selector_convert_day_position_to_hours_and_mins (mts, day_position, &time->hour, &time->minute);
-}
-
-
-/* This takes a EMeetingTimeSelectorTime and calculates the x pixel coordinate
-   within the entire canvas scroll region. It is used to draw the selected
-   meeting time and all the busy periods. */
-gint
-e_meeting_time_selector_calculate_time_position (EMeetingTimeSelector *mts,
-						 EMeetingTimeSelectorTime *mtstime)
-{
-	gint x, date_offset, day_offset;
-
-	/* Calculate the number of days since the first date shown in the
-	   entire canvas scroll region. */
-	date_offset = g_date_julian (&mtstime->date) - g_date_julian (&mts->first_date_shown);
-
-	/* Calculate the x pixel coordinate of the start of the day. */
-	x = date_offset * mts->day_width;
-
-	/* Add on the hours and minutes, depending on whether zoomed_out and
-	   working_hours_only are set. */
-	day_offset = (mtstime->hour - mts->first_hour_shown) * 60
-		+ mtstime->minute;
-	/* The day width includes an extra vertical grid line so subtract 1. */
-	day_offset *= (mts->day_width - 1);
-	day_offset /= (mts->last_hour_shown - mts->first_hour_shown) * 60;
-
-	/* Clamp the day_offset in case the time isn't actually visible. */
-	x += CLAMP (day_offset, 0, mts->day_width);
-
-	return x;
-}
-
-
-static gboolean
-e_meeting_time_selector_on_text_item_event (GnomeCanvasItem *item,
-					    GdkEvent *event,
-					    EMeetingTimeSelector *mts)
-{
-	EMeetingTimeSelectorAttendee *attendee;
-	gint row, min;
-	ETextEventProcessor *event_processor = NULL;
-	ETextEventProcessorCommand command;
-	GtkAdjustment *adj;
-	gchar *text;
-	gboolean empty = FALSE;
-
-	switch (event->type) {
-	case GDK_KEY_PRESS:
-		if (event && event->key.keyval == GDK_Return) {
-			row = e_meeting_time_selector_find_row_from_text_item (mts, item);
-			g_return_val_if_fail (row != -1, FALSE);
-
-			if (row == mts->attendees->len - 1)
-				row = e_meeting_time_selector_attendee_add (mts, "", NULL);
-			else
-				row++;
-
-			/* Make sure the item is visible. */
-			adj = GTK_LAYOUT (mts->display_main)->vadjustment;
-			min = ((row + 1) * mts->row_height) - adj->page_size;
-			if (adj->value < min) {
-				adj->value = min;
-				gtk_adjustment_value_changed (adj);
-			}
-
-			attendee = &g_array_index (mts->attendees, EMeetingTimeSelectorAttendee, row);
-			e_canvas_item_grab_focus (attendee->text_item, TRUE);
-
-			/* Try to move the cursor to the end of the text. */
-			gtk_object_get (GTK_OBJECT (attendee->text_item),
-					"event_processor", &event_processor,
-					NULL);
-			if (event_processor) {
-				command.action = E_TEP_MOVE;
-				command.position = E_TEP_END_OF_BUFFER;
-				gtk_signal_emit_by_name (GTK_OBJECT (event_processor),
-							 "command", &command);
-			}
-
-			/* Stop the signal last or we will also stop any
-			   other events getting to the EText item. */
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
-						      "event");
-			return TRUE;
-		}
-		break;
-	case GDK_FOCUS_CHANGE:
-		if (!event->focus_change.in) {
-			gtk_object_get (GTK_OBJECT (item),
-					"text", &text,
-					NULL);
-			if (!text || !text[0])
-				empty = TRUE;
-			g_free (text);
-
-			if (empty) {
-				row = e_meeting_time_selector_find_row_from_text_item (mts, item);
-				g_return_val_if_fail (row != -1, FALSE);
-				e_meeting_time_selector_attendee_remove (mts,
-									 row);
-			}
-		}
-		break;
-	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-
-static gint
-e_meeting_time_selector_find_row_from_text_item (EMeetingTimeSelector *mts,
-						 GnomeCanvasItem *item)
-{
-	EMeetingTimeSelectorAttendee *attendee;
-	gint row;
-
-	for (row = 0; row < mts->attendees->len; row++) {
-		attendee = &g_array_index (mts->attendees,
-					   EMeetingTimeSelectorAttendee, row);
-		if (attendee->text_item == item)
-			return row;
-	}
-
-	return -1;
-}
-
diff --git a/widgets/meeting-time-sel/e-meeting-time-sel.h b/widgets/meeting-time-sel/e-meeting-time-sel.h
deleted file mode 100644
index a92cea9d7d..0000000000
--- a/widgets/meeting-time-sel/e-meeting-time-sel.h
+++ /dev/null
@@ -1,521 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@gtk.org>
- *
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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
- */
-#ifndef _E_MEETING_TIME_SELECTOR_H_
-#define _E_MEETING_TIME_SELECTOR_H_
-
-#include <glib.h>
-#include <gtk/gtkaccelgroup.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkwidget.h>
-#include <libgnomeui/gnome-canvas.h>
-#include <gal/e-text/e-text.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * EMeetingTimeSelector displays a list of attendees for a meeting and a
- * graphical summary of the times which they are free and busy, allowing the
- * user to select an appropriate time for a meeting.
- */
-
-/* Define this to include the debugging functions. */
-#undef E_MEETING_TIME_SELECTOR_DEBUG
-
-/* This is the width of the icon column in the attendees list. */
-#define E_MEETING_TIME_SELECTOR_ICON_COLUMN_WIDTH	24
-
-#define E_MEETING_TIME_SELECTOR_TEXT_Y_PAD		3
-#define E_MEETING_TIME_SELECTOR_TEXT_X_PAD		2
-
-/* These specify the type of attendee. Either a person or a resource (e.g. a
-   meeting room). These are used for the Autopick options, where the user can
-   ask for a time when, for example, all people and one resource are free.
-   The default is E_MEETING_TIME_SELECTOR_REQUIRED_PERSON. */
-typedef enum
-{
-	E_MEETING_TIME_SELECTOR_REQUIRED_PERSON,
-	E_MEETING_TIME_SELECTOR_OPTIONAL_PERSON,
-	E_MEETING_TIME_SELECTOR_RESOURCE
-} EMeetingTimeSelectorAttendeeType;
-
-
-/* These are used to specify whether an attendee is free or busy at a
-   particular time. We'll probably replace this with a global calendar type.
-   These should be ordered in increasing order of preference. Higher precedence
-   busy periods will be painted over lower precedence ones. These are also
-   used as for loop counters, so they should start at 0 and be ordered. */
-typedef enum
-{
-	E_MEETING_TIME_SELECTOR_BUSY_TENTATIVE		= 0,
-	E_MEETING_TIME_SELECTOR_BUSY_OUT_OF_OFFICE	= 1,
-	E_MEETING_TIME_SELECTOR_BUSY_BUSY		= 2,
-
-	E_MEETING_TIME_SELECTOR_BUSY_LAST		= 3
-} EMeetingTimeSelectorBusyType;
-
-
-/* This is used to specify the format used when displaying the dates.
-   The full format is like 'Sunday, September 12, 1999'. The abbreviated format
-   is like 'Sun 12/9/99'. The short format is like '12/9/99'. The actual
-   format used is determined in e_meeting_time_selector_style_set(), once we
-   know the font being used. */
-typedef enum
-{
-	E_MEETING_TIME_SELECTOR_DATE_FULL,
-	E_MEETING_TIME_SELECTOR_DATE_ABBREVIATED_DAY,
-	E_MEETING_TIME_SELECTOR_DATE_SHORT
-} EMeetingTimeSelectorDateFormat;
-
-
-/* This is used to specify a position regarding the vertical bars around the
-   current meeting time, so we know which one is being dragged. */
-typedef enum
-{
-	E_MEETING_TIME_SELECTOR_POS_NONE,
-	E_MEETING_TIME_SELECTOR_POS_START,
-	E_MEETING_TIME_SELECTOR_POS_END
-} EMeetingTimeSelectorPosition;
-
-
-/* This is used to specify the autopick option, which determines how we choose
-   the previous/next appropriate meeting time. */
-typedef enum
-{
-	E_MEETING_TIME_SELECTOR_ALL_PEOPLE_AND_RESOURCES,
-	E_MEETING_TIME_SELECTOR_ALL_PEOPLE_AND_ONE_RESOURCE,
-	E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE,
-	E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE_AND_ONE_RESOURCE
-} EMeetingTimeSelectorAutopickOption;
-
-
-/* This is our representation of a time. We use a GDate to store the day,
-   and guint8s for the hours and minutes. */
-typedef struct _EMeetingTimeSelectorTime       EMeetingTimeSelectorTime;
-struct _EMeetingTimeSelectorTime
-{
-	GDate	date;
-	guint8	hour;
-	guint8	minute;
-};
-
-
-/* This represents a busy period. */
-typedef struct _EMeetingTimeSelectorPeriod     EMeetingTimeSelectorPeriod;
-struct _EMeetingTimeSelectorPeriod
-{
-	EMeetingTimeSelectorTime start;
-	EMeetingTimeSelectorTime end;
-	EMeetingTimeSelectorBusyType busy_type;
-};
-
-
-/* This contains information on one attendee. */
-typedef struct _EMeetingTimeSelectorAttendee   EMeetingTimeSelectorAttendee;
-struct _EMeetingTimeSelectorAttendee
-{
-	gchar *name;
-
-	/* The type of attendee, e.g. a person or a resource. */
-	EMeetingTimeSelectorAttendeeType type;
-
-	/* This is TRUE if the attendee has calendar information available.
-	   It is set to TRUE when a busy period is added, but can also be set
-	   to TRUE explicitly to indicate that the attendee has calendar
-	   information available, but no current busy periods. If it is FALSE
-	   then a diagonal stipple pattern is used to fill the entire row in
-	   the main graphical display. */
-	gboolean has_calendar_info;
-
-	/* This is TRUE if the meeting request is sent to this attendee. */
-	gboolean send_meeting_to;
-
-	/* This is the period for which free/busy data for the attendee is
-	   available. */
-	EMeetingTimeSelectorTime busy_periods_start;
-	EMeetingTimeSelectorTime busy_periods_end;
-
-	/* This is an array of EMeetingTimeSelectorPeriod elements. When it is
-	   updated busy_periods_sorted is set to FALSE, and if a function
-	   needs them sorted, it should call this to re-sort them if needed:
-	   e_meeting_time_selector_attendee_ensure_periods_sorted(). Note that
-	   they are sorted by the start times. */
-	GArray	*busy_periods;
-	gboolean busy_periods_sorted;
-
-	/* This holds the length of the longest busy period in days, rounded
-	   up. It is used to determine where to start looking in the
-	   busy_periods array. If we didn't use this we'd have to go through
-	   most of the busy_periods array every time we wanted to paint part
-	   of the display. */
-	gint longest_period_in_days;
-
-	/* This is the canvas text item where the name is edited. */
-	GnomeCanvasItem *text_item;
-
-	/* This is supposed to be something like an address book id. */
-	gpointer data;
-};
-
-/* An array of hour strings, "0:00" .. "23:00". */
-extern const gchar *EMeetingTimeSelectorHours[24];
-
-
-#define E_MEETING_TIME_SELECTOR(obj)          GTK_CHECK_CAST (obj, e_meeting_time_selector_get_type (), EMeetingTimeSelector)
-#define E_MEETING_TIME_SELECTOR_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, e_meeting_time_selector_get_type (), EMeetingTimeSelectorClass)
-#define IS_E_MEETING_TIME_SELECTOR(obj)       GTK_CHECK_TYPE (obj, e_meeting_time_selector_get_type ())
-
-
-typedef struct _EMeetingTimeSelector       EMeetingTimeSelector;
-typedef struct _EMeetingTimeSelectorClass  EMeetingTimeSelectorClass;
-
-struct _EMeetingTimeSelector
-{
-	/* We subclass a GtkTable which makes it easy to add extra widgets
-	   if neccesary. */
-	GtkTable table;
-
-	/*
-	 * User Interface stuff - widgets, colors etc.
-	 */
-
-	/* This contains our keyboard accelerators, which need to be added to
-	   the toplevel window. */
-	GtkAccelGroup *accel_group;
-
-	/* The vbox in the top-left corner, containing the 'All Attendees'
-	   title bar packed at the end. Extra widgets can be added here
-	   with PACK_START if necessary. */
-	GtkWidget *attendees_title_bar_vbox;
-
-	/* The 'All Attendees' title bar above the list of attendees. */
-	GtkWidget *attendees_title_bar;
-
-	/* The list of attendees. */
-	GtkWidget *attendees_list;
-
-	/* The canvas displaying the dates, times, and the summary
-	   'All Attendees' free/busy display. */
-	GtkWidget *display_top;
-
-	/* The canvas containing the free/busy displays of individual
-	   attendees. This is separate from display_top since it also scrolls
-	   vertically. */
-	GtkWidget *display_main;
-
-	/* This is the 'Options' button & menu. */
-	GtkWidget *options_button;
-	GtkWidget *options_menu;
-
-	/* This is the 'Autopick' button, menu & radio menu items. */
-	GtkWidget *autopick_button;
-	GtkWidget *autopick_menu;
-	GtkWidget *autopick_all_item;
-	GtkWidget *autopick_all_people_one_resource_item;
-	GtkWidget *autopick_required_people_item;
-	GtkWidget *autopick_required_people_one_resource_item;
-
-	/* The horizontal scrollbar which scrolls display_top & display_main.*/
-	GtkWidget *hscrollbar;
-
-	/* The vertical scrollbar which scrolls attendees & display_main. */
-	GtkWidget *vscrollbar;
-
-	/* The 2 GnomeDateEdit widgets for the meeting start & end times. */
-	GtkWidget *start_date_edit;
-	GtkWidget *end_date_edit;
-
-	/* Colors. */
-	GdkColorContext *color_context;
-	GdkColor bg_color;
-	GdkColor all_attendees_bg_color;
-	GdkColor meeting_time_bg_color;
-	GdkColor stipple_bg_color;
-	GdkColor attendee_list_bg_color;
-	GdkColor grid_color;
-	GdkColor grid_shadow_color;
-	GdkColor grid_unused_color;
-	GdkColor busy_colors[E_MEETING_TIME_SELECTOR_BUSY_LAST];
-
-	/* The stipple used for attendees with no data. */
-	GdkPixmap *stipple;
-
-	/* GC for drawing the color key. */
-	GdkGC *color_key_gc;
-
-	/* Width of the hours strings (e.g. "1:00") in the current font. */
-	gint hour_widths[24];
-
-	/* Whether we are using the full, abbreviated or short date format. */
-	EMeetingTimeSelectorDateFormat date_format;
-
-
-	/*
-	 * Attendee Data.
-	 */
-
-	/* This is an array of EMeetingTimeSelectorAttendee elements. */
-	GArray *attendees;
-
-
-	/*
-	 * Option Settings.
-	 */
-
-	/* If this is TRUE we only show hours between day_start_hour and
-	   day_end_hour, defaults to TRUE (9am-6pm). */
-	gboolean working_hours_only;
-	gint day_start_hour;
-	gint day_start_minute;
-	gint day_end_hour;
-	gint day_end_minute;
-
-	/* If TRUE, view is compressed, with one cell for every 3 hours rather
-	   than every hour. Defaults to FALSE. */
-	gboolean zoomed_out;
-
-
-	/*
-	 * Internal Data.
-	 */
-
-	/* These are the first & last dates shown in the current scroll area.
-	   We show E_MEETING_TIME_SELECTOR_DAYS_SHOWN days at a time. */
-	GDate first_date_shown;
-	GDate last_date_shown;
-
-	/* This is the current selection of the meeting time. */
-	EMeetingTimeSelectorTime meeting_start_time;
-	EMeetingTimeSelectorTime meeting_end_time;
-
-	/* These are the x pixel coordinates in the entire scroll region of
-	   the start and end times. Set to meeting_positions_valid to FALSE to
-	   invalidate. They will then be recomputed when needed. Always access
-	   with e_meeting_time_selector_get_meeting_time_positions(). */
-	gint meeting_positions_valid;
-	gint meeting_positions_in_scroll_area;
-	gint meeting_start_x;
-	gint meeting_end_x;
-
-	/* These are the width and height of the cells, including the grid
-	   lines which are displayed on the right and top or bottom of cells.*/
-	gint row_height;
-	gint col_width;
-
-	/* This is the width of a day in the display, which depends on
-	   col_width, working_hours_only and zoomed_out. */
-	gint day_width;
-
-	/* These are the first and last hour of each day we display, depending
-	   on working_hours_only and zoomed_out. */
-	gint first_hour_shown;
-	gint last_hour_shown;
-
-	/* The id of the source function for auto-scroll timeouts. */
-	guint auto_scroll_timeout_id;
-
-	/* This specifies if we are dragging one of the vertical bars around
-	   the meeting time. */
-	EMeetingTimeSelectorPosition dragging_position;
-
-	/* The last x coordinate of the mouse, relative to either the left or
-	   right edge of the canvas. Used in the auto_scroll_timeout function
-	   to determine which way to scroll and how fast. */
-	gint last_drag_x;
-
-	/* This is used to determine the delay between scrolls. */
-	gint scroll_count;
-};
-
-
-struct _EMeetingTimeSelectorClass
-{
-	GtkTableClass parent_class;
-};
-
-
-/*
- * PUBLIC INTERFACE - note that this interface will probably change, when I
- * know where the data is coming from. This is mainly just for testing for now.
- */
-
-GtkType e_meeting_time_selector_get_type (void);
-GtkWidget* e_meeting_time_selector_new (void);
-
-/* This returns the currently selected meeting time.
-   Note that months are 1-12 and days are 1-31. The start time is guaranteed to
-   be before or equal to the end time. You may want to check if they are equal
-   if that if it is a problem. */
-void e_meeting_time_selector_get_meeting_time (EMeetingTimeSelector *mts,
-					       gint *start_year,
-					       gint *start_month,
-					       gint *start_day,
-					       gint *start_hour,
-					       gint *start_minute,
-					       gint *end_year,
-					       gint *end_month,
-					       gint *end_day,
-					       gint *end_hour,
-					       gint *end_minute);
-
-/* This sets the meeting time, returning TRUE if it is valid. */
-gboolean e_meeting_time_selector_set_meeting_time (EMeetingTimeSelector *mts,
-						   gint start_year,
-						   gint start_month,
-						   gint start_day,
-						   gint start_hour,
-						   gint start_minute,
-						   gint end_year,
-						   gint end_month,
-						   gint end_day,
-						   gint end_hour,
-						   gint end_minute);
-
-void e_meeting_time_selector_set_working_hours_only (EMeetingTimeSelector *mts,
-						     gboolean working_hours_only);
-void e_meeting_time_selector_set_working_hours (EMeetingTimeSelector *mts,
-						gint day_start_hour,
-						gint day_start_minute,
-						gint day_end_hour,
-						gint day_end_minute);
-
-void e_meeting_time_selector_set_zoomed_out (EMeetingTimeSelector *mts,
-					     gboolean zoomed_out);
-
-EMeetingTimeSelectorAutopickOption e_meeting_time_selector_get_autopick_option (EMeetingTimeSelector *mts);
-void e_meeting_time_selector_set_autopick_option (EMeetingTimeSelector *mts,
-						  EMeetingTimeSelectorAutopickOption autopick_option);
-
-/* Adds an attendee to the list, returning the row. The data is meant for
-   something like an address book id, though if the user edits the name this
-   will become invalid. We'll probably have to handle address book lookup
-   ourself. */
-gint e_meeting_time_selector_attendee_add (EMeetingTimeSelector *mts,
-					   gchar *attendee_name,
-					   gpointer data);
-gint e_meeting_time_selector_attendee_find_by_name (EMeetingTimeSelector *mts,
-						    gchar *attendee_name,
-						    gint start_row);
-gint e_meeting_time_selector_attendee_find_by_data (EMeetingTimeSelector *mts,
-						    gpointer data,
-						    gint start_row);
-void e_meeting_time_selector_attendee_remove (EMeetingTimeSelector *mts,
-					      gint row);
-
-void e_meeting_time_selector_attendee_set_type (EMeetingTimeSelector *mts,
-						gint row,
-						EMeetingTimeSelectorAttendeeType type);
-void e_meeting_time_selector_attendee_set_has_calendar_info (EMeetingTimeSelector *mts,
-							     gint row,
-							     gboolean has_calendar_info);
-void e_meeting_time_selector_attendee_set_send_meeting_to (EMeetingTimeSelector *mts,
-							   gint row,
-							   gboolean send_meeting_to);
-
-gboolean e_meeting_time_selector_attendee_set_busy_range	(EMeetingTimeSelector *mts,
-								 gint row,
-								 gint start_year,
-								 gint start_month,
-								 gint start_day,
-								 gint start_hour,
-								 gint start_minute,
-								 gint end_year,
-								 gint end_month,
-								 gint end_day,
-								 gint end_hour,
-								 gint end_minute);
-
-
-/* Clears all busy times for the given attendee. */
-void e_meeting_time_selector_attendee_clear_busy_periods (EMeetingTimeSelector *mts,
-							  gint row);
-/* Adds one busy time for the given attendee. */
-gboolean e_meeting_time_selector_attendee_add_busy_period (EMeetingTimeSelector *mts,
-							   gint row,
-							   gint start_year,
-							   gint start_month,
-							   gint start_day,
-							   gint start_hour,
-							   gint start_minute,
-							   gint end_year,
-							   gint end_month,
-							   gint end_day,
-							   gint end_hour,
-							   gint end_minute,
-							   EMeetingTimeSelectorBusyType busy_type);
-
-
-
-/*
- * INTERNAL ROUTINES - functions to communicate with the canvas items within
- *		       the EMeetingTimeSelector.
- */
-
-/* This returns the x pixel coordinates of the meeting start and end times,
-   in the entire canvas scroll area. If it returns FALSE, then the meeting
-   time isn't in the current scroll area (which shouldn't really happen). */
-gboolean e_meeting_time_selector_get_meeting_time_positions (EMeetingTimeSelector *mts,
-							     gint *start_x,
-							     gint *end_x);
-
-void e_meeting_time_selector_drag_meeting_time (EMeetingTimeSelector *mts,
-						gint x);
-
-void e_meeting_time_selector_remove_timeout (EMeetingTimeSelector *mts);
-
-void e_meeting_time_selector_fix_time_overflows (EMeetingTimeSelectorTime *mtstime);
-
-gint e_meeting_time_selector_find_first_busy_period (EMeetingTimeSelector *mts,
-						     EMeetingTimeSelectorAttendee *attendee,
-						     GDate *date);
-
-/* Makes sure the busy periods are sorted, so we can do binary searches. */
-void e_meeting_time_selector_attendee_ensure_periods_sorted (EMeetingTimeSelector *mts,
-							     EMeetingTimeSelectorAttendee *attendee);
-
-void e_meeting_time_selector_calculate_day_and_position (EMeetingTimeSelector *mts,
-							 gint x,
-							 GDate *date,
-							 gint *day_position);
-void e_meeting_time_selector_convert_day_position_to_hours_and_mins (EMeetingTimeSelector *mts, gint day_position, guint8 *hours, guint8 *minutes);
-void e_meeting_time_selector_calculate_time (EMeetingTimeSelector *mts,
-					     gint x,
-					     EMeetingTimeSelectorTime *time);
-gint e_meeting_time_selector_calculate_time_position (EMeetingTimeSelector *mts,
-						      EMeetingTimeSelectorTime *mtstime);
-
-/* Debugging function to dump information on all attendees. */
-#ifdef E_MEETING_TIME_SELECTOR_DEBUG
-void e_meeting_time_selector_dump (EMeetingTimeSelector *mts);
-gchar* e_meeting_time_selector_dump_time (EMeetingTimeSelectorTime *mtstime);
-gchar* e_meeting_time_selector_dump_date (GDate *date);
-#endif /* E_MEETING_TIME_SELECTOR_DEBUG */
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_MEETING_TIME_SELECTOR_H_ */
diff --git a/widgets/meeting-time-sel/test-meeting-time-sel.c b/widgets/meeting-time-sel/test-meeting-time-sel.c
deleted file mode 100644
index 98d22ce7b8..0000000000
--- a/widgets/meeting-time-sel/test-meeting-time-sel.c
+++ /dev/null
@@ -1,252 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@gtk.org>
- *
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <time.h>
-#include <glib.h>
-#include <gtk/gtkmain.h>
-#include <gdk_imlib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-init.h>
-#include <libgnomeui/gnome-stock.h>
-#include "e-meeting-time-sel.h"
-
-void add_random_attendee_test_data (EMeetingTimeSelector *mts);
-void add_simple_attendee_test_data (EMeetingTimeSelector *mts);
-gint get_random_int (gint max);
-
-int
-main (int argc, char *argv[])
-{
-	GtkWidget *window, *mts;
-	gint i;
-
-	gnome_init ("test-meeting-time-selector", "0.1", argc, argv);
-
-	gtk_widget_push_visual (gdk_imlib_get_visual ());
-	gtk_widget_push_colormap (gdk_imlib_get_colormap ());
-
-	window = gnome_dialog_new ("Plan a Meeting", "Make Meeting",
-				   GNOME_STOCK_BUTTON_CLOSE, NULL);
-	gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
-	gtk_window_set_policy (GTK_WINDOW (window), FALSE, TRUE, FALSE);
-
-	mts = e_meeting_time_selector_new ();
-	gtk_container_add (GTK_CONTAINER (GNOME_DIALOG (window)->vbox), mts);
-	gtk_window_add_accel_group (GTK_WINDOW (window),
-				    E_MEETING_TIME_SELECTOR (mts)->accel_group);
-	gtk_widget_show (mts);
-
-	gtk_widget_pop_visual ();
-	gtk_widget_pop_colormap ();
-
-	i = 0;
-#if 1
-	for (i = 0; i < 20; i++) {
-		add_random_attendee_test_data (E_MEETING_TIME_SELECTOR (mts));
-	}
-
-	if (!e_meeting_time_selector_attendee_set_busy_range (E_MEETING_TIME_SELECTOR (mts), 3,
-							      2000, 5, 1, 14, 0,
-							      2000, 11, 1, 11, 30))
-		g_print ("Error setting busy range\n");
-
-#else
-	for (i = 0; i < 1; i++) {
-		add_simple_attendee_test_data (E_MEETING_TIME_SELECTOR (mts));
-	}
-#endif
-
-#if 0
-	e_meeting_time_selector_dump (E_MEETING_TIME_SELECTOR (mts));
-#endif
-
-	gnome_dialog_run (GNOME_DIALOG (window));
-
-	gtk_main ();
-	return 0;
-}
-
-
-/* Adds an attendee and a lot of random busy periods. The periods start 60
-   days before the current date and extend over 365 days, to match the range
-   that EMeetingTimeSelector currently displays. We generate a time_t and an
-   interval and then convert them into a struct tm which provides everything
-   we need. */
-void
-add_random_attendee_test_data (EMeetingTimeSelector *mts)
-{
-	gchar buffer[128], *name;
-	gint row, num_periods, busy_period, random_num, duration;
-	EMeetingTimeSelectorAttendeeType type;
-	EMeetingTimeSelectorBusyType busy_type;
-	time_t range_start;
-	time_t period_start;
-	time_t period_end;
-	struct tm *tmp_tm;
-	struct tm tm1;
-	struct tm tm2;
-
-	/* Determine the type of attendee. */
-	random_num = get_random_int (10);
-	if (random_num < 4) {
-		type = E_MEETING_TIME_SELECTOR_REQUIRED_PERSON;
-		name = "Req. Attendee";
-	} else if (random_num < 7) {
-		type = E_MEETING_TIME_SELECTOR_OPTIONAL_PERSON;
-		name = "Opt. Attendee";
-	} else {
-		type = E_MEETING_TIME_SELECTOR_RESOURCE;
-		name = "Resource";
-	}
-
-	sprintf (buffer, "%s %i", name, mts->attendees->len + 1);
-	row = e_meeting_time_selector_attendee_add (mts, buffer, NULL);
-	e_meeting_time_selector_attendee_set_type (mts, row, type);
-
-	/* Don't send the meeting request to some attendees. */
-	if (get_random_int (10) <= 2)
-		e_meeting_time_selector_attendee_set_send_meeting_to (mts, row,
-								      FALSE);
-
-	/* Some attendees have no calendar information. */
-	if (get_random_int (10) == 2)
-		return;
-
-	range_start = time (NULL) - 61 * 24 * 60 * 60;
-	num_periods = get_random_int (1000);
-#if 0
-	g_print ("num_periods: %i\n", num_periods);
-#endif
-	for (busy_period = 0; busy_period < num_periods; busy_period++) {
-
-		period_start = range_start + get_random_int (365 * 24 * 60 * 60);
-
-		/* Make busy periods mainly 30 mins to a few hours, with a
-		   couple of week/fortnight periods as well. */
-		random_num = get_random_int (10000);
-		if (random_num < 2000)
-			duration = 30;
-		else if (random_num < 5000)
-			duration = 60;
-		else if (random_num < 7500)
-			duration = 90;
-		else if (random_num < 9995)
-			duration = 120;
-		else if (random_num < 9998)
-			duration = 60 * 24 * 7;
-		else
-			duration = 60 * 24 * 14;
-#if 0
-		g_print ("random_num: %i, duration: %i\n",
-			 random_num, duration);
-#endif
-		period_end = period_start + duration * 60;
-
-		tmp_tm = localtime (&period_start);
-		tm1 = *tmp_tm;
-		tmp_tm = localtime (&period_end);
-		tm2 = *tmp_tm;
-
-		/* A hack to avoid daylight-saving time problems. */
-		if (tm2.tm_hour == tm1.tm_hour && tm2.tm_min < tm1.tm_min)
-			tm2.tm_hour++;
-
-		busy_type = get_random_int (E_MEETING_TIME_SELECTOR_BUSY_LAST);
-
-		if (!e_meeting_time_selector_attendee_add_busy_period (mts, row, tm1.tm_year + 1900, tm1.tm_mon + 1, tm1.tm_mday, tm1.tm_hour, tm1.tm_min, tm2.tm_year + 1900, tm2.tm_mon + 1, tm2.tm_mday, tm2.tm_hour, tm2.tm_min, busy_type))
-			{
-				g_print ("Invalid busy period %i/%i/%i %i:%i to %i/%i/%i %i:%i\n", tm1.tm_year + 1900, tm1.tm_mon + 1, tm1.tm_mday, tm1.tm_hour, tm1.tm_min, tm2.tm_year + 1900, tm2.tm_mon + 1, tm2.tm_mday, tm2.tm_hour, tm2.tm_min);
-				g_print ("random_num: %i, duration: %i\n",
-					 random_num, duration);
-			}
-	}
-}
-
-
-/* Returns a random integer between 0 and max - 1. */
-gint
-get_random_int (gint max)
-{
-	gint random_num;
-
-	random_num = (int) (max * (rand () / (RAND_MAX + 1.0)));
-#if 0
-	g_print ("Random num (%i): %i\n", max, random_num);
-#endif
-	return random_num;
-}
-
-
-void
-add_simple_attendee_test_data (EMeetingTimeSelector *mts)
-{
-	gint row;
-
-	row = e_meeting_time_selector_attendee_add (mts, "John Smith", NULL);
-	if (!e_meeting_time_selector_attendee_add_busy_period (mts, row,
-							       1999, 11, 7, 14, 30,
-							       1999, 11, 7, 16, 30,
-							       E_MEETING_TIME_SELECTOR_BUSY_BUSY))
-			g_warning ("Invalid busy period");
-
-	e_meeting_time_selector_attendee_add_busy_period (mts, row,
-							  1999, 11, 7, 10, 30,
-							  1999, 11, 7, 11, 30,
-							  E_MEETING_TIME_SELECTOR_BUSY_OUT_OF_OFFICE);
-	e_meeting_time_selector_attendee_add_busy_period (mts, row,
-							  1999, 11, 4, 10, 30,
-							  1999, 11, 7, 11, 30,
-							  E_MEETING_TIME_SELECTOR_BUSY_BUSY);
-	row = e_meeting_time_selector_attendee_add (mts, "Dave Jones", NULL);
-	e_meeting_time_selector_attendee_add_busy_period (mts, row,
-							  1999, 11, 7, 15, 30,
-							  1999, 11, 7, 18, 30,
-							  E_MEETING_TIME_SELECTOR_BUSY_TENTATIVE);
-	e_meeting_time_selector_attendee_add_busy_period (mts, row,
-							  1999, 11, 7, 11, 00,
-							  1999, 11, 7, 12, 00,
-							  E_MEETING_TIME_SELECTOR_BUSY_BUSY);
-
-	row = e_meeting_time_selector_attendee_add (mts, "Andrew Carlisle", NULL);
-	e_meeting_time_selector_attendee_set_send_meeting_to (mts, row, FALSE);
-
-	row = e_meeting_time_selector_attendee_add (mts, "Michael Cain", NULL);
-	e_meeting_time_selector_attendee_add_busy_period (mts, row,
-							  1999, 11, 7, 15, 30,
-							  1999, 11, 7, 18, 30,
-							  E_MEETING_TIME_SELECTOR_BUSY_TENTATIVE);
-	e_meeting_time_selector_attendee_add_busy_period (mts, row,
-							  1999, 11, 7, 12, 30,
-							  1999, 11, 7, 13, 30,
-							  E_MEETING_TIME_SELECTOR_BUSY_OUT_OF_OFFICE);
-	e_meeting_time_selector_attendee_add_busy_period (mts, row,
-							  1999, 11, 7, 11, 00,
-							  1999, 11, 7, 12, 00,
-							  E_MEETING_TIME_SELECTOR_BUSY_TENTATIVE);
-}
diff --git a/widgets/menus/.cvsignore b/widgets/menus/.cvsignore
deleted file mode 100644
index 7708c3d120..0000000000
--- a/widgets/menus/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-Makefile
-libmenus.la
-Makefile.in
-.deps
-.libs
-.pure
-*.o
-*.lo
diff --git a/widgets/menus/Makefile.am b/widgets/menus/Makefile.am
deleted file mode 100644
index 500f0672fc..0000000000
--- a/widgets/menus/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-noinst_LTLIBRARIES = libmenus.la
-
-INCLUDES =					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/widgets/menus		\
-	$(EXTRA_GNOME_CFLAGS)			\
-	-DG_LOG_DOMAIN=\"menus\"
-
-libmenus_la_SOURCES = 		\
-	gal-view-menus.c	\
-	gal-view-menus.h
diff --git a/widgets/menus/gal-define-views-dialog.c b/widgets/menus/gal-define-views-dialog.c
deleted file mode 100644
index 8ca28adfac..0000000000
--- a/widgets/menus/gal-define-views-dialog.c
+++ /dev/null
@@ -1,329 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* gal-define-views-dialog.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-stock.h>
-#include "gal-define-views-dialog.h"
-#include "gal-define-views-model.h"
-#include "gal-view-new-dialog.h"
-#include <gal/e-table/e-table-scrolled.h>
-
-static void gal_define_views_dialog_init		(GalDefineViewsDialog		 *card);
-static void gal_define_views_dialog_class_init	(GalDefineViewsDialogClass	 *klass);
-static void gal_define_views_dialog_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void gal_define_views_dialog_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void gal_define_views_dialog_destroy (GtkObject *object);
-
-static GnomeDialogClass *parent_class = NULL;
-#define PARENT_TYPE gnome_dialog_get_type()
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_COLLECTION,
-};
-
-typedef struct {
-	char         *title;
-	ETableModel  *model;
-	GalDefineViewsDialog *names;
-} GalDefineViewsDialogChild;
-
-GtkType
-gal_define_views_dialog_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type) {
-		static const GtkTypeInfo info =
-		{
-			"GalDefineViewsDialog",
-			sizeof (GalDefineViewsDialog),
-			sizeof (GalDefineViewsDialogClass),
-			(GtkClassInitFunc) gal_define_views_dialog_class_init,
-			(GtkObjectInitFunc) gal_define_views_dialog_init,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-static void
-gal_define_views_dialog_class_init (GalDefineViewsDialogClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass*) klass;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->set_arg = gal_define_views_dialog_set_arg;
-	object_class->get_arg = gal_define_views_dialog_get_arg;
-	object_class->destroy = gal_define_views_dialog_destroy;
-
-	gtk_object_add_arg_type("GalDefineViewsDialog::collection", GAL_VIEW_COLLECTION_TYPE,
-				GTK_ARG_READWRITE, ARG_COLLECTION);
-}
-
-/* ETable creation */
-#define SPEC "<ETableSpecification cursor-mode=\"line\" draw-grid=\"true\" selection-mode=\"single\">" \
-	     "<ETableColumn model_col= \"0\" _title=\"Name\" expansion=\"1.0\" minimum_width=\"18\" resizable=\"true\" cell=\"string\" compare=\"string\"/>" \
-             "<ETableState> <column source=\"0\"/> <grouping> </grouping> </ETableState>" \
-	     "</ETableSpecification>"
-
-/* For use from libglade. */
-GtkWidget *gal_define_views_dialog_create_etable(char *name, char *string1, char *string2, int int1, int int2);
-
-GtkWidget *
-gal_define_views_dialog_create_etable(char *name, char *string1, char *string2, int int1, int int2)
-{
-	GtkWidget *table;
-	ETableModel *model;
-	model = gal_define_views_model_new();
-	table = e_table_scrolled_new(model, NULL, SPEC, NULL);
-	gtk_object_set_data(GTK_OBJECT(table), "GalDefineViewsDialog::model", model);
-	return table;
-}
-
-/* Button callbacks */
-
-static void
-gdvd_button_new_dialog_callback(GtkWidget *widget, int button, GalDefineViewsDialog *dialog)
-{
-	gchar *name;
-	GalView *view;
-	GalViewFactory *factory;
-	switch (button) {
-	case 0:
-		gtk_object_get(GTK_OBJECT(widget),
-			       "name", &name,
-			       "factory", &factory,
-			       NULL);
-		if (name && factory) {
-			view = gal_view_factory_new_view(factory,
-							 name);
-			gal_define_views_model_append(GAL_DEFINE_VIEWS_MODEL(dialog->model), view);
-			gtk_object_unref(GTK_OBJECT(view));
-		}
-		break;
-	}
-	gnome_dialog_close(GNOME_DIALOG(widget));
-}
-
-static void
-gdvd_button_new_callback(GtkWidget *widget, GalDefineViewsDialog *dialog)
-{
-	GtkWidget *view_new_dialog = gal_view_new_dialog_new(dialog->collection);
-	gtk_signal_connect(GTK_OBJECT(view_new_dialog), "clicked",
-			   GTK_SIGNAL_FUNC(gdvd_button_new_dialog_callback), dialog);
-	gtk_widget_show(GTK_WIDGET(view_new_dialog));
-}
-
-static void
-gdvd_button_modify_callback(GtkWidget *widget, GalDefineViewsDialog *dialog)
-{
-	int row;
-	GtkWidget *scrolled;
-	ETable *etable;
-
-	scrolled = glade_xml_get_widget(dialog->gui, "custom-table");
-	etable = e_table_scrolled_get_table(E_TABLE_SCROLLED(scrolled));
-	row = e_table_get_cursor_row (E_TABLE(etable));
-
-	if (row != -1) {
-		GalView *view;
-		view = gal_define_views_model_get_view(GAL_DEFINE_VIEWS_MODEL(dialog->model),
-						       row);
-		gal_view_edit(view);
-	}
-
-}
-
-static void
-gdvd_button_delete_callback(GtkWidget *widget, GalDefineViewsDialog *dialog)
-{
-	int row;
-	GtkWidget *scrolled;
-	ETable *etable;
-
-	scrolled = glade_xml_get_widget(dialog->gui, "custom-table");
-	etable = e_table_scrolled_get_table(E_TABLE_SCROLLED(scrolled));
-	row = e_table_get_cursor_row (E_TABLE(etable));
-
-	if (row != -1) {
-		gal_define_views_model_delete_view(GAL_DEFINE_VIEWS_MODEL(dialog->model),
-						   row);
-	}
-
-}
-
-static void
-gdvd_button_copy_callback(GtkWidget *widget, GalDefineViewsDialog *dialog)
-{
-	int row;
-	GtkWidget *scrolled;
-	ETable *etable;
-
-	scrolled = glade_xml_get_widget(dialog->gui, "custom-table");
-	etable = e_table_scrolled_get_table(E_TABLE_SCROLLED(scrolled));
-	row = e_table_get_cursor_row (E_TABLE(etable));
-
-	if (row != -1) {
-		gal_define_views_model_copy_view(GAL_DEFINE_VIEWS_MODEL(dialog->model),
-						 row);
-	}
-
-}
-
-static void
-gdvd_connect_signal(GalDefineViewsDialog *dialog, char *widget_name, char *signal, GtkSignalFunc handler)
-{
-	GtkWidget *widget;
-
-	widget = glade_xml_get_widget(dialog->gui, widget_name);
-
-	if (widget)
-		gtk_signal_connect(GTK_OBJECT(widget), signal, handler, dialog);
-}
-
-static void
-gal_define_views_dialog_init (GalDefineViewsDialog *dialog)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-	GtkWidget *etable;
-
-	dialog->collection = NULL;
-
-	gui = glade_xml_new_with_domain (GAL_GLADEDIR "/gal-define-views.glade", NULL, PACKAGE);
-	dialog->gui = gui;
-
-	widget = glade_xml_get_widget(gui, "table-top");
-	if (!widget) {
-		return;
-	}
-	gtk_widget_ref(widget);
-	gtk_widget_unparent(widget);
-	gtk_box_pack_start(GTK_BOX(GNOME_DIALOG(dialog)->vbox), widget, TRUE, TRUE, 0);
-	gtk_widget_unref(widget);
-
-	gnome_dialog_append_buttons(GNOME_DIALOG(dialog),
-				    GNOME_STOCK_BUTTON_OK,
-				    GNOME_STOCK_BUTTON_CANCEL,
-				    NULL);
-
-	gdvd_connect_signal(dialog, "button-new",    "clicked", GTK_SIGNAL_FUNC(gdvd_button_new_callback));
-	gdvd_connect_signal(dialog, "button-modify", "clicked", GTK_SIGNAL_FUNC(gdvd_button_modify_callback));
-	gdvd_connect_signal(dialog, "button-delete", "clicked", GTK_SIGNAL_FUNC(gdvd_button_delete_callback));
-	gdvd_connect_signal(dialog, "button-copy",   "clicked", GTK_SIGNAL_FUNC(gdvd_button_copy_callback));
-
-	dialog->model = NULL;
-	etable = glade_xml_get_widget(dialog->gui, "custom-table");
-	if (etable) {
-		dialog->model = gtk_object_get_data(GTK_OBJECT(etable), "GalDefineViewsDialog::model");
-		gtk_object_set(GTK_OBJECT(dialog->model),
-			       "collection", dialog->collection,
-			       NULL);
-	}
-	
-	gtk_window_set_policy(GTK_WINDOW(dialog), FALSE, TRUE, FALSE);
-}
-
-static void
-gal_define_views_dialog_destroy (GtkObject *object) {
-	GalDefineViewsDialog *gal_define_views_dialog = GAL_DEFINE_VIEWS_DIALOG(object);
-
-	gtk_object_unref(GTK_OBJECT(gal_define_views_dialog->gui));
-}
-
-static void
-gal_define_views_dialog_set_collection(GalDefineViewsDialog *dialog,
-				       GalViewCollection *collection)
-{
-	dialog->collection = collection;
-	if (dialog->model) {
-		gtk_object_set(GTK_OBJECT(dialog->model),
-			       "collection", collection,
-			       NULL);
-	}
-}
-
-/**
- * gal_define_views_dialog_new
- *
- * Returns a new dialog for defining views.
- *
- * Returns: The GalDefineViewsDialog.
- */
-GtkWidget*
-gal_define_views_dialog_new (GalViewCollection *collection)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (gal_define_views_dialog_get_type ()));
-	gal_define_views_dialog_set_collection(GAL_DEFINE_VIEWS_DIALOG (widget), collection);
-	return widget;
-}
-
-static void
-gal_define_views_dialog_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GalDefineViewsDialog *dialog;
-
-	dialog = GAL_DEFINE_VIEWS_DIALOG (o);
-	
-	switch (arg_id){
-	case ARG_COLLECTION:
-		if (GTK_VALUE_OBJECT(*arg))
-			gal_define_views_dialog_set_collection(dialog, GAL_VIEW_COLLECTION(GTK_VALUE_OBJECT(*arg)));
-		else
-			gal_define_views_dialog_set_collection(dialog, NULL);
-		break;
-
-	default:
-		return;
-	}
-}
-
-static void
-gal_define_views_dialog_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	GalDefineViewsDialog *dialog;
-
-	dialog = GAL_DEFINE_VIEWS_DIALOG (object);
-
-	switch (arg_id) {
-	case ARG_COLLECTION:
-		if (dialog->collection)
-			GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(dialog->collection);
-		else
-			GTK_VALUE_OBJECT(*arg) = NULL;
-		break;
-
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
diff --git a/widgets/menus/gal-define-views-dialog.h b/widgets/menus/gal-define-views-dialog.h
deleted file mode 100644
index 27ed2d257b..0000000000
--- a/widgets/menus/gal-define-views-dialog.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* gal-define-views-dialog.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __GAL_DEFINE_VIEWS_DIALOG_H__
-#define __GAL_DEFINE_VIEWS_DIALOG_H__
-
-#include <libgnomeui/gnome-dialog.h>
-#include <glade/glade.h>
-#include <gal/e-table/e-table-model.h>
-#include <gal/menus/gal-view-collection.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* GalDefineViewsDialog - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- */
-
-#define GAL_DEFINE_VIEWS_DIALOG_TYPE			(gal_define_views_dialog_get_type ())
-#define GAL_DEFINE_VIEWS_DIALOG(obj)			(GTK_CHECK_CAST ((obj), GAL_DEFINE_VIEWS_DIALOG_TYPE, GalDefineViewsDialog))
-#define GAL_DEFINE_VIEWS_DIALOG_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), GAL_DEFINE_VIEWS_DIALOG_TYPE, GalDefineViewsDialogClass))
-#define GAL_IS_DEFINE_VIEWS_DIALOG(obj)		(GTK_CHECK_TYPE ((obj), GAL_DEFINE_VIEWS_DIALOG_TYPE))
-#define GAL_IS_DEFINE_VIEWS_DIALOG_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), GAL_DEFINE_VIEWS_DIALOG_TYPE))
-
-typedef struct _GalDefineViewsDialog       GalDefineViewsDialog;
-typedef struct _GalDefineViewsDialogClass  GalDefineViewsDialogClass;
-
-struct _GalDefineViewsDialog
-{
-	GnomeDialog parent;
-
-	/* item specific fields */
-	GladeXML *gui;
-	ETableModel *model;
-
-	GalViewCollection *collection;
-};
-
-struct _GalDefineViewsDialogClass
-{
-	GnomeDialogClass parent_class;
-};
-
-GtkWidget               *gal_define_views_dialog_new          (GalViewCollection *collection);
-GtkType                  gal_define_views_dialog_get_type     (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __GAL_DEFINE_VIEWS_DIALOG_H__ */
diff --git a/widgets/menus/gal-define-views-model.c b/widgets/menus/gal-define-views-model.c
deleted file mode 100644
index 103b46af5c..0000000000
--- a/widgets/menus/gal-define-views-model.c
+++ /dev/null
@@ -1,315 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *
- * Author:
- *   Christopher James Lahey <clahey@helixcode.com>
- *
- * (C) 1999 Helix Code, Inc.
- */
-
-#include <config.h>
-#include <gnome-xml/tree.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-#include "gal-define-views-model.h"
-
-#define PARENT_TYPE e_table_model_get_type()
-static ETableModelClass *parent_class;
-
-/*
- * GalDefineViewsModel callbacks
- * These are the callbacks that define the behavior of our custom model.
- */
-static void gal_define_views_model_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void gal_define_views_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-
-
-enum {
-	ARG_0,
-	ARG_EDITABLE,
-	ARG_COLLECTION
-};
-
-static void
-gdvm_destroy(GtkObject *object)
-{
-	GalDefineViewsModel *model = GAL_DEFINE_VIEWS_MODEL(object);
-
-	gtk_object_unref(GTK_OBJECT(model->collection));
-}
-
-/* This function returns the number of columns in our ETableModel. */
-static int
-gdvm_col_count (ETableModel *etc)
-{
-	return 1;
-}
-
-/* This function returns the number of rows in our ETableModel. */
-static int
-gdvm_row_count (ETableModel *etc)
-{
-	GalDefineViewsModel *views = GAL_DEFINE_VIEWS_MODEL(etc);
-	if (views->collection)
-		return gal_view_collection_get_count(views->collection);
-	else
-		return 0;
-}
-
-/* This function returns the value at a particular point in our ETableModel. */
-static void *
-gdvm_value_at (ETableModel *etc, int col, int row)
-{
-	GalDefineViewsModel *views = GAL_DEFINE_VIEWS_MODEL(etc);
-	const char *value;
-
-	value = gal_view_get_title (gal_view_collection_get_view(views->collection, row));
-
-	return (void *)(value ? value : "");
-}
-
-/* This function sets the value at a particular point in our ETableModel. */
-static void
-gdvm_set_value_at (ETableModel *etc, int col, int row, const void *val)
-{
-	GalDefineViewsModel *views = GAL_DEFINE_VIEWS_MODEL(etc);
-	if (views->editable) {
-		gal_view_set_title(gal_view_collection_get_view(views->collection, row), val);
-		e_table_model_cell_changed(etc, col, row);
-	}
-}
-
-/* This function returns whether a particular cell is editable. */
-static gboolean
-gdvm_is_cell_editable (ETableModel *etc, int col, int row)
-{
-	return GAL_DEFINE_VIEWS_MODEL(etc)->editable;
-}
-
-static void
-gdvm_append_row (ETableModel *etm, ETableModel *source, gint row)
-{
-}
-
-/* This function duplicates the value passed to it. */
-static void *
-gdvm_duplicate_value (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-/* This function frees the value passed to it. */
-static void
-gdvm_free_value (ETableModel *etc, int col, void *value)
-{
-	g_free(value);
-}
-
-static void *
-gdvm_initialize_value (ETableModel *etc, int col)
-{
-	return g_strdup("");
-}
-
-static gboolean
-gdvm_value_is_empty (ETableModel *etc, int col, const void *value)
-{
-	return !(value && *(char *)value);
-}
-
-static char *
-gdvm_value_to_string (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-/**
- * gal_define_views_model_append
- * @model: The model to add to.
- * @view: The view to add.
- *
- * Adds the given view to the gal define views model.
- */
-void
-gal_define_views_model_append (GalDefineViewsModel *model,
-			       GalView             *view)
-{
-	ETableModel *etm = E_TABLE_MODEL(model);
-
-	e_table_model_pre_change(etm);
-	gal_view_collection_append(model->collection, view);
-	e_table_model_row_inserted(etm, gal_view_collection_get_count(model->collection) - 1);
-}
-
-static void
-gal_define_views_model_class_init (GtkObjectClass *object_class)
-{
-	ETableModelClass *model_class = (ETableModelClass *) object_class;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->destroy = gdvm_destroy;
-	object_class->set_arg   = gal_define_views_model_set_arg;
-	object_class->get_arg   = gal_define_views_model_get_arg;
-
-	gtk_object_add_arg_type ("GalDefineViewsModel::editable", GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE, ARG_EDITABLE);
-	gtk_object_add_arg_type ("GalDefineViewsModel::collection", GAL_VIEW_COLLECTION_TYPE,
-				 GTK_ARG_READWRITE, ARG_COLLECTION);
-
-	model_class->column_count     = gdvm_col_count;
-	model_class->row_count        = gdvm_row_count;
-	model_class->value_at         = gdvm_value_at;
-	model_class->set_value_at     = gdvm_set_value_at;
-	model_class->is_cell_editable = gdvm_is_cell_editable;
-	model_class->append_row       = gdvm_append_row;
-	model_class->duplicate_value  = gdvm_duplicate_value;
-	model_class->free_value       = gdvm_free_value;
-	model_class->initialize_value = gdvm_initialize_value;
-	model_class->value_is_empty   = gdvm_value_is_empty;
-	model_class->value_to_string  = gdvm_value_to_string;
-}
-
-static void
-gal_define_views_model_init (GtkObject *object)
-{
-	GalDefineViewsModel *model = GAL_DEFINE_VIEWS_MODEL(object);
-
-	model->collection = NULL;
-}
-
-static void
-gal_define_views_model_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GalDefineViewsModel *model;
-
-	model = GAL_DEFINE_VIEWS_MODEL (o);
-
-	switch (arg_id){
-	case ARG_EDITABLE:
-		model->editable = GTK_VALUE_BOOL (*arg);
-		break;
-
-	case ARG_COLLECTION:
-		if (GTK_VALUE_OBJECT (*arg))
-			model->collection = GAL_VIEW_COLLECTION(GTK_VALUE_OBJECT (*arg));
-		else
-			model->collection = NULL;
-		e_table_model_changed(E_TABLE_MODEL(o));
-		break;
-	}
-}
-
-static void
-gal_define_views_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	GalDefineViewsModel *model;
-
-	model = GAL_DEFINE_VIEWS_MODEL (object);
-
-	switch (arg_id) {
-	case ARG_EDITABLE:
-		GTK_VALUE_BOOL (*arg) = model->editable;
-		break;
-
-	case ARG_COLLECTION:
-		if (model->collection)
-			GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(model->collection);
-		else
-			GTK_VALUE_OBJECT (*arg) = NULL;
-		break;
-
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-GtkType
-gal_define_views_model_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"GalDefineViewsModel",
-			sizeof (GalDefineViewsModel),
-			sizeof (GalDefineViewsModelClass),
-			(GtkClassInitFunc) gal_define_views_model_class_init,
-			(GtkObjectInitFunc) gal_define_views_model_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-/**
- * gal_define_views_model_new
- *
- * Returns a new define views model.  This is a list of views as an
- * ETable for use in the GalDefineViewsDialog.
- *
- * Returns: The new GalDefineViewsModel.
- */
-ETableModel *
-gal_define_views_model_new (void)
-{
-	GalDefineViewsModel *et;
-
-	et = gtk_type_new (gal_define_views_model_get_type ());
-
-	return E_TABLE_MODEL(et);
-}
-
-/**
- * gal_define_views_model_get_view:
- * @model: The GalDefineViewsModel.
- * @n: Which view to get.
- *
- * Gets the nth view.
- *
- * Returns: The view.
- */
-GalView *
-gal_define_views_model_get_view (GalDefineViewsModel *model,
-				 int n)
-{
-	return gal_view_collection_get_view(model->collection, n);
-}
-
-/**
- * gal_define_views_model_delete_view:
- * @model: The GalDefineViewsModel.
- * @n: Which view to delete.
- *
- * Deletes the nth view.
- */
-void
-gal_define_views_model_delete_view (GalDefineViewsModel *model,
-				    int n)
-{
-	e_table_model_pre_change(E_TABLE_MODEL(model));
-	gal_view_collection_delete_view(model->collection, n);
-	e_table_model_row_deleted(E_TABLE_MODEL(model), n);
-}
-
-/**
- * gal_define_views_model_copy_view:
- * @model: The GalDefineViewsModel.
- * @n: Which view to copy.
- *
- * Copys the nth view.
- */
-void
-gal_define_views_model_copy_view (GalDefineViewsModel *model,
-				  int n)
-{
-	ETableModel *etm = E_TABLE_MODEL(model);
-	gal_view_collection_copy_view(model->collection, n);
-	e_table_model_row_inserted(etm, gal_view_collection_get_count(model->collection) - 1);
-}
diff --git a/widgets/menus/gal-define-views-model.h b/widgets/menus/gal-define-views-model.h
deleted file mode 100644
index 4aac712df6..0000000000
--- a/widgets/menus/gal-define-views-model.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _GAL_DEFINE_VIEWS_MODEL_H_
-#define _GAL_DEFINE_VIEWS_MODEL_H_
-
-#include <gal/e-table/e-table-model.h>
-#include <gal/menus/gal-view.h>
-#include <gal/menus/gal-view-collection.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define GAL_DEFINE_VIEWS_MODEL_TYPE        (gal_define_views_model_get_type ())
-#define GAL_DEFINE_VIEWS_MODEL(o)          (GTK_CHECK_CAST ((o), GAL_DEFINE_VIEWS_MODEL_TYPE, GalDefineViewsModel))
-#define GAL_DEFINE_VIEWS_MODEL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), GAL_DEFINE_VIEWS_MODEL_TYPE, GalDefineViewsModelClass))
-#define GAL_IS_DEFINE_VIEWS_MODEL(o)       (GTK_CHECK_TYPE ((o), GAL_DEFINE_VIEWS_MODEL_TYPE))
-#define GAL_IS_DEFINE_VIEWS_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), GAL_DEFINE_VIEWS_MODEL_TYPE))
-
-typedef struct {
-	ETableModel parent;
-
-	/* item specific fields */
-	GalViewCollection *collection;
-
-	guint editable : 1;
-} GalDefineViewsModel;
-
-
-typedef struct {
-	ETableModelClass parent_class;
-} GalDefineViewsModelClass;
-
-
-GtkType      gal_define_views_model_get_type     (void);
-ETableModel *gal_define_views_model_new          (void);
-
-void         gal_define_views_model_append       (GalDefineViewsModel *model,
-						  GalView             *view);
-GalView     *gal_define_views_model_get_view     (GalDefineViewsModel *model,
-						  int                  i);
-void         gal_define_views_model_delete_view  (GalDefineViewsModel *model,
-						  int                  i);
-void         gal_define_views_model_copy_view    (GalDefineViewsModel *model,
-						  int                  i);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _GAL_DEFINE_VIEWS_MODEL_H_ */
diff --git a/widgets/menus/gal-define-views.glade b/widgets/menus/gal-define-views.glade
deleted file mode 100644
index b393d97d2e..0000000000
--- a/widgets/menus/gal-define-views.glade
+++ /dev/null
@@ -1,311 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>gal-define-views</name>
-  <program_name>gal-define-views</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <gnome_help_support>True</gnome_help_support>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog1</name>
-  <visible>False</visible>
-  <title>Define Views for &quot;%s&quot;</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button7</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table-top</name>
-      <rows>5</rows>
-      <columns>1</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>6</row_spacing>
-      <column_spacing>6</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkFrame</class>
-	<name>frame1</name>
-	<label>Description</label>
-	<label_xalign>0</label_xalign>
-	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkTable</class>
-	  <name>table-description</name>
-	  <border_width>6</border_width>
-	  <rows>1</rows>
-	  <columns>2</columns>
-	  <homogeneous>False</homogeneous>
-	  <row_spacing>6</row_spacing>
-	  <column_spacing>6</column_spacing>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox1</name>
-	<homogeneous>False</homogeneous>
-	<spacing>6</spacing>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>True</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom-table</name>
-	  <creation_function>gal_define_views_dialog_create_etable</creation_function>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Fri, 10 Nov 2000 16:37:39 GMT</last_modification_time>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox1</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>6</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-new</name>
-	    <can_focus>True</can_focus>
-	    <label>_New...</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-copy</name>
-	    <can_focus>True</can_focus>
-	    <label>_Copy...</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-modify</name>
-	    <can_focus>True</can_focus>
-	    <label>_Edit...</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-delete</name>
-	    <can_focus>True</can_focus>
-	    <label>_Delete...</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkHButtonBox</class>
-	<name>hbuttonbox1</name>
-	<layout_style>GTK_BUTTONBOX_END</layout_style>
-	<spacing>6</spacing>
-	<child_min_width>85</child_min_width>
-	<child_min_height>27</child_min_height>
-	<child_ipad_x>7</child_ipad_x>
-	<child_ipad_y>0</child_ipad_y>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>4</top_attach>
-	  <bottom_attach>5</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkAlignment</class>
-	<name>alignment3</name>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xscale>0</xscale>
-	<yscale>1</yscale>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-reset</name>
-	  <can_focus>True</can_focus>
-	  <label>Re_set to Factory Defaults...</label>
-	  <relief>GTK_RELIEF_NORMAL</relief>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label-views</name>
-	<label>Views for &quot;%s&quot;</label>
-	<justify>GTK_JUSTIFY_LEFT</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/widgets/menus/gal-view-collection.c b/widgets/menus/gal-view-collection.c
deleted file mode 100644
index 2503a4cc79..0000000000
--- a/widgets/menus/gal-view-collection.c
+++ /dev/null
@@ -1,626 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view-collection.c: a View Collection
- *
- * Authors:
- *   Chris Lahey (clahey@helixcode.com)
- *
- * (C) 1999, 2000 Helix Code, Inc.
- */
-#include <config.h>
-
-#include <util/e-i18n.h>
-#include <ctype.h>
-#include <string.h>
-#include <gtk/gtksignal.h>
-#include <gnome-xml/parser.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-util.h>
-#include <gal/util/e-util.h>
-#include <gal/util/e-xml-utils.h>
-#include <gal/widgets/e-unicode.h>
-#include "gal-view-collection.h"
-
-#define GVC_CLASS(e) ((GalViewCollectionClass *)((GtkObject *)e)->klass)
-
-#define PARENT_TYPE gtk_object_get_type ()
-
-static GtkObjectClass *gal_view_collection_parent_class;
-
-enum {
-	DISPLAY_VIEW,
-	CHANGED,
-	LAST_SIGNAL
-};
-
-static guint gal_view_collection_signals [LAST_SIGNAL] = { 0, };
-
-/**
- * gal_view_collection_display_view:
- * @collection: The GalViewCollection to send the signal on.
- * @view: The view to display.
- *
- */
-void
-gal_view_collection_display_view (GalViewCollection *collection,
-				  GalView *view)
-{
-	g_return_if_fail (collection != NULL);
-	g_return_if_fail (GAL_IS_VIEW_COLLECTION (collection));
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (GAL_IS_VIEW (view));
-
-	gtk_signal_emit (GTK_OBJECT (collection),
-			 gal_view_collection_signals [DISPLAY_VIEW],
-			 view);
-}
-
-static void
-gal_view_collection_changed (GalViewCollection *collection)
-{
-	g_return_if_fail (collection != NULL);
-	g_return_if_fail (GAL_IS_VIEW_COLLECTION (collection));
-
-	gtk_signal_emit (GTK_OBJECT (collection),
-			 gal_view_collection_signals [CHANGED]);
-}
-
-static void
-gal_view_collection_item_free (GalViewCollectionItem *item)
-{
-	g_free(item->id);
-	if (item->view)
-		gtk_object_unref(GTK_OBJECT(item->view));
-	g_free(item);
-}
-
-static void
-gal_view_collection_destroy (GtkObject *object)
-{
-	GalViewCollection *collection = GAL_VIEW_COLLECTION(object);
-	int i;
-
-	for (i = 0; i < collection->view_count; i++) {
-		gal_view_collection_item_free (collection->view_data[i]);
-	}
-	g_free(collection->view_data);
-	e_free_object_list(collection->factory_list);
-
-	for (i = 0; i < collection->removed_view_count; i++) {
-		gal_view_collection_item_free (collection->removed_view_data[i]);
-	}
-	g_free(collection->removed_view_data);
-
-	g_free(collection->system_dir);
-	g_free(collection->local_dir);
-
-	if (gal_view_collection_parent_class->destroy)
-		(*gal_view_collection_parent_class->destroy)(object);
-}
-
-static void
-gal_view_collection_class_init (GtkObjectClass *object_class)
-{
-	GalViewCollectionClass *klass = GAL_VIEW_COLLECTION_CLASS(object_class);
-	gal_view_collection_parent_class = gtk_type_class (PARENT_TYPE);
-	
-	object_class->destroy = gal_view_collection_destroy;
-
-	gal_view_collection_signals [DISPLAY_VIEW] =
-		gtk_signal_new ("display_view",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (GalViewCollectionClass, display_view),
-				gtk_marshal_NONE__OBJECT,
-				GTK_TYPE_NONE, 1, GAL_VIEW_TYPE);
-
-	gal_view_collection_signals [CHANGED] =
-		gtk_signal_new ("changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (GalViewCollectionClass, changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, gal_view_collection_signals, LAST_SIGNAL);
-
-	klass->display_view = NULL;
-	klass->changed      = NULL;
-}
-
-static void
-gal_view_collection_init (GalViewCollection *collection)
-{
-	collection->view_data          = NULL;
-	collection->view_count         = 0;
-	collection->factory_list       = NULL;
-
-	collection->removed_view_data  = NULL;
-	collection->removed_view_count = 0;
-
-	collection->system_dir         = NULL;
-	collection->local_dir          = NULL;
-}
-
-/**
- * gal_view_collection_get_type:
- *
- */
-guint
-gal_view_collection_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type)
-	{
-		GtkTypeInfo info =
-		{
-			"GalViewCollection",
-			sizeof (GalViewCollection),
-			sizeof (GalViewCollectionClass),
-			(GtkClassInitFunc) gal_view_collection_class_init,
-			(GtkObjectInitFunc) gal_view_collection_init,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-		
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-  return type;
-}
-
-/**
- * gal_view_collection_new:
- *
- * A collection of views and view factories.
- */
-GalViewCollection *
-gal_view_collection_new                      (void)
-{
-	return gtk_type_new(gal_view_collection_get_type());
-}
-
-/**
- * gal_view_collection_set_storage_directories
- * @collection: The view collection to initialize
- * @system_dir: The location of the system built in views
- * @local_dir: The location to store the users set up views
- *
- * Sets up the GalViewCollection.
- */
-void
-gal_view_collection_set_storage_directories  (GalViewCollection *collection,
-					      const char        *system_dir,
-					      const char        *local_dir)
-{
-	g_return_if_fail (collection != NULL);
-	g_return_if_fail (GAL_IS_VIEW_COLLECTION (collection));
-	g_return_if_fail (system_dir != NULL);
-	g_return_if_fail (local_dir != NULL);
-
-	g_free(collection->system_dir);
-	g_free(collection->local_dir);
-
-	collection->system_dir = g_strdup(system_dir);
-	collection->local_dir = g_strdup(local_dir);
-}
-
-/**
- * gal_view_collection_add_factory
- * @collection: The view collection to add a factory to
- * @factory: The factory to add.  The @collection will add a reference
- * to the factory object, so you should unref it after calling this
- * function if you no longer need it.
- *
- * Adds the given factory to this collection.  This list is used both
- * when loading views from their xml description as well as when the
- * user tries to create a new view.
- */
-void
-gal_view_collection_add_factory              (GalViewCollection *collection,
-					      GalViewFactory    *factory)
-{
-	g_return_if_fail (collection != NULL);
-	g_return_if_fail (GAL_IS_VIEW_COLLECTION (collection));
-	g_return_if_fail (factory != NULL);
-	g_return_if_fail (GAL_IS_VIEW_FACTORY (factory));
-
-	gtk_object_ref (GTK_OBJECT (factory));
-	collection->factory_list = g_list_prepend (collection->factory_list, factory);
-}
-
-static void
-view_changed (GalView *view,
-	      GalViewCollectionItem *item)
-{
-	item->changed = TRUE;
-	item->ever_changed = TRUE;
-
-	gal_view_collection_changed(item->collection);
-}
-
-static GalViewCollectionItem *
-load_single_file (GalViewCollection *collection,
-		  gchar *dir,
-		  gboolean local,
-		  xmlNode *node)
-{
-	GalViewCollectionItem *item;
-	item = g_new(GalViewCollectionItem, 1);
-	item->ever_changed = local;
-	item->changed = FALSE;
-	item->built_in = !local;
-	item->id = e_xml_get_string_prop_by_name(node, "id");
-	item->filename = e_xml_get_string_prop_by_name(node, "filename");
-	item->title = e_xml_get_translated_utf8_string_prop_by_name(node, "title");
-	item->type = e_xml_get_string_prop_by_name(node, "type");
-	item->collection = collection;
-
-	if (item->filename) {
-		GalViewFactory *factory;
-		GList *factories;
-
-		factory = NULL;
-		for (factories = collection->factory_list; factories; factories = factories->next) {
-			if (!strcmp(gal_view_factory_get_type_code(factories->data), item->type)) {
-				factory = factories->data;
-				break;
-			}
-		}
-		if (factory) {
-			char *filename;
-
-			filename = g_concat_dir_and_file(dir, item->filename);
-			item->view = gal_view_factory_new_view (factory, item->title);
-			gal_view_load(item->view, filename);
-			gal_view_set_title (item->view, item->title);
-			gtk_signal_connect(GTK_OBJECT(item->view), "changed",
-					   GTK_SIGNAL_FUNC(view_changed), item);
-			g_free(filename);
-		}
-
-	}
-	return item;
-}
-
-static void
-load_single_dir (GalViewCollection *collection,
-		 char *dir,
-		 gboolean local)
-{
-	xmlDoc *doc;
-	xmlNode *root;
-	xmlNode *child;
-	char *filename = g_concat_dir_and_file(dir, "galview.xml");
-
-	doc = xmlParseFile(filename);
-	if (!doc) {
-		g_free (filename);
-		return;
-	}
-	root = xmlDocGetRootElement(doc);
-	for (child = root->xmlChildrenNode; child; child = child->next) {
-		gchar *id = e_xml_get_string_prop_by_name(child, "id");
-		gboolean found = FALSE;
-		int i;
-
-		for (i = 0; i < collection->view_count; i++) {
-			if (!strcmp(id, collection->view_data[i]->id)) {
-				if (!local)
-					collection->view_data[i]->built_in = TRUE;
-				found = TRUE;
-				break;
-			}
-		}
-		if (!found) {
-			for (i = 0; i < collection->removed_view_count; i++) {
-				if (!strcmp(id, collection->removed_view_data[i]->id)) {
-					if (!local)
-						collection->removed_view_data[i]->built_in = TRUE;
-					found = TRUE;
-					break;
-				}
-			}
-		}
-
-		if (!found) {
-			GalViewCollectionItem *item = load_single_file (collection, dir, local, child);
-			if (item->filename && *item->filename) {
-				collection->view_data = g_renew(GalViewCollectionItem *, collection->view_data, collection->view_count + 1);
-				collection->view_data[collection->view_count] = item;
-				collection->view_count ++;
-			} else {
-				collection->removed_view_data = g_renew(GalViewCollectionItem *, collection->removed_view_data, collection->removed_view_count + 1);
-				collection->removed_view_data[collection->removed_view_count] = item;
-				collection->removed_view_count ++;
-			}
-		}
-		g_free(id);
-	}
-
-	g_free(filename);
-	xmlFreeDoc(doc);
-}
-
-/**
- * gal_view_collection_load
- * @collection: The view collection to load information for
- *
- * Loads the data from the system and user directories specified in
- * set storage directories.  This is primarily for internal use by
- * other parts of gal_view.
- */
-void
-gal_view_collection_load              (GalViewCollection *collection)
-{
-	g_return_if_fail (collection != NULL);
-	g_return_if_fail (GAL_IS_VIEW_COLLECTION (collection));
-	g_return_if_fail (collection->local_dir != NULL);
-	g_return_if_fail (collection->system_dir != NULL);
-
-	load_single_dir(collection, collection->local_dir, TRUE);
-	load_single_dir(collection, collection->system_dir, FALSE);
-}
-
-/**
- * gal_view_collection_save
- * @collection: The view collection to save information for
- *
- * Saves the data to the user directory specified in set storage
- * directories.  This is primarily for internal use by other parts of
- * gal_view.
- */
-void
-gal_view_collection_save              (GalViewCollection *collection)
-{
-	int i;
-	xmlDoc *doc;
-	xmlNode *root;
-	char *filename;
-
-	g_return_if_fail (collection != NULL);
-	g_return_if_fail (GAL_IS_VIEW_COLLECTION (collection));
-	g_return_if_fail (collection->local_dir != NULL);
-
-	e_create_directory(collection->local_dir);
-
-	doc = xmlNewDoc("1.0");
-	root = xmlNewNode(NULL, "GalViewCollection");
-	xmlDocSetRootElement(doc, root);
-	for (i = 0; i < collection->view_count; i++) {
-		xmlNode *child;
-		GalViewCollectionItem *item;
-
-		item = collection->view_data[i];
-		if (item->ever_changed) {
-			child = xmlNewChild(root, NULL, "GalView", NULL);
-			e_xml_set_string_prop_by_name(child, "id", item->id);
-			e_xml_set_string_prop_by_name(child, "title", item->title);
-			e_xml_set_string_prop_by_name(child, "filename", item->filename);
-			e_xml_set_string_prop_by_name(child, "type", item->type);
-
-			if (item->changed) {
-				filename = g_concat_dir_and_file(collection->local_dir, item->filename);
-				gal_view_save(item->view, filename);
-				g_free(filename);
-			}
-		}
-	}
-	for (i = 0; i < collection->removed_view_count; i++) {
-		xmlNode *child;
-		GalViewCollectionItem *item;
-
-		item = collection->removed_view_data[i];
-
-		child = xmlNewChild(root, NULL, "GalView", NULL);
-		e_xml_set_string_prop_by_name(child, "id", item->id);
-		e_xml_set_string_prop_by_name(child, "title", item->title);
-		e_xml_set_string_prop_by_name(child, "type", item->type);
-	}
-	filename = g_concat_dir_and_file(collection->local_dir, "galview.xml");
-	xmlSaveFile(filename, doc);
-	xmlFreeDoc(doc);
-	g_free(filename);
-}
-
-/**
- * gal_view_collection_get_count
- * @collection: The view collection to count
- *
- * Calculates the number of views in the given collection.
- *
- * Returns: The number of views in the collection.
- */
-gint
-gal_view_collection_get_count (GalViewCollection *collection)
-{
-	g_return_val_if_fail (collection != NULL, -1);
-	g_return_val_if_fail (GAL_IS_VIEW_COLLECTION (collection), -1);
-
-	return collection->view_count;
-}
-
-/**
- * gal_view_collection_get_view
- * @collection: The view collection to query
- * @n: The view to get.
- *
- * Returns: The nth view in the collection
- */
-GalView *
-gal_view_collection_get_view (GalViewCollection *collection,
-			      int n)
-{
-	g_return_val_if_fail (collection != NULL, NULL);
-	g_return_val_if_fail (GAL_IS_VIEW_COLLECTION (collection), NULL);
-	g_return_val_if_fail (n < collection->view_count, NULL);
-	g_return_val_if_fail (n >= 0, NULL);
-
-	return collection->view_data[n]->view;
-}
-
-/**
- * gal_view_collection_get_view_item
- * @collection: The view collection to query
- * @n: The view item to get.
- *
- * Returns: The nth view item in the collection
- */
-GalViewCollectionItem *
-gal_view_collection_get_view_item (GalViewCollection *collection,
-				   int n)
-{
-	g_return_val_if_fail (collection != NULL, NULL);
-	g_return_val_if_fail (GAL_IS_VIEW_COLLECTION (collection), NULL);
-	g_return_val_if_fail(n < collection->view_count, NULL);
-	g_return_val_if_fail(n >= 0, NULL);
-
-	return collection->view_data[n];
-}
-
-static char *
-gal_view_generate_string (GalViewCollection *collection,
-			  GalView           *view,
-			  int which)
-{
-	char *ret_val;
-	char *pointer;
-
-	if (which == 1)
-		ret_val = g_strdup(gal_view_get_title(view));
-	else
-		ret_val = g_strdup_printf("%s_%d", gal_view_get_title(view), which);
-	for (pointer = ret_val; *pointer; pointer++) {
-		if (!isalnum((guint) *pointer)) {
-			*pointer = '_';
-		}
-	}
-	return ret_val;
-}
-
-static gint
-gal_view_check_string (GalViewCollection *collection,
-		       char *string)
-{
-	int i;
-
-	for (i = 0; i < collection->view_count; i++) {
-		if (!strcmp(string, collection->view_data[i]->id))
-			return FALSE;
-	}
-	for (i = 0; i < collection->removed_view_count; i++) {
-		if (!strcmp(string, collection->removed_view_data[i]->id))
-			return FALSE;
-	}
-	return TRUE;
-}
-
-static char *
-gal_view_generate_id (GalViewCollection *collection,
-		      GalView           *view)
-{
-	int i;
-	for (i = 1; TRUE; i++) {
-		char *try;
-
-		try = gal_view_generate_string(collection, view, i);
-		if (gal_view_check_string(collection, try))
-			return try;
-		g_free(try);
-	}
-}
-
-void
-gal_view_collection_append                   (GalViewCollection *collection,
-					      GalView           *view)
-{
-	GalViewCollectionItem *item;
-
-	g_return_if_fail (collection != NULL);
-	g_return_if_fail (GAL_IS_VIEW_COLLECTION (collection));
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (GAL_IS_VIEW (view));
-
-	item = g_new(GalViewCollectionItem, 1);
-	item->ever_changed = TRUE;
-	item->changed = TRUE;
-	item->built_in = FALSE;
-	item->title = g_strdup(gal_view_get_title(view));
-	item->type = g_strdup(gal_view_get_type_code(view));
-	item->id = gal_view_generate_id(collection, view);
-	item->filename = g_strdup_printf("%s.galview", item->id);
-	item->view = view;
-	item->collection = collection;
-	gtk_object_ref(GTK_OBJECT(view));
-
-	gtk_signal_connect(GTK_OBJECT(item->view), "changed",
-			   GTK_SIGNAL_FUNC(view_changed), item);
-
-	collection->view_data = g_renew(GalViewCollectionItem *, collection->view_data, collection->view_count + 1);
-	collection->view_data[collection->view_count] = item;
-	collection->view_count ++;
-
-	gal_view_collection_changed(collection);
-}
-
-void
-gal_view_collection_delete_view              (GalViewCollection *collection,
-					      int                i)
-{
-	GalViewCollectionItem *item;
-
-	g_return_if_fail (collection != NULL);
-	g_return_if_fail (GAL_IS_VIEW_COLLECTION (collection));
-	g_return_if_fail (i >= 0 && i < collection->view_count);
-
-	item = collection->view_data[i];
-	memmove(collection->view_data + i, collection->view_data + i + 1, (collection->view_count - i - 1) * sizeof(GalViewCollectionItem *));
-	if (item->built_in) {
-		g_free(item->filename);
-		item->filename = NULL;
-
-		collection->removed_view_data = g_renew(GalViewCollectionItem *, collection->removed_view_data, collection->removed_view_count + 1);
-		collection->removed_view_data[collection->removed_view_count] = item;
-		collection->removed_view_count ++;
-	} else {
-		gal_view_collection_item_free (item);
-	}
-
-	gal_view_collection_changed(collection);
-}
-
-void
-gal_view_collection_copy_view                (GalViewCollection *collection,
-					      int                i)
-{
-	GalViewCollectionItem *item;
-	GalView *view;
-
-	g_return_if_fail (collection != NULL);
-	g_return_if_fail (GAL_IS_VIEW_COLLECTION (collection));
-	g_return_if_fail (i >= 0 && i < collection->view_count);
-
-	view = collection->view_data[i]->view;
-
-	item = g_new(GalViewCollectionItem, 1);
-	item->ever_changed = TRUE;
-	item->changed = FALSE;
-	item->built_in = FALSE;
-	item->title = g_strdup(gal_view_get_title(view));
-	item->type = g_strdup(gal_view_get_type_code(view));
-	item->id = gal_view_generate_id(collection, view);
-	item->filename = g_strdup_printf("%s.galview", item->id);
-	item->view = gal_view_clone(view);
-	item->collection = collection;
-
-	gtk_signal_connect(GTK_OBJECT(item->view), "changed",
-			   GTK_SIGNAL_FUNC(view_changed), item);
-
-	collection->view_data = g_renew(GalViewCollectionItem *, collection->view_data, collection->view_count + 1);
-	collection->view_data[collection->view_count] = item;
-	collection->view_count ++;
-
-	gal_view_collection_changed(collection);
-}
diff --git a/widgets/menus/gal-view-collection.h b/widgets/menus/gal-view-collection.h
deleted file mode 100644
index 82da6a2de6..0000000000
--- a/widgets/menus/gal-view-collection.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _GAL_VIEW_SET_H_
-#define _GAL_VIEW_SET_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/menus/gal-view-factory.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-#define GAL_VIEW_COLLECTION_TYPE        (gal_view_collection_get_type ())
-#define GAL_VIEW_COLLECTION(o)          (GTK_CHECK_CAST ((o), GAL_VIEW_COLLECTION_TYPE, GalViewCollection))
-#define GAL_VIEW_COLLECTION_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), GAL_VIEW_COLLECTION_TYPE, GalViewCollectionClass))
-#define GAL_IS_VIEW_COLLECTION(o)       (GTK_CHECK_TYPE ((o), GAL_VIEW_COLLECTION_TYPE))
-#define GAL_IS_VIEW_COLLECTION_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), GAL_VIEW_COLLECTION_TYPE))
-
-typedef struct GalViewCollectionItem GalViewCollectionItem;
-
-typedef struct {
-	GtkObject base;
-
-	GalViewCollectionItem **view_data;
-	int view_count;
-	GList *factory_list;
-
-	GalViewCollectionItem **removed_view_data;
-	int removed_view_count;
-
-	char *system_dir;
-	char *local_dir;
-} GalViewCollection;
-
-typedef struct {
-	GtkObjectClass parent_class;
-
-	/*
-	 * Signals
-	 */
-	void (*display_view) (GalViewCollection *collection,
-			      GalView    *view);
-	void (*changed)      (GalViewCollection *collection);
-} GalViewCollectionClass;
-
-struct GalViewCollectionItem {
-	GalView *view;
-	char *id;
-	gboolean changed;
-	gboolean ever_changed;
-	gboolean built_in;
-	char *filename;
-	char *title;
-	char *type;
-	GalViewCollection *collection;
-};
-
-/* Standard functions */
-GtkType                gal_view_collection_get_type                 (void);
-GalViewCollection     *gal_view_collection_new                      (void);
-
-/* Set up the view collection */
-void                   gal_view_collection_set_storage_directories  (GalViewCollection *collection,
-								     const char        *system_dir,
-								     const char        *local_dir);
-void                   gal_view_collection_add_factory              (GalViewCollection *collection,
-								     GalViewFactory    *factory);
-
-/* Send the display view signal. */
-void                   gal_view_collection_display_view             (GalViewCollection *collection,
-								     GalView           *view);
-gint                   gal_view_collection_get_count                (GalViewCollection *collection);
-GalView               *gal_view_collection_get_view                 (GalViewCollection *collection,
-								     int                n);
-GalViewCollectionItem *gal_view_collection_get_view_item            (GalViewCollection *collection,
-								     int                n);
-
-void                   gal_view_collection_append                   (GalViewCollection *collection,
-								     GalView           *view);
-void                   gal_view_collection_delete_view              (GalViewCollection *collection,
-								     int                i);
-void                   gal_view_collection_copy_view                (GalViewCollection *collection,
-								     int                i);
-/* Call set_storage_directories and add factories for anything that
- * might be found there before doing either of these. */
-void                   gal_view_collection_load                     (GalViewCollection *collection);
-void                   gal_view_collection_save                     (GalViewCollection *collection);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* _GAL_VIEW_COLLECTION_H_ */
diff --git a/widgets/menus/gal-view-etable.c b/widgets/menus/gal-view-etable.c
deleted file mode 100644
index 34b14b3c50..0000000000
--- a/widgets/menus/gal-view-etable.c
+++ /dev/null
@@ -1,203 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view-etable.c: An ETable View
- *
- * Authors:
- *   Chris Lahey (clahey@helixcode.com)
- *
- * (C) 2000 Helix Code, Inc.
- */
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "gal-view-etable.h"
-#include <gal/e-table/e-table-config.h>
-
-#define PARENT_TYPE gal_view_get_type ()
-
-static GalViewClass *gal_view_etable_parent_class;
-
-
-static void
-config_changed (ETableConfig *config, GalViewEtable *view)
-{
-	ETableState *state;
-	if (view->state)
-		gtk_object_unref(GTK_OBJECT(view->state));
-	gtk_object_get (GTK_OBJECT (config),
-			"state", &state,
-			NULL);
-	view->state = e_table_state_duplicate(state);
-	gal_view_changed(GAL_VIEW(view));
-}
-
-static void
-gal_view_etable_edit            (GalView *view)
-{
-	GalViewEtable *etable_view = GAL_VIEW_ETABLE(view);
-	ETableConfig *config;
-
-	config = e_table_config_new(etable_view->title,
-				    etable_view->spec,
-				    etable_view->state);
-
-	gtk_signal_connect(GTK_OBJECT(config), "changed",
-			   GTK_SIGNAL_FUNC(config_changed), view);
-}
-
-static void  
-gal_view_etable_load  (GalView *view,
-		       const char *filename)
-{
-	e_table_state_load_from_file(GAL_VIEW_ETABLE(view)->state, filename);
-}
-
-static void
-gal_view_etable_save    (GalView *view,
-			 const char *filename)
-{
-	e_table_state_save_to_file(GAL_VIEW_ETABLE(view)->state, filename);
-}
-
-static const char *
-gal_view_etable_get_title       (GalView *view)
-{
-	return GAL_VIEW_ETABLE(view)->title;
-}
-
-static void
-gal_view_etable_set_title       (GalView *view,
-				 const char *title)
-{
-	g_free(GAL_VIEW_ETABLE(view)->title);
-	GAL_VIEW_ETABLE(view)->title = g_strdup(title);
-}
-
-static const char *
-gal_view_etable_get_type_code (GalView *view)
-{
-	return "etable";
-}
-
-static GalView *
-gal_view_etable_clone       (GalView *view)
-{
-	GalViewEtable *gve, *new;
-
-	gve = GAL_VIEW_ETABLE(view);
-
-	new        = gtk_type_new (gal_view_etable_get_type ());
-	new->spec  = gve->spec;
-	new->title = g_strdup (gve->title);
-	new->state = e_table_state_duplicate(gve->state);
-
-	gtk_object_ref(GTK_OBJECT(new->spec));
-
-	return GAL_VIEW(new);
-}
-
-static void
-gal_view_etable_destroy         (GtkObject *object)
-{
-	GalViewEtable *view = GAL_VIEW_ETABLE(object);
-	g_free(view->title);
-	if (view->spec)
-		gtk_object_unref(GTK_OBJECT(view->spec));
-	if (view->state)
-		gtk_object_unref(GTK_OBJECT(view->state));
-}
-
-static void
-gal_view_etable_class_init      (GtkObjectClass *object_class)
-{
-	GalViewClass *gal_view_class  = GAL_VIEW_CLASS(object_class);
-	gal_view_etable_parent_class  = gtk_type_class (PARENT_TYPE);
-
-	gal_view_class->edit          = gal_view_etable_edit         ;
-	gal_view_class->load          = gal_view_etable_load         ;
-	gal_view_class->save          = gal_view_etable_save         ;
-	gal_view_class->get_title     = gal_view_etable_get_title    ;
-	gal_view_class->set_title     = gal_view_etable_set_title    ;
-	gal_view_class->get_type_code = gal_view_etable_get_type_code;
-	gal_view_class->clone         = gal_view_etable_clone        ;
-
-	object_class->destroy         = gal_view_etable_destroy      ;
-}
-
-static void
-gal_view_etable_init      (GalViewEtable *gve)
-{
-	gve->spec  = NULL;
-	gve->state = e_table_state_new();
-	gve->title = NULL;
-}
-
-/**
- * gal_view_etable_new
- * @spec: The ETableSpecification that this view will be based upon.
- * @title: The name of the new view.
- *
- * Returns a new GalViewEtable.  This is primarily for use by
- * GalViewFactoryEtable.
- *
- * Returns: The new GalViewEtable.
- */
-GalView *
-gal_view_etable_new (ETableSpecification *spec,
-		     const gchar *title)
-{
-	return gal_view_etable_construct (gtk_type_new (gal_view_etable_get_type ()), spec, title);
-}
-
-/**
- * gal_view_etable_construct
- * @view: The view to construct.
- * @spec: The ETableSpecification that this view will be based upon.
- * @title: The name of the new view.
- *
- * constructs the GalViewEtable.  To be used by subclasses and
- * language bindings.
- *
- * Returns: The GalViewEtable.
- */
-GalView *
-gal_view_etable_construct  (GalViewEtable *view,
-			    ETableSpecification *spec,
-			    const gchar *title)
-{
-	if (spec)
-		gtk_object_ref(GTK_OBJECT(spec));
-	view->spec = spec;
-
-	if (view->state)
-		gtk_object_unref(GTK_OBJECT(view->state));
-	view->state = e_table_state_duplicate(spec->state);
-
-	view->title = g_strdup(title);
-
-	return GAL_VIEW(view);
-}
-
-GtkType
-gal_view_etable_get_type        (void)
-{
-	static guint type = 0;
-	
-	if (!type)
-	{
-		GtkTypeInfo info =
-		{
-			"GalViewEtable",
-			sizeof (GalViewEtable),
-			sizeof (GalViewEtableClass),
-			(GtkClassInitFunc) gal_view_etable_class_init,
-			(GtkObjectInitFunc) gal_view_etable_init,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-		
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
diff --git a/widgets/menus/gal-view-etable.h b/widgets/menus/gal-view-etable.h
deleted file mode 100644
index 9fde64a9cb..0000000000
--- a/widgets/menus/gal-view-etable.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _GAL_VIEW_ETABLE_H_
-#define _GAL_VIEW_ETABLE_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/menus/gal-view.h>
-#include <gal/e-table/e-table-state.h>
-#include <gal/e-table/e-table-specification.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define GAL_VIEW_ETABLE_TYPE        (gal_view_etable_get_type ())
-#define GAL_VIEW_ETABLE(o)          (GTK_CHECK_CAST ((o), GAL_VIEW_ETABLE_TYPE, GalViewEtable))
-#define GAL_VIEW_ETABLE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), GAL_VIEW_ETABLE_TYPE, GalViewEtableClass))
-#define GAL_IS_VIEW_ETABLE(o)       (GTK_CHECK_TYPE ((o), GAL_VIEW_ETABLE_TYPE))
-#define GAL_IS_VIEW_ETABLE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), GAL_VIEW_ETABLE_TYPE))
-
-typedef struct {
-	GalView base;
-
-	ETableSpecification *spec;
-	ETableState         *state;
-	char                *title;
-} GalViewEtable;
-
-typedef struct {
-	GalViewClass parent_class;
-} GalViewEtableClass;
-
-/* Standard functions */
-GtkType  gal_view_etable_get_type   (void);
-GalView *gal_view_etable_new        (ETableSpecification *spec,
-				     const gchar         *title);
-GalView *gal_view_etable_construct  (GalViewEtable       *view,
-				     ETableSpecification *spec,
-				     const gchar         *title);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _GAL_VIEW_ETABLE_H_ */
diff --git a/widgets/menus/gal-view-factory-etable.c b/widgets/menus/gal-view-factory-etable.c
deleted file mode 100644
index 4fddcdc70a..0000000000
--- a/widgets/menus/gal-view-factory-etable.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view-factory.c: A View Factory
- *
- * Authors:
- *   Chris Lahey (clahey@helixcode.com)
- *
- * (C) 2000 Helix Code, Inc.
- */
-#include <config.h>
-#include "gal/util/e-i18n.h"
-#include "gal-view-factory-etable.h"
-#include "gal-view-etable.h"
-
-#define GVFE_CLASS(e) ((GalViewFactoryEtableClass *)((GtkObject *)e)->klass)
-
-#define PARENT_TYPE gal_view_factory_get_type ()
-
-static GalViewFactoryClass *gal_view_factory_etable_parent_class;
-
-static const char *
-gal_view_factory_etable_get_title       (GalViewFactory *factory)
-{
-	return _("Table");
-}
-
-static GalView *
-gal_view_factory_etable_new_view        (GalViewFactory *factory,
-					 const char     *name)
-{
-	return gal_view_etable_new(GAL_VIEW_FACTORY_ETABLE(factory)->spec, name);
-}
-
-static const char *
-gal_view_factory_etable_get_type_code (GalViewFactory *factory)
-{
-	return "etable";
-}
-
-static void
-gal_view_factory_etable_destroy         (GtkObject *object)
-{
-	GalViewFactoryEtable *factory = GAL_VIEW_FACTORY_ETABLE(object);
-
-	if (factory->spec)
-		gtk_object_unref(GTK_OBJECT(factory->spec));
-}
-
-static void
-gal_view_factory_etable_class_init      (GtkObjectClass *object_class)
-{
-	GalViewFactoryClass *view_factory_class = GAL_VIEW_FACTORY_CLASS(object_class);
-	gal_view_factory_etable_parent_class    = gtk_type_class (PARENT_TYPE);
-
-	view_factory_class->get_title           = gal_view_factory_etable_get_title;
-	view_factory_class->new_view            = gal_view_factory_etable_new_view;
-	view_factory_class->get_type_code       = gal_view_factory_etable_get_type_code;
-
-	object_class->destroy                   = gal_view_factory_etable_destroy;
-}
-
-static void
-gal_view_factory_etable_init            (GalViewFactoryEtable *factory)
-{
-	factory->spec = NULL;
-}
-
-/**
- * gal_view_etable_new
- * @spec: The spec to create GalViewEtables based upon.
- *
- * A new GalViewFactory for creating ETable views.  Create one of
- * these and pass it to GalViewCollection for use.
- *
- * Returns: The new GalViewFactoryEtable.
- */
-GalViewFactory *
-gal_view_factory_etable_new        (ETableSpecification  *spec)
-{
-	return gal_view_factory_etable_construct (gtk_type_new (gal_view_factory_etable_get_type ()), spec);
-}
-
-/**
- * gal_view_etable_construct
- * @factory: The factory to construct
- * @spec: The spec to create GalViewEtables based upon.
- *
- * constructs the GalViewFactoryEtable.  To be used by subclasses and
- * language bindings.
- *
- * Returns: The GalViewFactoryEtable.
- */
-GalViewFactory *
-gal_view_factory_etable_construct  (GalViewFactoryEtable *factory,
-				    ETableSpecification  *spec)
-{
-	if (spec)
-		gtk_object_ref(GTK_OBJECT(spec));
-	factory->spec = spec;
-	return GAL_VIEW_FACTORY(factory);
-}
-
-GtkType
-gal_view_factory_etable_get_type  (void)
-{
-	static guint type = 0;
-	
-	if (!type)
-	{
-		GtkTypeInfo info =
-		{
-			"GalViewFactoryEtable",
-			sizeof (GalViewFactoryEtable),
-			sizeof (GalViewFactoryEtableClass),
-			(GtkClassInitFunc) gal_view_factory_etable_class_init,
-			(GtkObjectInitFunc) gal_view_factory_etable_init,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-		
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
diff --git a/widgets/menus/gal-view-factory-etable.h b/widgets/menus/gal-view-factory-etable.h
deleted file mode 100644
index f41697f9f5..0000000000
--- a/widgets/menus/gal-view-factory-etable.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _GAL_VIEW_FACTORY_ETABLE_H_
-#define _GAL_VIEW_FACTORY_ETABLE_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/menus/gal-view-factory.h>
-#include <gal/e-table/e-table-specification.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define GAL_VIEW_FACTORY_ETABLE_TYPE        (gal_view_factory_etable_get_type ())
-#define GAL_VIEW_FACTORY_ETABLE(o)          (GTK_CHECK_CAST ((o), GAL_VIEW_FACTORY_ETABLE_TYPE, GalViewFactoryEtable))
-#define GAL_VIEW_FACTORY_ETABLE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), GAL_VIEW_FACTORY_ETABLE_TYPE, GalViewFactoryEtableClass))
-#define GAL_IS_VIEW_FACTORY_ETABLE(o)       (GTK_CHECK_TYPE ((o), GAL_VIEW_FACTORY_ETABLE_TYPE))
-#define GAL_IS_VIEW_FACTORY_ETABLE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), GAL_VIEW_FACTORY_ETABLE_TYPE))
-
-typedef struct {
-	GalViewFactory base;
-
-	ETableSpecification *spec;
-} GalViewFactoryEtable;
-
-typedef struct {
-	GalViewFactoryClass parent_class;
-} GalViewFactoryEtableClass;
-
-/* Standard functions */
-GtkType         gal_view_factory_etable_get_type   (void);
-GalViewFactory *gal_view_factory_etable_new        (ETableSpecification  *spec);
-GalViewFactory *gal_view_factory_etable_construct  (GalViewFactoryEtable *factory,
-						    ETableSpecification  *spec);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _GAL_VIEW_FACTORY_ETABLE_H_ */
diff --git a/widgets/menus/gal-view-factory.c b/widgets/menus/gal-view-factory.c
deleted file mode 100644
index 569dc59b92..0000000000
--- a/widgets/menus/gal-view-factory.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view-factory.c: A View Factory
- *
- * Authors:
- *   Chris Lahey (clahey@helixcode.com)
- *
- * (C) 2000 Helix Code, Inc.
- */
-#include <config.h>
-#include "gal-view-factory.h"
-
-#define GVF_CLASS(e) ((GalViewFactoryClass *)((GtkObject *)e)->klass)
-
-#define PARENT_TYPE gtk_object_get_type ()
-
-#define d(x)
-
-d(static gint depth = 0);
-
-static GtkObjectClass *gal_view_factory_parent_class;
-
-/**
- * gal_view_factory_get_title:
- * @factory: The factory to query.
- *
- * Returns: The title of the factory.
- */
-const char *
-gal_view_factory_get_title       (GalViewFactory *factory)
-{
-	g_return_val_if_fail (factory != NULL, 0);
-	g_return_val_if_fail (GAL_IS_VIEW_FACTORY (factory), 0);
-
-	if (GVF_CLASS (factory)->get_title)
-		return GVF_CLASS (factory)->get_title (factory);
-	else
-		return NULL;
-}
-
-/**
- * gal_view_factory_new_view:
- * @factory: The factory to use
- * @name: the name for the view.
- *
- * Returns: The new view
- */
-GalView *
-gal_view_factory_new_view        (GalViewFactory *factory,
-				  const char     *name)
-{
-	g_return_val_if_fail (factory != NULL, NULL);
-	g_return_val_if_fail (GAL_IS_VIEW_FACTORY (factory), NULL);
-
-	if (GVF_CLASS (factory)->new_view)
-		return GVF_CLASS (factory)->new_view (factory, name);
-	else
-		return NULL;
-}
-
-/**
- * gal_view_factory_get_type_code:
- * @factory: The factory to use
- *
- * Returns: The type code
- */
-const char *
-gal_view_factory_get_type_code (GalViewFactory *factory)
-{
-	g_return_val_if_fail (factory != NULL, NULL);
-	g_return_val_if_fail (GAL_IS_VIEW_FACTORY (factory), NULL);
-
-	if (GVF_CLASS (factory)->get_type_code)
-		return GVF_CLASS (factory)->get_type_code (factory);
-	else
-		return NULL;
-}
-
-static void
-gal_view_factory_class_init      (GtkObjectClass *object_class)
-{
-	GalViewFactoryClass *klass = GAL_VIEW_FACTORY_CLASS(object_class);
-	gal_view_factory_parent_class = gtk_type_class (PARENT_TYPE);
-	
-	klass->get_title = NULL;     
-	klass->new_view  = NULL;     
-}
-
-GtkType
-gal_view_factory_get_type        (void)
-{
-	static guint type = 0;
-	
-	if (!type)
-	{
-		GtkTypeInfo info =
-		{
-			"GalViewFactory",
-			sizeof (GalViewFactory),
-			sizeof (GalViewFactoryClass),
-			(GtkClassInitFunc) gal_view_factory_class_init,
-			NULL,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-		
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
diff --git a/widgets/menus/gal-view-factory.h b/widgets/menus/gal-view-factory.h
deleted file mode 100644
index dd828145e5..0000000000
--- a/widgets/menus/gal-view-factory.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _GAL_VIEW_FACTORY_H_
-#define _GAL_VIEW_FACTORY_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/menus/gal-view.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define GAL_VIEW_FACTORY_TYPE        (gal_view_factory_get_type ())
-#define GAL_VIEW_FACTORY(o)          (GTK_CHECK_CAST ((o), GAL_VIEW_FACTORY_TYPE, GalViewFactory))
-#define GAL_VIEW_FACTORY_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), GAL_VIEW_FACTORY_TYPE, GalViewFactoryClass))
-#define GAL_IS_VIEW_FACTORY(o)       (GTK_CHECK_TYPE ((o), GAL_VIEW_FACTORY_TYPE))
-#define GAL_IS_VIEW_FACTORY_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), GAL_VIEW_FACTORY_TYPE))
-
-typedef struct {
-	GtkObject base;
-} GalViewFactory;
-
-typedef struct {
-	GtkObjectClass parent_class;
-
-	/*
-	 * Virtual methods
-	 */
-	const char *(*get_title)      (GalViewFactory *factory);
-	const char *(*get_type_code)  (GalViewFactory *factory);
-	GalView    *(*new_view)       (GalViewFactory *factory,
-				       const char     *name);
-} GalViewFactoryClass;
-
-/* Standard functions */
-GtkType     gal_view_factory_get_type       (void);
-
-/* Query functions */
-/* Returns already translated title. */
-const char *gal_view_factory_get_title      (GalViewFactory *factory);
-
-/* Returns the code for use in identifying this type of object in the
- * view list.  This identifier should identify this as being the
- * unique factory for xml files which were written out with this
- * identifier.  Thus each factory should have a unique type code.  */
-const char *gal_view_factory_get_type_code  (GalViewFactory *factory);
-
-/* Create a new view */
-GalView    *gal_view_factory_new_view       (GalViewFactory *factory,
-					     const char     *name);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* _GAL_VIEW_FACTORY_H_ */
diff --git a/widgets/menus/gal-view-menus.c b/widgets/menus/gal-view-menus.c
deleted file mode 100644
index 3e81b59aee..0000000000
--- a/widgets/menus/gal-view-menus.c
+++ /dev/null
@@ -1,331 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view-menus.c: Deploy a GalViewCollection in the menus.
- *
- * Author:
- *   Chris Lahey <clahey@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#include <config.h>
-
-#include "gal-view-menus.h"
-
-#include <stdlib.h>
-#include <gtk/gtksignal.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnome/gnome-i18n.h>
-#include <gal/util/e-util.h>
-#include <gal/util/e-xml-utils.h>
-#include <gal/menus/gal-define-views-dialog.h>
-#include <gal/widgets/e-unicode.h>
-#include <e-util/e-list.h>
-
-struct _GalViewMenusPrivate {
-	GalViewCollection *collection;
-	int collection_changed_id;
-	BonoboUIVerb *verbs;
-	BonoboUIComponent *component;
-	EList *listenerClosures;
-};
-
-typedef struct {
-	GalViewCollection *collection;
-	GalView *view;
-	const char *id;
-} ListenerClosure;
-
-#define PARENT_TYPE (gtk_object_get_type())
-
-static GtkObjectClass *gvm_parent_class;
-static void collection_changed (GalViewCollection *collection,
-				GalViewMenus *gvm);
-
-#define d(x)
-
-static void
-free_verbs (GalViewMenus *gvm)
-{
-	if (gvm->priv->verbs) {
-		g_free(gvm->priv->verbs->cname);
-		g_free(gvm->priv->verbs);
-	}
-	gvm->priv->verbs = NULL;
-}
-
-static void
-closure_free (void *data, void *user_data)
-{
-	ListenerClosure *closure = data;
-	GalViewMenus *gvm = user_data;
-
-	gtk_object_ref(GTK_OBJECT(closure->view));
-	gtk_object_ref(GTK_OBJECT(closure->collection));
-
-	bonobo_ui_component_remove_listener (gvm->priv->component, closure->id);
-
-	g_free (closure);
-}
-
-static void
-remove_listeners (GalViewMenus *gvm)
-{
-	if (gvm->priv->listenerClosures) {
-		gtk_object_unref (GTK_OBJECT(gvm->priv->listenerClosures));
-	}
-	gvm->priv->listenerClosures = NULL;
-}
-
-static void
-remove_xml (GalViewMenus *gvm)
-{
-}
-
-static void
-gvm_destroy (GtkObject *object)
-{
-	GalViewMenus *gvm = GAL_VIEW_MENUS (object);
-
-	if (gvm->priv->collection && gvm->priv->collection_changed_id != 0) {
-		gtk_signal_disconnect(GTK_OBJECT(gvm->priv->collection), gvm->priv->collection_changed_id);
-		gvm->priv->collection_changed_id = 0;
-	}
-
-	if (gvm->priv->collection)
-		gtk_object_unref(GTK_OBJECT(gvm->priv->collection));
-
-	free_verbs(gvm);
-	remove_xml(gvm);
-	remove_listeners(gvm);
-	g_free(gvm->priv);
-	gvm->priv = NULL;
-
-	GTK_OBJECT_CLASS (gvm_parent_class)->destroy (object);
-}
-
-static void
-gvm_class_init (GtkObjectClass *klass)
-{
-	gvm_parent_class = gtk_type_class (PARENT_TYPE);
-	
-	klass->destroy = gvm_destroy;
-}
-
-static void
-gvm_init (GalViewMenus *gvm)
-{
-	gvm->priv = g_new(GalViewMenusPrivate, 1);
-	gvm->priv->collection = NULL;
-	gvm->priv->collection_changed_id = 0;
-	gvm->priv->verbs = NULL;
-	gvm->priv->component = NULL;
-	gvm->priv->listenerClosures = NULL;
-}
-
-E_MAKE_TYPE(gal_view_menus, "GalViewMenus", GalViewMenus, gvm_class_init, gvm_init, PARENT_TYPE);
-
-GalViewMenus *
-gal_view_menus_new (GalViewCollection *collection)
-{
-	GalViewMenus *gvm;
-
-	g_return_val_if_fail (collection != NULL, NULL);
-	g_return_val_if_fail (GAL_IS_VIEW_COLLECTION (collection), NULL);
-
-	gvm = gtk_type_new (GAL_VIEW_MENUS_TYPE);
-	gal_view_menus_construct(gvm, collection);
-
-	return gvm;
-}
-
-GalViewMenus *
-gal_view_menus_construct (GalViewMenus      *gvm,
-			  GalViewCollection *collection)
-{
-	g_return_val_if_fail (gvm != NULL, NULL);
-	g_return_val_if_fail (GAL_IS_VIEW_MENUS (gvm), NULL);
-	g_return_val_if_fail (collection != NULL, NULL);
-	g_return_val_if_fail (GAL_IS_VIEW_COLLECTION (collection), NULL);
-
-	gtk_object_ref(GTK_OBJECT(collection));
-	gvm->priv->collection = collection;
-	gvm->priv->collection_changed_id = gtk_signal_connect (
-		GTK_OBJECT(collection), "changed",
-		GTK_SIGNAL_FUNC(collection_changed), gvm);
-
-	return gvm;
-}
-
-static void
-dialog_clicked(GtkWidget *dialog, int button, GalViewMenus *menus)
-{
-	if (button == 0) {
-		gal_view_collection_save(menus->priv->collection);
-	}
-	gnome_dialog_close(GNOME_DIALOG(dialog));
-}
-
-static void
-define_views(BonoboUIComponent *component,
-	     GalViewMenus      *menus,
-	     char              *cname)
-{
-	GtkWidget *dialog = gal_define_views_dialog_new(menus->priv->collection);
-	gtk_signal_connect(GTK_OBJECT(dialog), "clicked",
-			   GTK_SIGNAL_FUNC(dialog_clicked), menus);
-	gtk_widget_show(dialog);
-}
-
-static void
-toggled_cb (BonoboUIComponent *component,
-	    const char *path,
-	    Bonobo_UIComponent_EventType type,
-	    const char *state,
-	    gpointer user_data)
-{
-	ListenerClosure *closure = user_data;
-
-	/* do nothing on state change to untoggled */
-	if (!strcmp (state, "0"))
-		return;
-
-	gal_view_collection_display_view(closure->collection, closure->view);
-}
-
-static char *
-build_menus(GalViewMenus *menus)
-{
-	BonoboUINode *root, *menu, *submenu, *place, *menuitem;
-	char *xml;
-	xmlChar *string;
-	int length;
-	int i;
-	GalViewCollection *collection = menus->priv->collection;
-
-	root = bonobo_ui_node_new("Root");
-	menu = bonobo_ui_node_new_child(root, "menu");
-
-	submenu = bonobo_ui_node_new_child(menu, "submenu");
-	bonobo_ui_node_set_attr(submenu, "name", "View");
-
-	place = bonobo_ui_node_new_child(submenu, "placeholder");
-	bonobo_ui_node_set_attr(place, "name", "ViewBegin");
-	
-	submenu = bonobo_ui_node_new_child(place, "submenu");
-	bonobo_ui_node_set_attr(submenu, "name", "CurrentView");
-	bonobo_ui_node_set_attr(submenu, "_label", N_("_Current View"));
-
-	length = gal_view_collection_get_count(collection);
-
-	menus->priv->listenerClosures = e_list_new (NULL, closure_free, menus);
-
-	for (i = 0; i < length; i++) {
-		char *label;
-		GalViewCollectionItem *item = gal_view_collection_get_view_item(collection, i);
-		ListenerClosure *closure;
-
-		menuitem = bonobo_ui_node_new_child(submenu, "menuitem");
-		bonobo_ui_node_set_attr(menuitem, "name", item->id);
-		bonobo_ui_node_set_attr(menuitem, "id", item->id);
-		bonobo_ui_node_set_attr(menuitem, "group", "GalViewMenus");
-		bonobo_ui_node_set_attr(menuitem, "type", "radio");
-
-		/* bonobo displays this string so it must be in locale */
-		label = e_utf8_to_locale_string(item->title);
-		/* All labels are bonobo_ui_util_decode_str()ed,
-		 * so even translated label must be set with _label */
-		bonobo_ui_node_set_attr(menuitem, "_label", label);
-		g_free(label);
-
-		closure = g_new (ListenerClosure, 1);
-		closure->collection   = collection;
-		closure->view         = item->view;
-		closure->id           = item->id;
-
-		gtk_object_ref(GTK_OBJECT(closure->view));
-		gtk_object_ref(GTK_OBJECT(closure->collection));
-
-		bonobo_ui_component_add_listener (menus->priv->component, item->id, toggled_cb, closure);
-
-		e_list_append (menus->priv->listenerClosures, closure);
-	}
-
-	menuitem = bonobo_ui_node_new_child(submenu, "separator");
-
-	menuitem = bonobo_ui_node_new_child(submenu, "menuitem");
-	bonobo_ui_node_set_attr(menuitem, "name", "DefineViews");
-	bonobo_ui_node_set_attr(menuitem, "_label", N_("Define Views"));
-	bonobo_ui_node_set_attr(menuitem, "verb", "DefineViews");
-
-	string = bonobo_ui_node_to_string(root, TRUE);
-	xml = g_strdup(string);
-	bonobo_ui_node_free_string(string);
-
-	bonobo_ui_node_free(root);
-
-	d(g_print (xml));
-
-	return xml;
-}
-
-static BonoboUIVerb *
-build_verbs (GalViewMenus *menus)
-{
-	BonoboUIVerb *verbs = g_new(BonoboUIVerb, 2);
-	BonoboUIVerb *verb;
-	
-	verb            = verbs;
-	verb->cname     = g_strdup("DefineViews");
-	verb->cb        = (BonoboUIVerbFn) define_views;
-	verb->user_data = menus;
-	verb->dummy     = NULL;
-	verb ++;
-
-	verb->cname     = NULL;
-	verb->cb        = NULL;
-	verb->user_data = NULL;
-	verb->dummy     = NULL;
-	verb++;
-
-	return verbs;
-}
-
-static void
-build_stuff (GalViewMenus      *gvm,
-	     CORBA_Environment *ev)
-{
-	char *xml;
-
-	remove_xml(gvm);
-	remove_listeners(gvm);
-	xml = build_menus(gvm);
-	bonobo_ui_component_set_translate(gvm->priv->component, "/", xml, ev);
-	g_free(xml);
-
-	free_verbs(gvm);
-	gvm->priv->verbs = build_verbs(gvm);
-	bonobo_ui_component_add_verb_list(gvm->priv->component, gvm->priv->verbs);
-}
-
-void
-gal_view_menus_apply     (GalViewMenus      *gvm,
-			  BonoboUIComponent *component,
-			  CORBA_Environment *ev)
-{
-	gvm->priv->component = component;
-
-	build_stuff (gvm, ev);
-}
-
-static void
-collection_changed (GalViewCollection *collection,
-		    GalViewMenus *gvm)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-	build_stuff(gvm, &ev);
-	CORBA_exception_free (&ev);
-}
diff --git a/widgets/menus/gal-view-menus.h b/widgets/menus/gal-view-menus.h
deleted file mode 100644
index bc62d82f54..0000000000
--- a/widgets/menus/gal-view-menus.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _GAL_VIEW_MENUS_H_
-#define _GAL_VIEW_MENUS_H_
-
-#include <gtk/gtkobject.h>
-#include <gnome-xml/tree.h>
-#include <bonobo/bonobo-ui-component.h>
-#include <gal/menus/gal-view-collection.h>
-
-#define GAL_VIEW_MENUS_TYPE        (gal_view_menus_get_type ())
-#define GAL_VIEW_MENUS(o)          (GTK_CHECK_CAST ((o), GAL_VIEW_MENUS_TYPE, GalViewMenus))
-#define GAL_VIEW_MENUS_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), GAL_VIEW_MENUS_TYPE, GalViewMenusClass))
-#define GAL_IS_VIEW_MENUS(o)       (GTK_CHECK_TYPE ((o), GAL_VIEW_MENUS_TYPE))
-#define GAL_IS_VIEW_MENUS_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), GAL_VIEW_MENUS_TYPE))
-
-typedef struct _GalViewMenusPrivate GalViewMenusPrivate;
-
-typedef struct {
-	GtkObject base;
-	GalViewMenusPrivate *priv;
-} GalViewMenus;
-
-typedef struct {
-	GtkObjectClass parent_class;
-} GalViewMenusClass;
-
-GtkType       gal_view_menus_get_type   (void);
-GalViewMenus *gal_view_menus_new        (GalViewCollection *collection);
-GalViewMenus *gal_view_menus_construct  (GalViewMenus      *menus,
-					 GalViewCollection *collection);
-
-void          gal_view_menus_apply      (GalViewMenus      *menus,
-					 BonoboUIComponent *component,
-					 CORBA_Environment *ev);
-
-#endif /* _GAL_VIEW_MENUS_H_ */
diff --git a/widgets/menus/gal-view-new-dialog.c b/widgets/menus/gal-view-new-dialog.c
deleted file mode 100644
index 4b7d298fb6..0000000000
--- a/widgets/menus/gal-view-new-dialog.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* gal-view-new-dialog.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-stock.h>
-#include "gal-view-new-dialog.h"
-#include "gal-define-views-model.h"
-#include <gal/widgets/e-unicode.h>
-#include <gal/e-table/e-table-scrolled.h>
-
-static void gal_view_new_dialog_init		(GalViewNewDialog		 *card);
-static void gal_view_new_dialog_class_init	(GalViewNewDialogClass	 *klass);
-static void gal_view_new_dialog_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void gal_view_new_dialog_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void gal_view_new_dialog_destroy (GtkObject *object);
-
-static GnomeDialogClass *parent_class = NULL;
-#define PARENT_TYPE gnome_dialog_get_type()
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_NAME,
-	ARG_FACTORY,
-};
-
-GtkType
-gal_view_new_dialog_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type) {
-		static const GtkTypeInfo info =
-		{
-			"GalViewNewDialog",
-			sizeof (GalViewNewDialog),
-			sizeof (GalViewNewDialogClass),
-			(GtkClassInitFunc) gal_view_new_dialog_class_init,
-			(GtkObjectInitFunc) gal_view_new_dialog_init,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-static void
-gal_view_new_dialog_class_init (GalViewNewDialogClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass*) klass;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->set_arg = gal_view_new_dialog_set_arg;
-	object_class->get_arg = gal_view_new_dialog_get_arg;
-	object_class->destroy = gal_view_new_dialog_destroy;
-
-	gtk_object_add_arg_type ("GalViewNewDialog::name", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_NAME);
-	gtk_object_add_arg_type ("GalViewNewDialog::factory", GTK_TYPE_OBJECT,
-				 GTK_ARG_READABLE, ARG_FACTORY);
-}
-
-static void
-gal_view_new_dialog_init (GalViewNewDialog *dialog)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-
-	gui = glade_xml_new_with_domain (GAL_GLADEDIR "/gal-view-new-dialog.glade", NULL, PACKAGE);
-	dialog->gui = gui;
-
-	widget = glade_xml_get_widget(gui, "table-top");
-	if (!widget) {
-		return;
-	}
-	gtk_widget_ref(widget);
-	gtk_widget_unparent(widget);
-	gtk_box_pack_start(GTK_BOX(GNOME_DIALOG(dialog)->vbox), widget, TRUE, TRUE, 0);
-	gtk_widget_unref(widget);
-
-	gnome_dialog_append_buttons(GNOME_DIALOG(dialog),
-				    GNOME_STOCK_BUTTON_OK,
-				    GNOME_STOCK_BUTTON_CANCEL,
-				    NULL);
-
-	gtk_window_set_policy(GTK_WINDOW(dialog), FALSE, TRUE, FALSE);
-
-	dialog->collection = NULL;
-	dialog->selected_factory = NULL;
-}
-
-static void
-gal_view_new_dialog_destroy (GtkObject *object) {
-	GalViewNewDialog *gal_view_new_dialog = GAL_VIEW_NEW_DIALOG(object);
-	
-	gtk_object_unref(GTK_OBJECT(gal_view_new_dialog->gui));
-}
-
-GtkWidget*
-gal_view_new_dialog_new (GalViewCollection *collection)
-{
-	GtkWidget *widget =
-		gal_view_new_dialog_construct(gtk_type_new (gal_view_new_dialog_get_type ()),
-					      collection);
-	return widget;
-}
-
-
-static void
-gal_view_new_dialog_select_row_callback(GtkCList *list,
-					gint row,
-					gint column,
-					GdkEventButton *event,
-					GalViewNewDialog *dialog)
-{
-	dialog->selected_factory = gtk_clist_get_row_data(list,
-							  row);
-}
-
-GtkWidget*
-gal_view_new_dialog_construct (GalViewNewDialog  *dialog,
-			       GalViewCollection *collection)
-{
-	GtkWidget *list = glade_xml_get_widget(dialog->gui,
-					       "clist-type-list");
-	GList *iterator;
-	dialog->collection = collection;
-
-	iterator = dialog->collection->factory_list;
-
-	for ( ; iterator; iterator = g_list_next(iterator) ) {
-		GalViewFactory *factory = iterator->data;
-		char *text[1];
-		int row;
-
-		gtk_object_ref(GTK_OBJECT(factory));
-		text[0] = (char *) gal_view_factory_get_title(factory);
-		row = gtk_clist_append(GTK_CLIST(list), text);
-		gtk_clist_set_row_data(GTK_CLIST(list), row, factory);
-	}
-
-	gtk_signal_connect(GTK_OBJECT (list),
-			   "select_row",
-			   GTK_SIGNAL_FUNC(gal_view_new_dialog_select_row_callback),
-			   dialog);
-
-	return GTK_WIDGET(dialog);
-}
-
-static void
-gal_view_new_dialog_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GalViewNewDialog *dialog;
-	GtkWidget *entry;
-
-	dialog = GAL_VIEW_NEW_DIALOG (o);
-	
-	switch (arg_id){
-	case ARG_NAME:
-		entry = glade_xml_get_widget(dialog->gui, "entry-name");
-		if (entry && GTK_IS_EDITABLE(entry)) {
-			e_utf8_gtk_editable_set_text(GTK_EDITABLE(entry), GTK_VALUE_STRING(*arg));
-		}
-		break;
-	default:
-		return;
-	}
-}
-
-static void
-gal_view_new_dialog_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	GalViewNewDialog *dialog;
-	GtkWidget *entry;
-
-	dialog = GAL_VIEW_NEW_DIALOG (object);
-
-	switch (arg_id) {
-	case ARG_NAME:
-		entry = glade_xml_get_widget(dialog->gui, "entry-name");
-		if (entry && GTK_IS_EDITABLE(entry)) {
-			GTK_VALUE_STRING(*arg) = e_utf8_gtk_editable_get_text(GTK_EDITABLE(entry));
-		}
-		break;
-	case ARG_FACTORY:
-		GTK_VALUE_OBJECT(*arg) = dialog->selected_factory ? GTK_OBJECT(dialog->selected_factory) : NULL;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
diff --git a/widgets/menus/gal-view-new-dialog.glade b/widgets/menus/gal-view-new-dialog.glade
deleted file mode 100644
index 173fa6c3af..0000000000
--- a/widgets/menus/gal-view-new-dialog.glade
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>gal-view-new-dialog</name>
-  <program_name>gal-view-new-dialog</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <gnome_help_support>True</gnome_help_support>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog1</name>
-  <visible>False</visible>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table-top</name>
-      <rows>4</rows>
-      <columns>1</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>6</row_spacing>
-      <column_spacing>6</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label1</name>
-	<label>Name of new view:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-name</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-name</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label2</name>
-	<label>Type of view:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkScrolledWindow</class>
-	<name>scrolledwindow1</name>
-	<hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
-	<vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>True</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkCList</class>
-	  <name>clist-type-list</name>
-	  <can_focus>True</can_focus>
-	  <columns>1</columns>
-	  <column_widths>80</column_widths>
-	  <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-	  <show_titles>False</show_titles>
-	  <shadow_type>GTK_SHADOW_IN</shadow_type>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <child_name>CList:title</child_name>
-	    <name>label5</name>
-	    <label>label5</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/widgets/menus/gal-view-new-dialog.h b/widgets/menus/gal-view-new-dialog.h
deleted file mode 100644
index 87e187f400..0000000000
--- a/widgets/menus/gal-view-new-dialog.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* gal-view-new-dialog.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __GAL_VIEW_NEW_DIALOG_H__
-#define __GAL_VIEW_NEW_DIALOG_H__
-
-#include <glade/glade.h>
-#include <gal-view-collection.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* GalViewNewDialog - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- */
-
-#define GAL_VIEW_NEW_DIALOG_TYPE			(gal_view_new_dialog_get_type ())
-#define GAL_VIEW_NEW_DIALOG(obj)			(GTK_CHECK_CAST ((obj), GAL_VIEW_NEW_DIALOG_TYPE, GalViewNewDialog))
-#define GAL_VIEW_NEW_DIALOG_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), GAL_VIEW_NEW_DIALOG_TYPE, GalViewNewDialogClass))
-#define GAL_IS_VIEW_NEW_DIALOG(obj)		(GTK_CHECK_TYPE ((obj), GAL_VIEW_NEW_DIALOG_TYPE))
-#define GAL_IS_VIEW_NEW_DIALOG_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), GAL_VIEW_NEW_DIALOG_TYPE))
-
-typedef struct _GalViewNewDialog       GalViewNewDialog;
-typedef struct _GalViewNewDialogClass  GalViewNewDialogClass;
-
-struct _GalViewNewDialog
-{
-	GnomeDialog parent;
-	
-	/* item specific fields */
-	GladeXML *gui;
-
-	GalViewCollection *collection;
-	GalViewFactory *selected_factory;
-};
-
-struct _GalViewNewDialogClass
-{
-	GnomeDialogClass parent_class;
-};
-
-GtkWidget *gal_view_new_dialog_new        (GalViewCollection *collection);
-GtkType    gal_view_new_dialog_get_type   (void);
-
-GtkWidget *gal_view_new_dialog_construct  (GalViewNewDialog  *dialog,
-					   GalViewCollection *collection);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __GAL_VIEW_NEW_DIALOG_H__ */
diff --git a/widgets/menus/gal-view.c b/widgets/menus/gal-view.c
deleted file mode 100644
index f48a6f0026..0000000000
--- a/widgets/menus/gal-view.c
+++ /dev/null
@@ -1,210 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view.c: A View
- *
- * Authors:
- *   Chris Lahey (clahey@helixcode.com)
- *
- * (C) 2000 Helix Code, Inc.
- */
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "gal-view.h"
-
-#define GV_CLASS(e) ((GalViewClass *)((GtkObject *)e)->klass)
-
-#define PARENT_TYPE gtk_object_get_type ()
-
-#define d(x)
-
-d(static gint depth = 0);
-
-
-static GtkObjectClass *gal_view_parent_class;
-
-enum {
-	CHANGED,
-	LAST_SIGNAL
-};
-
-static guint gal_view_signals [LAST_SIGNAL] = { 0, };
-
-/**
- * gal_view_edit
- * @view: The view to edit
- */
-void
-gal_view_edit            (GalView *view)
-{
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (GAL_IS_VIEW (view));
-
-	if (GV_CLASS (view)->edit)
-		GV_CLASS (view)->edit (view);
-}
-
-/**
- * gal_view_load
- * @view: The view to load to
- * @filename: The file to load from
- */
-void  
-gal_view_load  (GalView *view,
-		const char *filename)
-{
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (GAL_IS_VIEW (view));
-
-	if (GV_CLASS (view)->load)
-		GV_CLASS (view)->load (view, filename);
-}
-
-/**
- * gal_view_save
- * @view: The view to save
- * @filename: The file to save to
- */
-void
-gal_view_save    (GalView *view,
-		  const char *filename)
-{
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (GAL_IS_VIEW (view));
-
-	if (GV_CLASS (view)->save)
-		GV_CLASS (view)->save (view, filename);
-}
-
-/**
- * gal_view_get_title
- * @view: The view to query.
- *
- * Returns: The title of the view.
- */
-const char *
-gal_view_get_title       (GalView *view)
-{
-	g_return_val_if_fail (view != NULL, NULL);
-	g_return_val_if_fail (GAL_IS_VIEW (view), NULL);
-
-	if (GV_CLASS (view)->get_title)
-		return GV_CLASS (view)->get_title (view);
-	else
-		return NULL;
-}
-
-/**
- * gal_view_set_title
- * @view: The view to set.
- * @title: The new title value.
- */
-void
-gal_view_set_title       (GalView *view,
-			  const char *title)
-{
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (GAL_IS_VIEW (view));
-
-	if (GV_CLASS (view)->set_title)
-		GV_CLASS (view)->set_title (view, title);
-}
-
-/**
- * gal_view_get_type_code
- * @view: The view to get.
- *
- * Returns: The type of the view.
- */
-const char *
-gal_view_get_type_code (GalView *view)
-{
-	g_return_val_if_fail (view != NULL, NULL);
-	g_return_val_if_fail (GAL_IS_VIEW (view), NULL);
-
-	if (GV_CLASS (view)->get_type_code)
-		return GV_CLASS (view)->get_type_code (view);
-	else
-		return NULL;
-}
-
-/**
- * gal_view_clone
- * @view: The view to clone.
- *
- * Returns: The clone.
- */
-GalView *
-gal_view_clone       (GalView *view)
-{
-	g_return_val_if_fail (view != NULL, NULL);
-	g_return_val_if_fail (GAL_IS_VIEW (view), NULL);
-
-	if (GV_CLASS (view)->clone)
-		return GV_CLASS (view)->clone (view);
-	else
-		return NULL;
-}
-
-/**
- * gal_view_changed
- * @view: The view that changed.
- */
-void
-gal_view_changed       (GalView *view)
-{
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (GAL_IS_VIEW (view));
-
-	gtk_signal_emit(GTK_OBJECT(view),
-			 gal_view_signals [CHANGED]);
-}
-
-static void
-gal_view_class_init      (GtkObjectClass *object_class)
-{
-	GalViewClass *klass   = GAL_VIEW_CLASS(object_class);
-	gal_view_parent_class = gtk_type_class (PARENT_TYPE);
-	
-	klass->edit           = NULL;     
-	klass->load           = NULL;     
-	klass->save           = NULL;     
-	klass->get_title      = NULL;     
-	klass->clone          = NULL;
-
-	klass->changed        = NULL;
-
-	gal_view_signals [CHANGED] =
-		gtk_signal_new ("changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (GalViewClass, changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, gal_view_signals, LAST_SIGNAL);
-}
-
-GtkType
-gal_view_get_type        (void)
-{
-	static guint type = 0;
-	
-	if (!type)
-	{
-		GtkTypeInfo info =
-		{
-			"GalView",
-			sizeof (GalView),
-			sizeof (GalViewClass),
-			(GtkClassInitFunc) gal_view_class_init,
-			NULL,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-		
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
diff --git a/widgets/menus/gal-view.h b/widgets/menus/gal-view.h
deleted file mode 100644
index 5cc7cc679c..0000000000
--- a/widgets/menus/gal-view.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _GAL_VIEW_H_
-#define _GAL_VIEW_H_
-
-#include <gtk/gtkobject.h>
-#include <gnome-xml/tree.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define GAL_VIEW_TYPE        (gal_view_get_type ())
-#define GAL_VIEW(o)          (GTK_CHECK_CAST ((o), GAL_VIEW_TYPE, GalView))
-#define GAL_VIEW_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), GAL_VIEW_TYPE, GalViewClass))
-#define GAL_IS_VIEW(o)       (GTK_CHECK_TYPE ((o), GAL_VIEW_TYPE))
-#define GAL_IS_VIEW_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), GAL_VIEW_TYPE))
-
-typedef struct {
-	GtkObject base;
-} GalView;
-
-typedef struct {
-	GtkObjectClass parent_class;
-
-	/*
-	 * Virtual methods
-	 */
-	void        (*edit)           (GalView    *view);
-	void        (*load)           (GalView    *view,
-				       const char *filename);
-	void        (*save)           (GalView    *view,
-				       const char *filename);
-	const char *(*get_title)      (GalView    *view);
-	void        (*set_title)      (GalView    *view,
-				       const char *title);
-	const char *(*get_type_code)  (GalView    *view);
-	GalView    *(*clone)          (GalView    *view);
-
-	/* Signals */
-	void        (*changed)        (GalView    *view);
-} GalViewClass;
-
-/* Standard functions */
-GtkType     gal_view_get_type       (void);
-
-/* Open an editor dialog for this view. */
-void        gal_view_edit           (GalView    *view);
-
-/* xml load and save functions */
-void        gal_view_load           (GalView    *view,
-				     const char *filename);
-void        gal_view_save           (GalView    *view,
-				     const char *filename);
-
-/* Title functions */
-const char *gal_view_get_title      (GalView    *view);
-void        gal_view_set_title      (GalView    *view,
-				     const char *title);
-
-/* View type. */
-const char *gal_view_get_type_code  (GalView    *view);
-
-/* Cloning the view */
-GalView    *gal_view_clone          (GalView    *view);
-
-/* Changed signal */
-void        gal_view_changed        (GalView    *view);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _GAL_VIEW_H_ */
diff --git a/widgets/misc/.cvsignore b/widgets/misc/.cvsignore
deleted file mode 100644
index f7ea0db71c..0000000000
--- a/widgets/misc/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-test-title-bar
-test-calendar
-test-dateedit
-test-dropdown-button
\ No newline at end of file
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
deleted file mode 100644
index 7f0c9f1a01..0000000000
--- a/widgets/misc/ChangeLog
+++ /dev/null
@@ -1,539 +0,0 @@
-2001-07-24  Damon Chaplin  <damon@ximian.com>
-
-	* e-calendar-item.c (e_calendar_item_show_popup_menu): don't show the
-	year in the popup submenu for the months, and center the months.
-	Fixes
-
-2001-07-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-filter-bar.c (rule_editor_destroyed): When the dialog gets
-	closed, always make sure the entry widget becomes sensitive again.
-	(menubar_activated): Don't use FILTER_SOURCE_INCOMING because
-	that's not what we want, we want (I think) NULL (at least with
-	NULL, bug #4490 goes away).
-
-2001-07-16  Federico Mena Quintero  <federico@ximian.com>
-
-	Fixes bug #2901.
-
-	* e-dateedit.c (e_date_edit_parse_date): Use e_time_parse_date().
-	(e_date_edit_parse_time): Use e_time_parse_time().
-
-2001-07-17  jacob berkman  <jacob@ximian.com>
-
-	* e-search-bar.c (set_dropdown): don't unset _CAN_FOCUS
-
-	* e-dropdown-button.c (menu_deactivate_cb): un-toggle ourself
-	(impl_toggled): override the toggled rather than clicked signal.
-	if we are active, popup the menu; else, popdown
-
-	these fix ximian #2016
-
-2001-07-02  Damon Chaplin  <damon@ximian.com>
-
-	* e-calendar-item.c: 
-	* e-cell-date-edit.c: 
-	* e-dateedit.c: added functions to set a callback to get the current
-	time, which is used instead of localtime(). We need this as we have to
-	use our own timezones.
-
-2001-07-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-charset-picker.c (e_charset_picker_bonobo_ui_populate): Take a
-	callback function and user_data so that we can add listeners to
-	each of the menu items.
-
-2001-07-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Updated to build e-charset-picker.c
-
-	* e-charset-picker.[c,h]: Moved here from gal.
-	(e_charset_picker_bonobo_ui_populate): New function to populate a
-	bonobo-ui with a charset picker menu.
-
-2001-06-14  Damon Chaplin  <damon@ximian.com>
-
-	* e-map.[hc]: copied the EMap widget verbatim from Ximian Setup Tools.
-	Hmm. Maybe it should go in gal, but its not a very general widget.
-	
-	* Makefile.am (INCLUDES): defined MAP_DIR for e-map.c.
-	(libemiscwidgets_a_SOURCES): added e-map.[hc].
-
-2001-05-31  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-dropdown-button.c (impl_button_press_event): Removed unused
-	variable.
-
-	* e-cell-date-edit.c (e_cell_date_edit_rebuild_time_list): Removed
-	unused variable.
-
-2001-05-07  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* misc/e-filter-bar.h: xgettext does not find N_() in #defines. So
-	created fake enum. Also removed spaces before "..."
-
-2001-04-24  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-calendar-item.c, e-calendar.c, e-cell-date-edit.c,
-	e-clipped-label.c, e-dateedit.c, e-dropdown-button: 
-	Added #include <glib.h> and moved corresponding local headers 
-	to the top.
-	
-2001-04-15  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-search-bar.c (e_search_bar_get_option_choice): New function,
-	because it is ridiculous to have to hunt down object arguments to
-	fetch values.
-	(e_search_bar_get_text): Likewise.
-	(impl_get_arg): Use the functions above so that we have to
-	maintain only one version of the getters.
-
-2001-04-04  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-calendar.c: More header fixes.
-	* e-cell-date-edit.c: Same.
-	* e-dateedit.[ch]: Same.
-	* e-title-bar.c: Same here.
-	* e-search-bar.c: More header fixes.
-	* test-calendar.c: Same here.
-	
-2001-03-29  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-dropdown-button.c: Replace #include <gtk/gtk.h>
-	* e-dropdown-button.h: Remove #include <gnome.h>
-	* e-filter-bar.c: Replace #include <gtk/gtk.h>
-	* e-filter-bar.h: Replace #include <gtk/gtk.h>
-	* e-messagebox.c: Add #includes to count for removed <gnome.h> in
-	e-messagebox.h:
-	* e-messagebox.h: Replace #include <gnome.h>
-	* e-search-bar.c: Replace #include <gnome.h>
-	* e-search-bar.h: Same here
-	* test-calendar.c: Remove #include <gnome.h>
-	* test-dateedit.c: Replace #include <gnome.h>
-	* test-dropdown-button.c: Same here.
-	* test-title-bar.c: Same here.
-
-2001-03-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-filter-bar.c (rule_editor_clicked): Validate the filter rule.
-
-2001-03-18  Damon Chaplin  <damon@ximian.com>
-
-	* e-cell-date-edit.c (e_cell_date_edit_show_time_invalid_warning): 
-	use gnome_dialog_run() to make the warning dialog modal. Also created
-	a better warning message showing the format expected.
-	Also used e_time_format_time() to format all times.
-
-2001-03-15  Not Zed  <NotZed@Ximian.com>
-
-	* e-filter-bar.c (menubar_activated): If we click on the edit
-	menu, then bring up a rule editor.  If the user adds/removes rules
-	though, they are neither saved, nor added to the menu's. sigh.
-
-2001-03-04  Damon Chaplin  <damon@ximian.com>
-
-	* e-cell-date-edit.c: pretty much working now.
-
-2001-03-01  Not Zed  <NotZed@Ximian.com>
-
-	* e-filter-bar.c: New type of search bar that interacts with
-	filter contexts to save filters etc.  Still probably needs a
-	little cleanpu.
-
-2001-02-28  Not Zed  <NotZed@Ximian.com>
-
-	* e-search-bar.c (add_dropdown): Save the dropdown menu in the
-	struct too.  Sigh, this is only so we can scan its content later,
-	ick.
-	(e_search_bar_set_menu_sensitive): New function to se tthe
-	sentisitivty of menyu items based on id.
-	(find_id): New function to find the row and widget for a specific
-	id.
-	(add_option): Renamed to set_option.
-	(add_dropdown): Renamed to set_dropdown.
-	(add_dropdown): ?New function to add a single item.
-	(set_dropdown): Call add_dropdown to add each item.
-	(e_search_bar_add_menu): New public function to add a single item.
-
-2001-02-27  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am (libemiscwidgets_a_SOURCES): Added filter-bar.[ch].
-
-	* e-search-bar.c (class_init): Init virtual functions.
-	(e_search_bar_set_option):
-	(e_search_bar_set_menu): virtualise calling.
-	(e_search_bar_construct): Call virtual functions to setup menus.
-
-	* e-search-bar.h (struct _ESearchBarClass): Virtualise
-	add_dropdown/add_option, so certain base options can be created.
-
-2001-02-25  Damon Chaplin  <damon@ximian.com>
-
-	* e-cell-date-edit.[hc]: new files to implement an ECell for showing
-	and editing dates & times. (Unfinished)
-
-	* Makefile.am (libemiscwidgets_a_SOURCES): added e-cell-date-edit.[hc]
-
-2001-02-24  Not Zed  <NotZed@Ximian.com>
-
-	* e-search-bar.c (add_dropdown): Move the event box into the
-	esb->dropdown_holder.  Changed so it can be called again on the
-	same esb, to rebuild the menu.
-	(e_search_bar_set_menu): New function to (re)set the menu.
-	(add_option): Setup so it can be re-called to rebuild the option
-	list.
-	(e_search_bar_set_option): New function to build the menu's.
-
-2001-02-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* .cvsignore: Ignore test-dropdown-button
-
-2001-01-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-search-bar.c (add_spacer): Make the spacer 4 pixels wider.
-	(add_dropdown): Put the dropdown button into an event box with a
-	1-pixel border, so that we match the [Hardcoded! Stupid GTK+!]
-	border around the option menu.
-
-2001-01-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-dropdown-button.c (menu_deactivate_cb): New function to change
-	the state of the toggle button when the pop-up menu disappears.
-	(impl_clicked): Removed.
-	(impl_button_press_event): New, implementation for
-	`::button_press_event'.  Pop-up the menu, and toggle the button.
-	(class_init): Override `::button_press_event' with
-	`impl_button_press_event'; don't override `::clicked' anymore.
-
-	* e-dropdown-button.h, e-dropdown-button.c: Derive from
-	`GtkToggleButton', instead of plain `GtkButton'.
-
-2001-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-search-bar.c (add_dropdown): Make the dropdown button
-	non-focusable.
-
-2001-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-search-bar.c (e_search_bar_init): Don't create the widgets
-	here.
-	(e_search_bar_construct): New.  Do it here instead.
-	(e_search_bar_new): Call it.  Added preconditions.
-	(esb_pack_menubar): Removed.
-	(add_dropdown): New.
-	(add_option): New.
-	(add_entry): New.
-	(e_search_bar_construct): Use `add_dropdown()', `add_option()',
-	`add_entry()'.
-	(class_init): Renamed from `e_seearch_bar_class_init'.
-	(init): Renamed from `e_search_bar_init'.
-	(impl_destroy): Renamed from `e_search_bar_destroy'.
-	(emit_menu_activated): Renamed from `esb_menu_activated'.
-	(emit_query_changed): Renamed from `esb_query_changed'.
-	(menubar_activated_cb): Renamed from `esb_menubar_activated'.
-	(option_activated_cb): Renamed from `esb_option_activated'.
-	(esb_entry_activated): Renamed from `esb_entry_activated'.
-	(impl_set_arg): Renamed from `e_search_bar_set_arg'.
-	(impl_get_arg): Renamed from `e_search_bar_get_arg'.
-
-	* e-search-bar.h (struct _ESearchBar): Removed member `menubar';
-	replaced it with `dropdown'.
-
-2001-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-dropdown-button.c (e_dropdown_button_construct): Removed
-	@ui_info and @data args.  Obviously I am not very smart at this
-	time of the night.
-	(e_dropdown_button_new): Likewise.
-
-2001-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-dropdown-button.c, e-dropdown-button.h: New.
-
-2001-01-25  Damon Chaplin  <damon@ximian.com>
-
-	* e-calendar-item.[hc]: e_calendar_item_get_date_range() now returns
-	a boolean, which is FALSE if no dates are currently shown.
-	Plus a couple of minor sanity checks.
-
-2001-01-19  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-calendar.c (e_calendar_init): Unset the GTK_CAN_FOCUS flag on
-	the ECalendar.
-	(e_calendar_focus_in): Removed function since it did nothing.
-	(e_calendar_focus_out): Likewise.
-	(e_calendar_key_press): Likewise.
-	(e_calendar_init): Turn off the GTK_CAN_FOCUS flag for both arrow
-	buttons.
-
-2001-01-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* e-calendar-item.c (e_calendar_item_set_max_days_sel): Make zero
-	the minimum number of days that can be specified.
-	(e_calendar_item_set_arg): We do need an update when the maximum
-	number of selected days is changed.
-	(e_calendar_item_set_max_days_sel): Request an update of the
-	canvas item.
-	(e_calendar_item_button_press): Do not start selecting days if the
-	max_days_selected is less than 1.
-
-2001-01-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-messagebox.c (e_message_box_get_id): Oops. Delete this. I
-	never meant for this to get commit'd.
-
-2001-01-17  JP Rosevear  <jpr@ximian.com>
-
-	* e-messagebox.c (e_message_box_get_id): Dont remove the function, give
-	it the proper name
-
-2001-01-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* e-messagebox.c (e_message_box_get_checkbox): Remove the version
-	returning `const char *' as of course it doesn't compile.  Please
-	compile before committing.
-
-2001-01-17  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* Makefile.am: Added e-messagebox to the build.
-
-	* e-messagebox.[c,h]: Added a new messagebox window that contains
-	a checkbox for "Don't show me this again."
-
-2001-01-16  Jason Leach  <jasonleach@usa.net>
-
-	* e-search-bar.[ch]: Moved here from $(toplevel)/filter.
-
-2000-12-22  JP Rosevear  <jpr@helixcode.com>
-
-	* e-calendar-item.h: add prototypes
-
-	* e-calendar-item.c (e_calendar_item_init): Set max_days_selected to
-	1 and days_to_start_week_selection to -1 as documented in header
-	(e_calendar_item_set_arg): use new accessor methods
-	(e_calendar_item_get_arg): ditto
-	(e_calendar_item_get_max_days_sel): accessor
-	(e_calendar_item_set_max_days_sel): ditto
-	(e_calendar_item_get_days_start_week_sel): ditto
-	(e_calendar_item_set_days_start_week_sel): ditto
-	(e_calendar_item_class_init): add display_popup argument
-	(e_calendar_item_init): initialize display_popup member
-	(e_calendar_item_get_arg): get display_popup member
-	(e_calendar_item_set_arg): set display_popup member
-	(e_calendar_item_button_press): only show the popup menu if the
-	member is set
-	(e_calendar_item_get_display_popup): acessor
-	(e_calendar_item_set_display_popup): ditto
-
-2000-12-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-dateedit.h: #include <time.h>
-
-2000-12-08  JP Rosevear  <jpr@helixcode.com>
-
-	* e-calendar.c (e_calendar_destroy): Call the parent class destroyer
-	as well
-
-2000-10-26  Damon Chaplin  <damon@helixcode.com>
-
-	* e-dateedit.[hc]: updated to emit "changed" when appropriate, which
-	turned out to be amazingly difficult :(
-	Also added e_date_edit_get/set_date() to get/set just the date.
-	Added e_date_edit_date_is_valid() & e_date_edit_time_is_valid() so
-	you can check if the user has tried to enter an invalid date.
-	(All the get_date/time functions return the last valid date entered.)
-
-	* test-dateedit.c: updated a bit.
-
-2000-11-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-dateedit.h (EDateEditClass): Removed the "time_changed"
-	signal, since it was never being emitted in the first place.  Time
-	values *are* both date and time together anyways, so whenever one
-	changes we should notify about the whole date/time value being
-	changed.
-	Renamed the remaining "date_changed" signal to just "changed".
-
-	* e-dateedit.c (e_date_edit_class_init): Do not create the
-	"time_changed" signal; rename the other one to "changed".
-	(set_time): Moved the core functionality from
-	e_date_edit_set_time() to here.  This function just sets the
-	widgets' values without emitting any signals.
-	(e_date_edit_set_time): Emit the "changed" signal unconditionally.
-	This is to be consistent with the rest of the GTK+ widgets, and it
-	actually makes writing client code easier.
-	(e_date_edit_new): Use set_time().
-	(on_date_popup_now_button_clicked): Do not emit the signal here.
-	(on_date_popup_none_button_clicked): Likewise.
-	(e_date_edit_set_time_of_day): Emit the signal, since we do not
-	call e_date_edit_set_time().
-
-2000-10-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* e-calendar-item.c: #include <string.h> to get rid of warning.
-	* e-clipped-label.c: Same here.
-	
-2000-10-27  Federico Mena Quintero  <federico@helixcode.com>
-
-	* e-dateedit.c (e_date_edit_destroy): Do not unref the cal_popup
-	since we already destroyed it.
-
-2000-10-11  Damon Chaplin  <damon@helixcode.com>
-
-	* e-calendar-item.c (e_calendar_item_recalc_sizes): fixed to
-	recalculate min_cell_width/height in case the show_week_numbers option
-	is changed.
-
-	* e-dateedit.c: added support for hiding the date field, and added
-	get/set_time_of_day() functions to get/set just the time.
-
-2000-09-30  Damon Chaplin  <damon@helixcode.com>
-
-	* e-calendar-item.c: 
-	* e-dateedit.c: better i18n of strftime strings.
-
-2000-09-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-title-bar.c: New member `pin_gtk_pixmap' in
-	`ETitleBarPrivate'.  Signal "close_button_clicked" renamed to
-	"button_clicked".  Signal "title_button_press_event" renamed to
-	"label_button_press_event".
-	(init): Init new members.
-	(close_button_realize_cb): Create the pin pixmap.  Call
-	`show_and_hide_pixmaps_according_to_mode()'.
-	(e_title_bar_show_close_button): Renamed to
-	`e_title_bar_show_button'.
-	(e_title_bar_get_button_mode): New.
-	(e_title_bar_set_button_mode): New.
-
-2000-09-23  Damon Chaplin  <damon@helixcode.com>
-
-	* e-calendar.c: use pixmaps instead of GtkArrows to look better.
-	Also set the canvas window's background when realized so that we can
-	set the button reliefs to none.
-
-2000-09-22  Damon Chaplin  <damon@helixcode.com>
-
-	* test-dateedit.c: updated a bit, adding a few EDateEdits with
-	different options.
-
-	* e-calendar-item.c (e_calendar_item_set_selection): aborted any
-	current selection operation and initialize all of the selection fields.
-	(e_calendar_item_unmap): new function to abort any current selection
-	operation. Otherwise GnomeCanvas gets in a muddle about grabs.
-
-	* e-dateedit.c: marked some strftime()/strptime() format strings for
-	translation and used "%m/%d/%Y" instead of "%x" so we get the complete
-	year number. Also changed e_date_edit_get_time() so it returns -2 if
-	it can't parse the date or time, and -1 if it is explicitly set to
-	None.
-	(e_date_edit_parse_date): new function to parse the date string and
-	add on the current century if a year of 0-99 is entered.
-
-2000-09-21  Damon Chaplin  <damon@helixcode.com>
-
-	* e-dateedit.c (on_date_button_clicked): only check return of strptime
-	for NULL. It should now select the correct day set in the popup.
-
-	* e-calendar.c: 
-	* e-calendar-item.c: 
-	* test-calendar.c: removed support for buttons within the ECalendar.
-	It is cleaner to add them outside it, as EDateEdit does.
-
-2000-09-18  Dan Winship  <danw@helixcode.com>
-
-	* e-dateedit.c (_XOPEN_SOURCE): set this to 4 to specify how much
-	X/Open we want with that.
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
-	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.
-
-	* e-calendar-item.c, e-calendar.c, e-calendar.h, e-title-bar.c:
-	Fixed the #include lines to deal properly with gal.
-
-	* e-scroll-frame.c, e-scroll-frame.h: Moved to gal.
-
-2000-09-11  Damon Chaplin  <damon@helixcode.com>
-
-	* Makefile.am (libemiscwidgets_a_SOURCES): added e-dateedit.[hc]
-	and the test-dateedit app.
-
-	* e-dateedit.[hc]: new widget to use instead of GnomeDateEdit. It
-	uses the new ECalendar widget for the calendar and also supports
-	"None", "Today" and "Now" buttons, and goes away with a single click.
-
-	* test-dateedit.c: app to test the EDateEdit widget.
-
-	* e-calendar-item.c: updated to support the EDateEdit better,
-	mainly by adding the "move_selection_when_moving" arg so we can turn
-	it off to keep the same day selected when changing the months shown.
-
-2000-09-05  Damon Chaplin  <damon@helixcode.com>
-
-	* e-calendar-item.c (e_calendar_item_draw_month): make sure we get
-	the start_weekday since we need it for draw_days(). Fixes a drawing
-	bug.
-
-2000-08-31  Damon Chaplin  <damon@helixcode.com>
-
-	* e-calendar-item.c (e_calendar_item_button_press): 
-	(e_calendar_item_button_release): grab/ungrab the pointer so we
-	always get the button_release event.
-
-2000-08-30  Damon Chaplin  <damon@helixcode.com>
-
-	* e-calendar-item.[hc]: 
-	* e-calendar.[hc]: Updated.
-
-2000-08-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-calendar-item.c, e-calendar.c: Fixed some warnings.
-
-2000-07-25  Damon Chaplin  <damon@helixcode.com>
-
-	* e-calendar-item.h: 
-	* e-calendar.[hc]: new widget and canvas item to replace GtkCalendar.
-	Not quite finished yet.
-
-2000-07-21  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-title-bar.c (e_title_bar_set_title): We have a `EClippedLabel',
-	not a `GtkLabel' here: use the right function to change the text.
-
-2000-07-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* e-scroll-frame.c: Tried rearranging the casts to try for a more
-	correct computation.
-
-2000-07-08  Dan Winship  <danw@helixcode.com>
-
-	* e-scroll-frame.c (e_scroll_frame_add): comment out true but
-	confused warning about non-scrollable widgets until Chris and/or
-	Federico fix this correctly.
-	(e_scroll_frame_size_allocate): If the available space for the
-	child is less than the width/height of the frame, give the child
-	an allocation of 0 rather than some small negative number cast to
-	unsigned.
-
-2000-07-05  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (INCLUDES): Set G_LOG_DOMAIN=__FILE__ rather than
-	"e-title-bar" in all three widgets.
-
-2000-06-13  Anders Carlsson  <andersca@gnu.org>
-
-	* e-scroll-frame.c (e_scroll_frame_button_press): Control does 
-	horizontal scrolling, a la gimp.
-
-2000-06-11  Anders Carlsson  <andersca@gnu.org>
-
-	* e-scroll-frame.c (e_scroll_frame_button_press): Add support
-	for mouse wheel scrolling in EScrollFrame.
-
-2000-06-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* e-title-bar.c (close_button_realize_cb): Unref the pixmap and
-	the mask.
-
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
deleted file mode 100644
index cca7625d05..0000000000
--- a/widgets/misc/Makefile.am
+++ /dev/null
@@ -1,83 +0,0 @@
-# FIXME we use the EClippedLabel widget from EShortcutBar.  Probably
-# it should be moved somewhere else.
-
-INCLUDES =					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/widgets/shortcut-bar	\
-	$(EXTRA_GNOME_CFLAGS)			\
-	-DMAP_DIR=\""$(datadir)/images/evolution"\"	\
-	-DG_LOG_DOMAIN=__FILE__
-
-noinst_LIBRARIES =	\
-	libemiscwidgets.a
-
-libemiscwidgets_a_SOURCES = 	\
-	e-calendar.c		\
-	e-calendar.h		\
-	e-calendar-item.c	\
-	e-calendar-item.h	\
-	e-cell-date-edit.c	\
-	e-cell-date-edit.h	\
-	e-charset-picker.c	\
-	e-charset-picker.h	\
-	e-clipped-label.c	\
-	e-clipped-label.h	\
-	e-dateedit.c		\
-	e-dateedit.h		\
-	e-dropdown-button.c	\
-	e-dropdown-button.h	\
-	e-filter-bar.c		\
-	e-filter-bar.h		\
-	e-map.c			\
-	e-map.h			\
-	e-messagebox.c		\
-	e-messagebox.h		\
-	e-search-bar.c		\
-	e-search-bar.h		\
-	e-title-bar.c		\
-	e-title-bar.h
-
-noinst_PROGRAMS = 		\
-	test-calendar		\
-	test-dateedit		\
-	test-dropdown-button	\
-	test-title-bar
-
-# test-calendar
-
-test_calendar_SOURCES = 	\
-	test-calendar.c
-
-test_calendar_LDADD = 						\
-	./libemiscwidgets.a					\
-	../../e-util/libeutil.la				\
-	$(EXTRA_GNOME_LIBS)
-
-# test-dateedit
-
-test_dateedit_SOURCES = 	\
-	test-dateedit.c
-
-test_dateedit_LDADD = 						\
-	./libemiscwidgets.a					\
-	../../e-util/libeutil.la				\
-	$(EXTRA_GNOME_LIBS)
-
-# test-dropdown-button
-
-test_dropdown_button_SOURCES = 	\
-	test-dropdown-button.c
-
-test_dropdown_button_LDADD =	\
-	./libemiscwidgets.a	\
-	$(EXTRA_GNOME_LIBS)
-
-# test-title-bar
-
-test_title_bar_SOURCES = 	\
-	test-title-bar.c
-
-test_title_bar_LDADD = 						\
-	./libemiscwidgets.a					\
-	$(EXTRA_GNOME_LIBS)
-
diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c
deleted file mode 100644
index 3872d7fb63..0000000000
--- a/widgets/misc/e-calendar-item.c
+++ /dev/null
@@ -1,2920 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2000, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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
- */
-
-/*
- * ECalendarItem - canvas item displaying a calendar.
- */
-
-#include <config.h>
-
-#include "e-calendar-item.h"
-
-#include <time.h>
-#include <string.h>
-#include <glib.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtksignal.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <gal/util/e-util.h>
-
-/*
- * These are the padding sizes between various pieces of the calendar.
- */
-
-/* The minimum padding around the numbers in each cell/day. */
-#define	E_CALENDAR_ITEM_MIN_CELL_XPAD	4
-#define	E_CALENDAR_ITEM_MIN_CELL_YPAD	0
-
-/* Vertical padding. */
-#define	E_CALENDAR_ITEM_YPAD_ABOVE_DAY_LETTERS		1
-#define	E_CALENDAR_ITEM_YPAD_BELOW_DAY_LETTERS		0
-#define	E_CALENDAR_ITEM_YPAD_ABOVE_CELLS		1
-#define	E_CALENDAR_ITEM_YPAD_BELOW_CELLS		2
-
-/* Horizontal padding in the heading bars. */
-#define	E_CALENDAR_ITEM_XPAD_BEFORE_MONTH_NAME_WITH_BUTTON	16
-#define	E_CALENDAR_ITEM_XPAD_BEFORE_MONTH_NAME			3
-#define	E_CALENDAR_ITEM_XPAD_AFTER_MONTH_NAME			3
-#define	E_CALENDAR_ITEM_XPAD_AFTER_MONTH_NAME_WITH_BUTTON	16
-
-/* Horizontal padding in the month displays. */
-#define	E_CALENDAR_ITEM_XPAD_BEFORE_WEEK_NUMBERS	4
-#define	E_CALENDAR_ITEM_XPAD_AFTER_WEEK_NUMBERS		2
-#define	E_CALENDAR_ITEM_XPAD_BEFORE_CELLS		1
-#define	E_CALENDAR_ITEM_XPAD_AFTER_CELLS		4
-
-/* The number of rows & columns of days in each month. */
-#define E_CALENDAR_ROWS_PER_MONTH	6
-#define E_CALENDAR_COLS_PER_MONTH	7
-
-static const int e_calendar_item_days_in_month[12] = {
-	31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
-};
-
-#define DAYS_IN_MONTH(year, month) \
-  e_calendar_item_days_in_month[month] + (((month) == 1 \
-  && ((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0))) ? 1 : 0)
-
-
-static void e_calendar_item_class_init	(ECalendarItemClass *class);
-static void e_calendar_item_init	(ECalendarItem	 *calitem);
-static void e_calendar_item_destroy	(GtkObject	 *o);
-static void e_calendar_item_get_arg	(GtkObject	 *o,
-					 GtkArg		 *arg,
-					 guint		  arg_id);
-static void e_calendar_item_set_arg	(GtkObject	 *o,
-					 GtkArg		 *arg,
-					 guint		  arg_id);
-static void e_calendar_item_realize	(GnomeCanvasItem *item);
-static void e_calendar_item_unrealize	(GnomeCanvasItem *item);
-static void e_calendar_item_unmap	(GnomeCanvasItem *item);
-static void e_calendar_item_update	(GnomeCanvasItem *item,
-					 double		 *affine,
-					 ArtSVP		 *clip_path,
-					 int		  flags);
-static void e_calendar_item_draw	(GnomeCanvasItem *item,
-					 GdkDrawable	 *drawable,
-					 int		  x,
-					 int		  y,
-					 int		  width,
-					 int		  height);
-static void e_calendar_item_draw_month	(ECalendarItem   *calitem,
-					 GdkDrawable	 *drawable,
-					 int		  x,
-					 int		  y,
-					 int		  width,
-					 int		  height,
-					 int		  row,
-					 int		  col);
-static void e_calendar_item_draw_day_numbers (ECalendarItem	*calitem,
-					      GdkDrawable	*drawable,
-					      int		 width,
-					      int		 height,
-					      int		 row,
-					      int		 col,
-					      int		 year,
-					      int		 month,
-					      int		 start_weekday,
-					      gint		 cells_x,
-					      gint		 cells_y);
-static double e_calendar_item_point	(GnomeCanvasItem *item,
-					 double		  x,
-					 double		  y,
-					 int		  cx,
-					 int		  cy,
-					 GnomeCanvasItem **actual_item);
-static gint e_calendar_item_event	(GnomeCanvasItem *item,
-					 GdkEvent	 *event);
-static gboolean e_calendar_item_button_press	(ECalendarItem	*calitem,
-						 GdkEvent	*event);
-static gboolean e_calendar_item_button_release	(ECalendarItem	*calitem,
-						 GdkEvent	*event);
-static gboolean e_calendar_item_motion		(ECalendarItem	*calitem,
-						 GdkEvent	*event);
-
-static gboolean e_calendar_item_convert_position_to_day	(ECalendarItem	*calitem,
-							 gint		 x,
-							 gint		 y,
-							 gboolean	 round_empty_positions,
-							 gint		*month_offset,
-							 gint		*day,
-							 gboolean	*entire_week);
-static void e_calendar_item_get_month_info	(ECalendarItem	*calitem,
-						 gint		 row,
-						 gint		 col,
-						 gint		*first_day_offset,
-						 gint		*days_in_month,
-						 gint		*days_in_prev_month);
-static void e_calendar_item_recalc_sizes(ECalendarItem *calitem);
-
-static gint e_calendar_item_get_week_number	(ECalendarItem *calitem,
-						 gint		day,
-						 gint		month,
-						 gint		year);
-
-static void e_calendar_item_get_day_style	(ECalendarItem	*calitem,
-						 gint		 year,
-						 gint		 month,
-						 gint		 day,
-						 gint		 day_style,
-						 gboolean	 today,
-						 gboolean	 prev_or_next_month,
-						 gboolean	 selected,
-						 gboolean	 has_focus,
-						 gboolean	 drop_target,
-						 GdkColor      **bg_color,
-						 GdkColor      **fg_color,
-						 GdkColor      **box_color,
-						 gboolean	*bold);
-static void e_calendar_item_check_selection_end	(ECalendarItem	*calitem,
-						 gint		 start_month,
-						 gint		 start_day,
-						 gint		*end_month,
-						 gint		*end_day);
-static void e_calendar_item_check_selection_start(ECalendarItem	*calitem,
-						  gint		*start_month,
-						  gint		*start_day,
-						  gint		 end_month,
-						  gint		 end_day);
-static void e_calendar_item_normalize_date	(ECalendarItem	*calitem,
-						 gint		*year,
-						 gint		*month);
-static void e_calendar_item_add_days_to_selection(ECalendarItem	*calitem,
-						  gint		 days);
-static void e_calendar_item_round_up_selection	(ECalendarItem	*calitem,
-						 gint		*month_offset,
-						 gint		*day);
-static void e_calendar_item_round_down_selection (ECalendarItem	*calitem,
-						  gint		*month_offset,
-						  gint		*day);
-static gint e_calendar_item_get_inclusive_days	(ECalendarItem	*calitem,
-						 gint		 start_month_offset,
-						 gint		 start_day,
-						 gint		 end_month_offset,
-						 gint		 end_day);
-static void e_calendar_item_ensure_valid_day	(ECalendarItem	*calitem,
-						 gint		*month_offset,
-						 gint		*day);
-static gboolean e_calendar_item_ensure_days_visible (ECalendarItem	*calitem,
-						     gint		 start_year,
-						     gint		 start_month,
-						     gint		 start_day,
-						     gint		 end_year,
-						     gint		 end_month,
-						     gint		 end_day);
-static void e_calendar_item_show_popup_menu	(ECalendarItem	*calitem,
-						 GdkEventButton	*event,
-						 gint		 month_offset);
-static void e_calendar_item_on_menu_item_activate(GtkWidget	*menuitem,
-						  ECalendarItem	*calitem);
-static void e_calendar_item_position_menu	(GtkMenu            *menu,
-						 gint               *x,
-						 gint               *y,
-						 gpointer            user_data);
-static void e_calendar_item_date_range_changed	(ECalendarItem	*calitem);
-static void e_calendar_item_queue_signal_emission	(ECalendarItem	*calitem);
-static gboolean e_calendar_item_signal_emission_idle_cb	(gpointer data);
-
-/* Our arguments. */
-enum {
-	ARG_0,
-	ARG_YEAR,
-	ARG_MONTH,
-	ARG_X1,
-	ARG_Y1,
-	ARG_X2,
-	ARG_Y2,
-	ARG_FONT,
-	ARG_WEEK_NUMBER_FONT,
-	ARG_ROW_HEIGHT,
-	ARG_COLUMN_WIDTH,
-	ARG_MINIMUM_ROWS,
-	ARG_MINIMUM_COLUMNS,
-	ARG_MAXIMUM_ROWS,
-	ARG_MAXIMUM_COLUMNS,
-	ARG_WEEK_START_DAY,
-	ARG_SHOW_WEEK_NUMBERS,
-	ARG_MAXIMUM_DAYS_SELECTED,
-	ARG_DAYS_TO_START_WEEK_SELECTION,
-	ARG_MOVE_SELECTION_WHEN_MOVING,
-	ARG_ROUND_SELECTION_WHEN_MOVING,
-	ARG_DISPLAY_POPUP
-};
-
-enum {
-  DATE_RANGE_CHANGED,
-  SELECTION_CHANGED,
-  LAST_SIGNAL
-};
-
-
-static GnomeCanvasItemClass *parent_class;
-static guint e_calendar_item_signals[LAST_SIGNAL] = { 0 };
-
-
-E_MAKE_TYPE (e_calendar_item, "ECalendarItem", ECalendarItem,
-	     e_calendar_item_class_init, e_calendar_item_init,
-	     GNOME_TYPE_CANVAS_ITEM)
-
-
-static void
-e_calendar_item_class_init (ECalendarItemClass *class)
-{
-	GtkObjectClass  *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	parent_class = gtk_type_class (gnome_canvas_item_get_type());
-
-	object_class = (GtkObjectClass *) class;
-	item_class = (GnomeCanvasItemClass *) class;
-
-	gtk_object_add_arg_type ("ECalendarItem::year",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE,
-				 ARG_YEAR);
-	gtk_object_add_arg_type ("ECalendarItem::month",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE,
-				 ARG_MONTH);
-	gtk_object_add_arg_type ("ECalendarItem::x1",
-				 GTK_TYPE_DOUBLE, GTK_ARG_READWRITE,
-				 ARG_X1);
-	gtk_object_add_arg_type ("ECalendarItem::y1",
-				 GTK_TYPE_DOUBLE, GTK_ARG_READWRITE,
-				 ARG_Y1);
-	gtk_object_add_arg_type ("ECalendarItem::x2",
-				 GTK_TYPE_DOUBLE, GTK_ARG_READWRITE,
-				 ARG_X2);
-	gtk_object_add_arg_type ("ECalendarItem::y2",
-				 GTK_TYPE_DOUBLE, GTK_ARG_READWRITE,
-				 ARG_Y2);
-	gtk_object_add_arg_type ("ECalendarItem::font",
-				 GTK_TYPE_GDK_FONT, GTK_ARG_READWRITE,
-				 ARG_FONT);
-	gtk_object_add_arg_type ("ECalendarItem::week_number_font",
-				 GTK_TYPE_GDK_FONT, GTK_ARG_READWRITE,
-				 ARG_WEEK_NUMBER_FONT);
-	gtk_object_add_arg_type ("ECalendarItem::row_height",
-				 GTK_TYPE_INT, GTK_ARG_READABLE,
-				 ARG_ROW_HEIGHT);
-	gtk_object_add_arg_type ("ECalendarItem::column_width",
-				 GTK_TYPE_INT, GTK_ARG_READABLE,
-				 ARG_COLUMN_WIDTH);
-	gtk_object_add_arg_type ("ECalendarItem::minimum_rows",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE,
-				 ARG_MINIMUM_ROWS);
-	gtk_object_add_arg_type ("ECalendarItem::minimum_columns",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE,
-				 ARG_MINIMUM_COLUMNS);
-	gtk_object_add_arg_type ("ECalendarItem::maximum_rows",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE,
-				 ARG_MAXIMUM_ROWS);
-	gtk_object_add_arg_type ("ECalendarItem::maximum_columns",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE,
-				 ARG_MAXIMUM_COLUMNS);
-	gtk_object_add_arg_type ("ECalendarItem::week_start_day",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE,
-				 ARG_WEEK_START_DAY);
-	gtk_object_add_arg_type ("ECalendarItem::show_week_numbers",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE,
-				 ARG_SHOW_WEEK_NUMBERS);
-	gtk_object_add_arg_type ("ECalendarItem::maximum_days_selected",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE,
-				 ARG_MAXIMUM_DAYS_SELECTED);
-	gtk_object_add_arg_type ("ECalendarItem::days_to_start_week_selection",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE,
-				 ARG_DAYS_TO_START_WEEK_SELECTION);
-	gtk_object_add_arg_type ("ECalendarItem::move_selection_when_moving",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE,
-				 ARG_MOVE_SELECTION_WHEN_MOVING);
-	gtk_object_add_arg_type ("ECalendarItem::round_selection_when_moving",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE,
-				 ARG_ROUND_SELECTION_WHEN_MOVING);
-	gtk_object_add_arg_type ("ECalendarItem::display_popup",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE,
-				 ARG_DISPLAY_POPUP);
-
-	e_calendar_item_signals[DATE_RANGE_CHANGED] =
-		gtk_signal_new ("date_range_changed",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ECalendarItemClass, date_range_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-	e_calendar_item_signals[SELECTION_CHANGED] =
-		gtk_signal_new ("selection_changed",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ECalendarItemClass, selection_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, e_calendar_item_signals,
-				      LAST_SIGNAL);
-
-
-	object_class->destroy = e_calendar_item_destroy;
-	object_class->get_arg = e_calendar_item_get_arg;
-	object_class->set_arg = e_calendar_item_set_arg;
-
-	/* GnomeCanvasItem method overrides */
-	item_class->realize     = e_calendar_item_realize;
-	item_class->unrealize   = e_calendar_item_unrealize;
-	item_class->unmap	= e_calendar_item_unmap;
-	item_class->update      = e_calendar_item_update;
-	item_class->draw        = e_calendar_item_draw;
-	item_class->point       = e_calendar_item_point;
-	item_class->event       = e_calendar_item_event;
-
-	class->date_range_changed	= NULL;
-	class->selection_changed	= NULL;
-}
-
-
-static void
-e_calendar_item_init (ECalendarItem *calitem)
-{
-	struct tm *tmp_tm;
-	time_t t;
-
-	/* Set the default time to the current month. */
-	t = time (NULL);
-	tmp_tm = localtime (&t);
-	calitem->year = tmp_tm->tm_year + 1900;
-	calitem->month = tmp_tm->tm_mon;
-
-	calitem->styles = NULL;
-
-	calitem->min_cols = 1;
-	calitem->min_rows = 1;
-	calitem->max_cols = -1;
-	calitem->max_rows = -1;
-
-	calitem->rows = 0;
-	calitem->cols = 0;
-
-	calitem->show_week_numbers = FALSE;
-	calitem->week_start_day = 0;
-	calitem->expand = TRUE;
-	calitem->max_days_selected = 1;
-	calitem->days_to_start_week_selection = -1;
-	calitem->move_selection_when_moving = TRUE;
-	calitem->round_selection_when_moving = FALSE;
-	calitem->display_popup = TRUE;
-	
-	calitem->x1 = 0.0;
-	calitem->y1 = 0.0;
-	calitem->x2 = 0.0;
-	calitem->y2 = 0.0;
-
-	calitem->selection_set = FALSE;
-
-	calitem->selection_changed = FALSE;
-	calitem->date_range_changed = FALSE;
-
-	calitem->style_callback = NULL;
-	calitem->style_callback_data = NULL;
-	calitem->style_callback_destroy = NULL;
-
-	calitem->time_callback = NULL;
-	calitem->time_callback_data = NULL;
-	calitem->time_callback_destroy = NULL;
-
-	/* Translators: These are the first characters of each day of the
-	   week, 'M' for 'Monday', 'T' for Tuesday etc. */
-	calitem->days = _("MTWTFSS");
-
-	calitem->signal_emission_idle_id = 0;
-}
-
-
-static void
-e_calendar_item_destroy		(GtkObject *o)
-{
-	ECalendarItem *calitem;
-
-	calitem = E_CALENDAR_ITEM (o);
-
-	e_calendar_item_set_style_callback (calitem, NULL, NULL, NULL);
-	e_calendar_item_set_get_time_callback (calitem, NULL, NULL, NULL);
-
-	g_free (calitem->styles);
-
-	if (calitem->signal_emission_idle_id != 0) {
-		g_source_remove (calitem->signal_emission_idle_id);
-		calitem->signal_emission_idle_id = 0;
-	}
-
-	if (calitem->old_font)
-		gdk_font_unref (calitem->old_font);
-	if (calitem->old_week_number_font)
-		gdk_font_unref (calitem->old_week_number_font);
-}
-
-
-static void
-e_calendar_item_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	ECalendarItem *calitem;
-
-	item = GNOME_CANVAS_ITEM (o);
-	calitem = E_CALENDAR_ITEM (o);
-
-	switch (arg_id) {
-	case ARG_YEAR:
-		GTK_VALUE_INT (*arg) = calitem->year;
-		break;
-	case ARG_MONTH:
-		GTK_VALUE_INT (*arg) = calitem->month;
-		break;
-	case ARG_X1:
-		GTK_VALUE_DOUBLE (*arg) = calitem->x1;
-		break;
-	case ARG_Y1:
-		GTK_VALUE_DOUBLE (*arg) = calitem->y1;
-		break;
-	case ARG_X2:
-		GTK_VALUE_DOUBLE (*arg) = calitem->x2;
-		break;
-	case ARG_Y2:
-		GTK_VALUE_DOUBLE (*arg) = calitem->y2;
-		break;
-	case ARG_FONT:
-		GTK_VALUE_BOXED (*arg) = calitem->font;
-		break;
-	case ARG_WEEK_NUMBER_FONT:
-		GTK_VALUE_BOXED (*arg) = calitem->week_number_font;
-		break;
-	case ARG_ROW_HEIGHT:
-		e_calendar_item_recalc_sizes (calitem);
-		GTK_VALUE_INT (*arg) = calitem->min_month_height;
-		break;
-	case ARG_COLUMN_WIDTH:
-		e_calendar_item_recalc_sizes (calitem);
-		GTK_VALUE_INT (*arg) = calitem->min_month_width;
-		break;
-	case ARG_MINIMUM_ROWS:
-		GTK_VALUE_INT (*arg) = calitem->min_rows;
-		break;
-	case ARG_MINIMUM_COLUMNS:
-		GTK_VALUE_INT (*arg) = calitem->min_cols;
-		break;
-	case ARG_MAXIMUM_ROWS:
-		GTK_VALUE_INT (*arg) = calitem->max_rows;
-		break;
-	case ARG_MAXIMUM_COLUMNS:
-		GTK_VALUE_INT (*arg) = calitem->max_cols;
-		break;
-	case ARG_WEEK_START_DAY:
-		GTK_VALUE_INT (*arg) = calitem->week_start_day;
-		break;
-	case ARG_SHOW_WEEK_NUMBERS:
-		GTK_VALUE_BOOL (*arg) = calitem->show_week_numbers;
-		break;
-	case ARG_MAXIMUM_DAYS_SELECTED:
-		GTK_VALUE_INT (*arg) = e_calendar_item_get_max_days_sel (calitem);
-		break;
-	case ARG_DAYS_TO_START_WEEK_SELECTION:
-		GTK_VALUE_INT (*arg) = e_calendar_item_get_days_start_week_sel (calitem);
-		break;
-	case ARG_MOVE_SELECTION_WHEN_MOVING:
-		GTK_VALUE_BOOL (*arg) = calitem->move_selection_when_moving;
-		break;
-	case ARG_ROUND_SELECTION_WHEN_MOVING:
-		GTK_VALUE_BOOL (*arg) = calitem->round_selection_when_moving;
-		break;
-	case ARG_DISPLAY_POPUP:
-		GTK_VALUE_BOOL (*arg) = e_calendar_item_get_display_popup (calitem);
-		break;
-	default:
-		g_warning ("Invalid arg");
-	}
-}
-
-
-static void
-e_calendar_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	ECalendarItem *calitem;
-	GdkFont *font;
-	gboolean need_update = FALSE;
-	gdouble dvalue;
-	gint ivalue;
-	gboolean bvalue;
-
-	item = GNOME_CANVAS_ITEM (o);
-	calitem = E_CALENDAR_ITEM (o);
-	
-	switch (arg_id){
-	case ARG_YEAR:
-		ivalue = GTK_VALUE_INT (*arg);
-		e_calendar_item_set_first_month (calitem, ivalue,
-						 calitem->month);
-		break;
-	case ARG_MONTH:
-		ivalue = GTK_VALUE_INT (*arg);
-		e_calendar_item_set_first_month (calitem, calitem->year,
-						 ivalue);
-		break;
-	case ARG_X1:
-		dvalue = GTK_VALUE_DOUBLE (*arg);
-		if (calitem->x1 != dvalue) {
-			calitem->x1 = dvalue;
-			need_update = TRUE;
-		}
-		break;
-	case ARG_Y1:
-		dvalue = GTK_VALUE_DOUBLE (*arg);
-		if (calitem->y1 != dvalue) {
-			calitem->y1 = dvalue;
-			need_update = TRUE;
-		}
-		break;
-	case ARG_X2:
-		dvalue = GTK_VALUE_DOUBLE (*arg);
-		if (calitem->x2 != dvalue) {
-			calitem->x2 = dvalue;
-			need_update = TRUE;
-		}
-		break;
-	case ARG_Y2:
-		dvalue = GTK_VALUE_DOUBLE (*arg);
-		if (calitem->y2 != dvalue) {
-			calitem->y2 = dvalue;
-			need_update = TRUE;
-		}
-		break;
-	case ARG_FONT:
-		font = GTK_VALUE_BOXED (*arg);
-		if (calitem->font != font) {
-			if (calitem->font)
-				gdk_font_unref (calitem->font);
-			calitem->font = font;
-			if (font)
-				gdk_font_ref (font);
-			need_update = TRUE;
-		}
-		break;
-	case ARG_WEEK_NUMBER_FONT:
-		font = GTK_VALUE_BOXED (*arg);
-		if (calitem->week_number_font != font) {
-			if (calitem->week_number_font)
-				gdk_font_unref (calitem->week_number_font);
-			calitem->week_number_font = font;
-			if (font)
-				gdk_font_ref (font);
-			need_update = TRUE;
-		}
-		break;
-	case ARG_MINIMUM_ROWS:
-		ivalue = GTK_VALUE_INT (*arg);
-		ivalue = MAX (1, ivalue);
-		if (calitem->min_rows != ivalue) {
-			calitem->min_rows = ivalue;
-			need_update = TRUE;
-		}
-		break;
-	case ARG_MINIMUM_COLUMNS:
-		ivalue = GTK_VALUE_INT (*arg);
-		ivalue = MAX (1, ivalue);
-		if (calitem->min_cols != ivalue) {
-			calitem->min_cols = ivalue;
-			need_update = TRUE;
-		}
-		break;
-	case ARG_MAXIMUM_ROWS:
-		ivalue = GTK_VALUE_INT (*arg);
-		if (calitem->max_rows != ivalue) {
-			calitem->max_rows = ivalue;
-			need_update = TRUE;
-		}
-		break;
-	case ARG_MAXIMUM_COLUMNS:
-		ivalue = GTK_VALUE_INT (*arg);
-		if (calitem->max_cols != ivalue) {
-			calitem->max_cols = ivalue;
-			need_update = TRUE;
-		}
-		break;
-	case ARG_WEEK_START_DAY:
-		ivalue = GTK_VALUE_INT (*arg);
-		if (calitem->week_start_day != ivalue) {
-			calitem->week_start_day = ivalue;
-			need_update = TRUE;
-		}
-		break;
-	case ARG_SHOW_WEEK_NUMBERS:
-		bvalue = GTK_VALUE_BOOL (*arg);
-		if (calitem->show_week_numbers != bvalue) {
-			calitem->show_week_numbers = bvalue;
-			need_update = TRUE;
-		}
-		break;
-	case ARG_MAXIMUM_DAYS_SELECTED:
-		ivalue = GTK_VALUE_INT (*arg);
-		e_calendar_item_set_max_days_sel (calitem, ivalue);
-		break;
-	case ARG_DAYS_TO_START_WEEK_SELECTION:
-		ivalue = GTK_VALUE_INT (*arg);
-		e_calendar_item_set_days_start_week_sel (calitem, ivalue);
-		break;
-	case ARG_MOVE_SELECTION_WHEN_MOVING:
-		bvalue = GTK_VALUE_BOOL (*arg);
-		calitem->move_selection_when_moving = bvalue;
-		break;
-	case ARG_ROUND_SELECTION_WHEN_MOVING:
-		bvalue = GTK_VALUE_BOOL (*arg);
-		calitem->round_selection_when_moving = bvalue;
-		break;
-	case ARG_DISPLAY_POPUP:
-		bvalue = GTK_VALUE_BOOL (*arg);
-		e_calendar_item_set_display_popup (calitem, bvalue);
-		break;
-	default:
-		g_warning ("Invalid arg");
-	}
-
-	if (need_update) {
-		gnome_canvas_item_request_update (item);
-	}
-}
-
-
-static void
-e_calendar_item_realize		(GnomeCanvasItem *item)
-{
-	ECalendarItem *calitem;
-	GdkColormap *colormap;
-	gboolean success[E_CALENDAR_ITEM_COLOR_LAST];
-	gint nfailed;
-
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->realize)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->realize) (item);
-
-	calitem = E_CALENDAR_ITEM (item);
-
-	colormap = gtk_widget_get_colormap (GTK_WIDGET (item->canvas));
-
-	calitem->colors[E_CALENDAR_ITEM_COLOR_TODAY_BOX].red   = 65535;
-	calitem->colors[E_CALENDAR_ITEM_COLOR_TODAY_BOX].green = 0;
-	calitem->colors[E_CALENDAR_ITEM_COLOR_TODAY_BOX].blue  = 0;
-
-	calitem->colors[E_CALENDAR_ITEM_COLOR_SELECTION_FG].red   = 65535;
-	calitem->colors[E_CALENDAR_ITEM_COLOR_SELECTION_FG].green = 65535;
-	calitem->colors[E_CALENDAR_ITEM_COLOR_SELECTION_FG].blue  = 65535;
-
-	calitem->colors[E_CALENDAR_ITEM_COLOR_SELECTION_BG].red   = 47000;
-	calitem->colors[E_CALENDAR_ITEM_COLOR_SELECTION_BG].green = 47000;
-	calitem->colors[E_CALENDAR_ITEM_COLOR_SELECTION_BG].blue  = 48000;
-
-	calitem->colors[E_CALENDAR_ITEM_COLOR_PREV_OR_NEXT_MONTH_FG].red   = 47000;
-	calitem->colors[E_CALENDAR_ITEM_COLOR_PREV_OR_NEXT_MONTH_FG].green = 47000;
-	calitem->colors[E_CALENDAR_ITEM_COLOR_PREV_OR_NEXT_MONTH_FG].blue  = 48000;
-
-	nfailed = gdk_colormap_alloc_colors (colormap, calitem->colors,
-					     E_CALENDAR_ITEM_COLOR_LAST, FALSE,
-					     TRUE, success);
-	if (nfailed)
-		g_warning ("Failed to allocate all colors");
-}
-
-
-static void
-e_calendar_item_unrealize	(GnomeCanvasItem *item)
-{
-	ECalendarItem *calitem;
-	GdkColormap *colormap;
-	gint i;
-
-	calitem = E_CALENDAR_ITEM (item);
-
-	colormap = gtk_widget_get_colormap (GTK_WIDGET (item->canvas));
-
-	for (i = 0; i < E_CALENDAR_ITEM_COLOR_LAST; i++)
-		gdk_colors_free (colormap, &calitem->colors[i].pixel, 1, 0);
-
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->unrealize)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->unrealize) (item);
-}
-
-
-static void
-e_calendar_item_unmap		(GnomeCanvasItem *item)
-{
-	ECalendarItem *calitem;
-
-	calitem = E_CALENDAR_ITEM (item);
-
-	if (calitem->selecting) {
-		gnome_canvas_item_ungrab (item, GDK_CURRENT_TIME);
-		calitem->selecting = FALSE;
-	}
-
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->unmap)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->unmap) (item);
-}
-
-
-static void
-e_calendar_item_update		(GnomeCanvasItem *item,
-				 double		 *affine,
-				 ArtSVP		 *clip_path,
-				 int		  flags)
-{
-	ECalendarItem *calitem;
-	GtkStyle *style;
-	GdkFont *font;
-	gint char_height, width, height, space, space_per_cal, space_per_cell;
-	gint rows, cols, xthickness, ythickness;
-
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->update)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->update) (item, affine, clip_path, flags);
-
-	calitem = E_CALENDAR_ITEM (item);
-	style = GTK_WIDGET (item->canvas)->style;
-	xthickness = style->klass->xthickness;
-	ythickness = style->klass->ythickness;
-
-	item->x1 = calitem->x1;
-	item->y1 = calitem->y1;
-	item->x2 = calitem->x2 >= calitem->x1 ? calitem->x2 : calitem->x1;
-	item->y2 = calitem->y2 >= calitem->y1 ? calitem->y2 : calitem->y1;
-
-	/*
-	 * Calculate the new layout of the calendar.
-	 */
-
-	/* Make sure the minimum row width & cell height and the widths of
-	   all the digits and characters are up to date. */
-	e_calendar_item_recalc_sizes (calitem);
-
-	/* Calculate how many rows & cols we can fit in. */
-	width = item->x2 - item->x1;
-	height = item->y2 - item->y1;
-
-	width -= xthickness * 2;
-	height -= ythickness * 2;
-
-	if (calitem->min_month_height == 0)
-		rows = 1;
-	else
-		rows = height / calitem->min_month_height;
-	rows = MAX (rows, calitem->min_rows);
-	if (calitem->max_rows > 0)
-		rows = MIN (rows, calitem->max_rows);
-
-	if (calitem->min_month_width == 0)
-		cols = 1;
-	else
-		cols = width / calitem->min_month_width;
-	cols = MAX (cols, calitem->min_cols);
-	if (calitem->max_cols > 0)
-		cols = MIN (cols, calitem->max_cols);
-
-	if (rows != calitem->rows || cols != calitem->cols)
-		e_calendar_item_date_range_changed (calitem);
-
-	calitem->rows = rows;
-	calitem->cols = cols;
-
-	/* Split up the empty space according to the configuration.
-	   If the calendar is set to expand, we divide the space between the
-	   cells and the spaces around the calendar, otherwise we place the
-	   calendars in the center of the available area. */
-
-	font = calitem->font;
-	if (!font)
-		font = style->font;
-	char_height = font->ascent + font->descent;
-
-	calitem->month_width = calitem->min_month_width;
-	calitem->month_height = calitem->min_month_height;
-	calitem->cell_width = calitem->max_digit_width * 2
-		+ E_CALENDAR_ITEM_MIN_CELL_XPAD;
-	calitem->cell_height = char_height
-		+ E_CALENDAR_ITEM_MIN_CELL_YPAD;
-	calitem->month_tpad = 0;
-	calitem->month_bpad = 0;
-	calitem->month_lpad = 0;
-	calitem->month_rpad = 0;
-
-	space = height - calitem->rows * calitem->month_height;
-	if (space > 0) {
-		space_per_cal = space / calitem->rows;
-		calitem->month_height += space_per_cal;
-
-		if (calitem->expand) {
-			space_per_cell = space_per_cal / E_CALENDAR_ROWS_PER_MONTH;
-			calitem->cell_height += space_per_cell;
-			space_per_cal -= space_per_cell * E_CALENDAR_ROWS_PER_MONTH;
-		}
-
-		calitem->month_tpad = space_per_cal / 2;
-		calitem->month_bpad = space_per_cal - calitem->month_tpad;
-	}
-
-	space = width - calitem->cols * calitem->month_width;
-	if (space > 0) {
-		space_per_cal = space / calitem->cols;
-		calitem->month_width += space_per_cal;
-		space -= space_per_cal * calitem->cols;
-
-		if (calitem->expand) {
-			space_per_cell = space_per_cal / E_CALENDAR_COLS_PER_MONTH;
-			calitem->cell_width += space_per_cell;
-			space_per_cal -= space_per_cell * E_CALENDAR_COLS_PER_MONTH;
-		}
-
-		calitem->month_lpad = space_per_cal / 2;
-		calitem->month_rpad = space_per_cal - calitem->month_lpad;
-	}
-
-	space = MAX (0, space);
-	calitem->x_offset = space / 2;
-
-	gnome_canvas_request_redraw (item->canvas, item->x1, item->y1,
-				     item->x2, item->y2);
-}
-
-
-/*
- * DRAWING ROUTINES - functions to paint the canvas item.
- */
-
-static void
-e_calendar_item_draw		(GnomeCanvasItem *canvas_item,
-				 GdkDrawable	 *drawable,
-				 int		  x,
-				 int		  y,
-				 int		  width,
-				 int		  height)
-{
-	ECalendarItem *calitem;
-	GtkStyle *style;
-	GdkFont *font;
-	GdkGC *base_gc, *bg_gc;
-	gint char_height, row, col, row_y, bar_height, col_x;
-	gint xthickness, ythickness;
-
-#if 0
-	g_print ("In e_calendar_item_draw %i,%i %ix%i\n",
-		 x, y, width, height);
-#endif
-	calitem = E_CALENDAR_ITEM (canvas_item);
-	style = GTK_WIDGET (canvas_item->canvas)->style;
-	font = calitem->font;
-	if (!font)
-		font = style->font;
-	char_height = font->ascent + font->descent;
-	xthickness = style->klass->xthickness;
-	ythickness = style->klass->ythickness;
-	base_gc = style->base_gc[GTK_STATE_NORMAL];
-	bg_gc = style->bg_gc[GTK_STATE_NORMAL];
-
-	/* Clear the entire background. */
-	gdk_draw_rectangle (drawable, base_gc, TRUE,
-			    calitem->x1 - x, calitem->y1 - y,
-			    calitem->x2 - calitem->x1 + 1,
-			    calitem->y2 - calitem->y1 + 1);
-
-	/* Draw the shadow around the entire item. */
-	gtk_draw_shadow (style, drawable,
-			 GTK_STATE_NORMAL, GTK_SHADOW_IN,
-			 calitem->x1 - x, calitem->y1 - y,
-			 calitem->x2 - calitem->x1 + 1,
-			 calitem->y2 - calitem->y1 + 1);
-
-	row_y = canvas_item->y1 + ythickness;
-	bar_height = ythickness * 2
-		+ E_CALENDAR_ITEM_YPAD_ABOVE_MONTH_NAME + char_height
-		+ E_CALENDAR_ITEM_YPAD_BELOW_MONTH_NAME;
-
-	for (row = 0; row < calitem->rows; row++) {
-		/* Draw the background for the title bars and the shadow around
-		   it, and the vertical lines between columns. */
-
-		gdk_draw_rectangle (drawable, bg_gc, TRUE,
-				    calitem->x1 + xthickness - x, row_y - y,
-				    calitem->x2 - calitem->x1 + 1
-				    - xthickness * 2,
-				    bar_height);
-
-		gtk_draw_shadow (style, drawable,
-				 GTK_STATE_NORMAL, GTK_SHADOW_OUT,
-				 calitem->x1 + xthickness - x, row_y - y,
-				 calitem->x2 - calitem->x1 + 1
-				 - xthickness * 2,
-				 bar_height);
-
-
-		for (col = 0; col < calitem->cols; col++) {
-			if (col != 0) {
-				col_x = calitem->x1 + calitem->x_offset
-					+ calitem->month_width * col;
-				gtk_draw_vline (style, drawable,
-						GTK_STATE_NORMAL,
-						row_y + ythickness + 1 - y,
-						row_y + bar_height
-						- ythickness - 2 - y,
-						col_x - 1 - x);
-			}
-
-
-			e_calendar_item_draw_month (calitem, drawable, x, y,
-						    width, height, row, col);
-		}
-
-		row_y += calitem->month_height;
-	}
-}
-
-
-static void
-e_calendar_item_draw_month	(ECalendarItem   *calitem,
-				 GdkDrawable	 *drawable,
-				 int		  x,
-				 int		  y,
-				 int		  width,
-				 int		  height,
-				 int		  row,
-				 int		  col)
-{
-	GnomeCanvasItem *item;
-	GtkWidget *widget;
-	GtkStyle *style;
-	GdkFont *font;
-	GdkGC *fg_gc;
-	struct tm tmp_tm;
-	GdkRectangle clip_rect;
-	gint char_height, xthickness, ythickness, start_weekday;
-	gint year, month;
-	gint month_x, month_y, month_w, month_h;
-	gint min_x, max_x, text_x, text_y;
-	gint day, day_index, cells_x, cells_y, min_cell_width, text_width;
-	gint clip_width, clip_height;
-	gchar buffer[64];
-
-#if 0
-	g_print ("In e_calendar_item_draw_month: %i,%i %ix%i row:%i col:%i\n",
-		 x, y, width, height, row, col);
-#endif
-	item = GNOME_CANVAS_ITEM (calitem);
-	widget = GTK_WIDGET (item->canvas);
-	style = widget->style;
-	font = calitem->font;
-	if (!font)
-		font = style->font;
-	char_height = font->ascent + font->descent;
-	xthickness = style->klass->xthickness;
-	ythickness = style->klass->ythickness;
-	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
-
-	/* Calculate the top-left position of the entire month display. */
-	month_x = item->x1 + xthickness + calitem->x_offset
-		+ col * calitem->month_width - x;
-	month_w = item->x2 - item->x1 - xthickness * 2;
-	month_w = MIN (month_w, calitem->month_width);
-	month_y = item->y1 + ythickness + row * calitem->month_height - y;
-	month_h = item->y2 - item->y1 - ythickness * 2;
-	month_h = MIN (month_h, calitem->month_height);
-
-	/* Just return if the month is outside the given area. */
-	if (month_x >= width || month_x + calitem->month_width <= 0
-	    || month_y >= height || month_y + calitem->month_height <= 0)
-		return;
-
-	month = calitem->month + row * calitem->cols + col;
-	year = calitem->year + month / 12;
-	month %= 12;
-
-	/* Draw the month name & year, with clipping. Note that the top row
-	   needs extra space around it for the buttons. */
-	if (row == 0 && col == 0)
-		min_x = E_CALENDAR_ITEM_XPAD_BEFORE_MONTH_NAME_WITH_BUTTON;
-	else
-		min_x = E_CALENDAR_ITEM_XPAD_BEFORE_MONTH_NAME;
-
-	max_x = month_w;
-	if (row == 0 && col == calitem->cols - 1)
-		max_x -= E_CALENDAR_ITEM_XPAD_AFTER_MONTH_NAME_WITH_BUTTON;
-	else
-		max_x -= E_CALENDAR_ITEM_XPAD_AFTER_MONTH_NAME;
-
-	text_y = month_y + style->klass->ythickness
-		+ E_CALENDAR_ITEM_YPAD_ABOVE_MONTH_NAME;
-	clip_rect.x = month_x + min_x;
-	clip_rect.x = MAX (0, clip_rect.x);
-	clip_rect.y = MAX (0, text_y);
-
-	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;
-
-	if (month_x + max_x - clip_rect.x > 0) {
-		clip_rect.width = month_x + max_x - clip_rect.x;
-		clip_rect.height = text_y + char_height - clip_rect.y;
-		gdk_gc_set_clip_rectangle (fg_gc, &clip_rect);
-
-		/* This is a strftime() format. %B = Month name, %Y = Year. */
-		strftime (buffer, sizeof (buffer), _("%B %Y"), &tmp_tm);
-
-		/* Ideally we place the text centered in the month, but we
-		   won't go to the left of the minimum x position. */
-		text_width = gdk_string_width (font, buffer);
-		text_x = (calitem->month_width - text_width) / 2;
-		text_x = MAX (min_x, text_x);
-
-		gdk_draw_string (drawable, font, fg_gc,
-				 month_x + text_x, text_y + font->ascent, buffer);
-	}
-
-	/* Set the clip rectangle for the main month display. */
-	clip_rect.x = MAX (0, month_x);
-	clip_rect.y = MAX (0, month_y);
-	clip_width = month_x + month_w - clip_rect.x;
-	clip_height = month_y + month_h - clip_rect.y;
-
-	if (clip_width <= 0 || clip_height <= 0)
-		return;
-
-	clip_rect.width = clip_width;
-	clip_rect.height = clip_height;
-
-	gdk_gc_set_clip_rectangle (fg_gc, &clip_rect);
-
-
-	/* Draw the day initials across the top of the month. */
-	min_cell_width = calitem->max_digit_width * 2
-		+ E_CALENDAR_ITEM_MIN_CELL_XPAD;
-
-	cells_x = month_x + E_CALENDAR_ITEM_XPAD_BEFORE_WEEK_NUMBERS + calitem->month_lpad
-		+ E_CALENDAR_ITEM_XPAD_BEFORE_CELLS;
-	if (calitem->show_week_numbers)
-		cells_x += calitem->max_week_number_digit_width * 2
-			+ E_CALENDAR_ITEM_XPAD_AFTER_WEEK_NUMBERS + 1;
-	text_x = cells_x + calitem->cell_width
-		- (calitem->cell_width - min_cell_width) / 2;
-	text_x -= E_CALENDAR_ITEM_MIN_CELL_XPAD / 2;
-	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;
-
-	cells_y = text_y + char_height
-		+ E_CALENDAR_ITEM_YPAD_BELOW_DAY_LETTERS + 1
-		+ E_CALENDAR_ITEM_YPAD_ABOVE_CELLS;
-
-	text_y += font->ascent;
-	day_index = calitem->week_start_day;
-	for (day = 0; day < 7; day++) {
-		gdk_draw_text (drawable, font, fg_gc,
-			       text_x - calitem->day_widths[day_index], text_y,
-			       &calitem->days[day_index], 1);
-		text_x += calitem->cell_width;
-		day_index++;
-		if (day_index == 7)
-			day_index = 0;
-	}
-
-
-	/* Draw the horizontal line beneath the day initials. */
-	gdk_draw_line (drawable, fg_gc,
-		       cells_x - E_CALENDAR_ITEM_XPAD_BEFORE_CELLS,
-		       cells_y - E_CALENDAR_ITEM_YPAD_ABOVE_CELLS - 1,
-		       cells_x + E_CALENDAR_COLS_PER_MONTH * calitem->cell_width - 1,
-		       cells_y - E_CALENDAR_ITEM_YPAD_ABOVE_CELLS - 1);
-
-	e_calendar_item_draw_day_numbers (calitem, drawable, width, height,
-					  row, col, year, month, start_weekday,
-					  cells_x, cells_y);
-
-	/* Draw the vertical line after the week number. */
-	if (calitem->show_week_numbers) {
-		gdk_draw_line (drawable, fg_gc,
-			       cells_x - E_CALENDAR_ITEM_XPAD_BEFORE_CELLS - 1,
-			       cells_y - E_CALENDAR_ITEM_YPAD_ABOVE_CELLS - 1,
-			       cells_x - E_CALENDAR_ITEM_XPAD_BEFORE_CELLS - 1,
-			       cells_y + E_CALENDAR_ROWS_PER_MONTH * calitem->cell_height - 1);
-	}
-
-	gdk_gc_set_clip_rectangle (fg_gc, NULL);
-}
-
-
-static void
-e_calendar_item_draw_day_numbers (ECalendarItem	*calitem,
-				  GdkDrawable	*drawable,
-				  int		 width,
-				  int		 height,
-				  int		 row,
-				  int		 col,
-				  int		 year,
-				  int		 month,
-				  int		 start_weekday,
-				  gint		 cells_x,
-				  gint		 cells_y)
-{
-	GnomeCanvasItem *item;
-	GtkWidget *widget;
-	GtkStyle *style;
-	GdkFont *font, *wkfont;
-	GdkGC *fg_gc;
-	GdkColor *bg_color, *fg_color, *box_color;
-	struct tm today_tm;
-	time_t t;
-	gint char_height, min_cell_width, min_cell_height;
-	gint day_num, drow, dcol, day_x, day_y;
-	gint text_x, text_y;
-	gint num_chars, digit;
-	gint week_num, mon, days_from_week_start;
-	gint years[3], months[3], days_in_month[3];
-	gboolean today, selected, has_focus = FALSE, drop_target = FALSE;
-	gboolean bold, draw_day, finished = FALSE;
-	gint today_year, today_month, today_mday, month_offset;
-	gchar buffer[2];
-	gint day_style = 0;
-
-	item = GNOME_CANVAS_ITEM (calitem);
-	widget = GTK_WIDGET (item->canvas);
-	style = widget->style;
-	font = calitem->font;
-	if (!font)
-		font = style->font;
-	wkfont = calitem->week_number_font;
-	if (!wkfont)
-		wkfont = font;
-	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
-	char_height = font->ascent + font->descent;
-
-	min_cell_width = calitem->max_digit_width * 2
-		+ E_CALENDAR_ITEM_MIN_CELL_XPAD;
-	min_cell_height = char_height + E_CALENDAR_ITEM_MIN_CELL_YPAD;
-
-	/* Calculate the number of days in the previous, current, and next
-	   months. */
-	years[0] = years[1] = years[2] = year;
-	months[0] = month - 1;
-	months[1] = month;
-	months[2] = month + 1;
-	if (months[0] == -1) {
-		months[0] = 11;
-		years[0]--;
-	}
-	if (months[2] == 12) {
-		months[2] = 0;
-		years[2]++;
-	}
-
-	days_in_month[0] = DAYS_IN_MONTH (years[0], months[0]);
-	days_in_month[1] = DAYS_IN_MONTH (years[1], months[1]);
-	days_in_month[2] = DAYS_IN_MONTH (years[2], months[2]);
-
-	/* Mon 0 is the previous month, which we may show the end of. Mon 1 is
-	   the current month, and mon 2 is the next month. */
-	mon = 0;
-
-	month_offset = row * calitem->cols + col - 1;
-	day_num = days_in_month[0];
-	days_from_week_start = (start_weekday + 7 - calitem->week_start_day)
-		% 7;
-	/* For the top-left month we show the end of the previous month, and
-	   if the new month starts on the first day of the week we show a
-	   complete week from the previous month. */
-	if (days_from_week_start == 0) {
-		if (row == 0 && col == 0) {
-			day_num -= 6;
-		} else {
-			mon++;
-			month_offset++;
-			day_num = 1;
-		}
-	} else {
-		day_num -= days_from_week_start - 1;
-	}
-
-	/* Get today's date, so we can highlight it. */
-	if (calitem->time_callback) {
-		today_tm = (*calitem->time_callback) (calitem, calitem->time_callback_data);
-	} else {
-		t = time (NULL);
-		today_tm = *localtime (&t);
-	}
-	today_year = today_tm.tm_year + 1900;
-	today_month = today_tm.tm_mon;
-	today_mday = today_tm.tm_mday;
-
-	/* We usually skip the last days of the previous month (mon = 0),
-	   except for the top-left month displayed. */
-	draw_day = (mon == 1 || (row == 0 && col == 0));
-
-	for (drow = 0; drow < 6; drow++) {
-		/* Draw the week number. */
-		if (calitem->show_week_numbers) {
-			week_num = e_calendar_item_get_week_number (calitem,
-								    day_num,
-								    months[mon],
-								    years[mon]);
-
-			text_x = cells_x - E_CALENDAR_ITEM_XPAD_BEFORE_CELLS - 1
-				- E_CALENDAR_ITEM_XPAD_AFTER_WEEK_NUMBERS;
-			text_y = cells_y + drow * calitem->cell_height +
-				+ (calitem->cell_height - min_cell_height + 1) / 2;
-
-			num_chars = 0;
-			if (week_num >= 10) {
-				digit = week_num / 10;
-				text_x -= calitem->week_number_digit_widths[digit];
-				buffer[num_chars++] = digit + '0';
-			}
-
-			digit = week_num % 10;
-			text_x -= calitem->week_number_digit_widths[digit];
-			buffer[num_chars++] = digit + '0';
-
-			gdk_gc_set_foreground (fg_gc,
-					       &style->fg[GTK_STATE_NORMAL]);
-			gdk_draw_text (drawable, wkfont, fg_gc,
-				       text_x, text_y + font->ascent,
-				       buffer, num_chars);
-		}
-
-		for (dcol = 0; dcol < 7; dcol++) {
-			if (draw_day) {
-				day_x = cells_x + dcol * calitem->cell_width;
-				day_y = cells_y + drow * calitem->cell_height;
-
-				today = years[mon] == today_year
-					&& months[mon] == today_month
-					&& day_num == today_mday;
-
-				selected = calitem->selection_set
-					&& (calitem->selection_start_month_offset < month_offset
-					    || (calitem->selection_start_month_offset == month_offset
-						&& calitem->selection_start_day <= day_num))
-					&& (calitem->selection_end_month_offset > month_offset
-					    || (calitem->selection_end_month_offset == month_offset
-						&& calitem->selection_end_day >= day_num));
-
-				if (calitem->styles)
-					day_style = calitem->styles[(month_offset + 1) * 32 + day_num];
-
-				/* Get the colors & style to use for the day.*/
-				if (calitem->style_callback)
-					(*calitem->style_callback)
-						(calitem,
-						 years[mon],
-						 months[mon],
-						 day_num,
-						 day_style,
-						 today,
-						 mon != 1,
-						 selected,
-						 has_focus,
-						 drop_target,
-						 &bg_color,
-						 &fg_color,
-						 &box_color,
-						 &bold,
-						 calitem->style_callback_data);
-				else
-					e_calendar_item_get_day_style
-						(calitem,
-						 years[mon],
-						 months[mon],
-						 day_num,
-						 day_style,
-						 today,
-						 mon != 1,
-						 selected,
-						 has_focus,
-						 drop_target,
-						 &bg_color,
-						 &fg_color,
-						 &box_color,
-						 &bold);
-
-				/* Draw the background, if set. */
-				if (bg_color) {
-					gdk_gc_set_foreground (fg_gc, bg_color);
-					gdk_draw_rectangle (drawable, fg_gc,
-							    TRUE,
-							    day_x, day_y,
-							    calitem->cell_width,
-							    calitem->cell_height);
-				}
-
-				/* Draw the box, if set. */
-				if (box_color) {
-					gdk_gc_set_foreground (fg_gc, box_color);
-					gdk_draw_rectangle (drawable, fg_gc,
-							    FALSE,
-							    day_x, day_y,
-							    calitem->cell_width - 1,
-							    calitem->cell_height - 1);
-				}
-
-				/* Draw the 1- or 2-digit day number. */
-				day_x += calitem->cell_width - (calitem->cell_width - min_cell_width) / 2;
-				day_x -= E_CALENDAR_ITEM_MIN_CELL_XPAD / 2;
-				day_y += (calitem->cell_height - min_cell_height + 1) / 2;
-				day_y += E_CALENDAR_ITEM_MIN_CELL_YPAD / 2;
-
-				num_chars = 0;
-				if (day_num >= 10) {
-					digit = day_num / 10;
-					day_x -= calitem->digit_widths[digit];
-					buffer[num_chars++] = digit + '0';
-				}
-
-				digit = day_num % 10;
-				day_x -= calitem->digit_widths[digit];
-				buffer[num_chars++] = digit + '0';
-
-				if (fg_color) {
-					gdk_gc_set_foreground (fg_gc,
-							       fg_color);
-				} else {
-					gdk_gc_set_foreground (fg_gc,
-							       &style->fg[GTK_STATE_NORMAL]);
-				}
-
-				gdk_draw_text (drawable, font, fg_gc,
-					       day_x,
-					       day_y + font->ascent,
-					       buffer, num_chars);
-				/* We use a stupid technique for bold. Just
-				   draw it again 1 pixel to the left. */
-				if (bold)
-					gdk_draw_text (drawable, font, fg_gc,
-						       day_x - 1,
-						       day_y + font->ascent,
-						       buffer, num_chars);
-			}
-
-			/* See if we've reached the end of a month. */
-			if (day_num == days_in_month[mon]) {
-				month_offset++;
-				mon++;
-				/* We only draw the start of the next month
-				   for the bottom-right month displayed. */
-				if (mon == 2 && (row != calitem->rows - 1
-						 || col != calitem->cols - 1)) {
-					/* Set a flag so we exit the loop. */
-					finished = TRUE;
-					break;
-				}
-				day_num = 1;
-				draw_day = TRUE;
-			} else {
-				day_num++;
-			}
-		}
-
-		/* Exit the loop if the flag is set. */
-		if (finished)
-			break;
-	}
-
-	/* Reset the foreground color. */
-	gdk_gc_set_foreground (fg_gc, &style->fg[GTK_STATE_NORMAL]);
-}
-
-
-static gint
-e_calendar_item_get_week_number	(ECalendarItem *calitem,
-				 gint		day,
-				 gint		month,
-				 gint		year)
-{
-	GDate tmp_date;
-	gint weekday, yearday, offset, week_num;
-
-	/* FIXME: check what happens at year boundaries. */
-
-	g_date_clear (&tmp_date, 1);
-	g_date_set_dmy (&tmp_date, day, month + 1, year);
-
-	/* This results in a value of 0 (Monday) - 6 (Sunday). */
-	weekday = g_date_weekday (&tmp_date) - 1;
-
-	/* Calculate the offset from the start of the week. */
-	offset = (calitem->week_start_day + 7 - weekday) % 7;
-
-	/* Calculate the day of the year, from 0 to 365. */
-	yearday = g_date_day_of_year (&tmp_date) - 1;
-
-	/* If the week starts on or after 29th December, it is week 1 of the
-	   next year, since there are 4 days in the next year. */
-	g_date_subtract_days (&tmp_date, offset);
-	if (g_date_month (&tmp_date) == 12 && g_date_day (&tmp_date) >= 29)
-		return 1;
-
-	/* Calculate the week number, from 0. */
-	week_num = (yearday - offset) / 7;
-
-	/* If the first week starts on or after Jan 5th, then we need to add
-	   1 since the previous week will really be the first week. */
-	if ((yearday - offset) % 7 >= 4)
-		week_num++;
-
-	/* Add 1 so week numbers are from 1 to 53. */
-	return week_num + 1;
-}
-
-
-
-/* This is supposed to return the nearest item the the point and the distance.
-   Since we are the only item we just return ourself and 0 for the distance.
-   This is needed so that we get button/motion events. */
-static double
-e_calendar_item_point (GnomeCanvasItem *item, double x, double y,
-			   int cx, int cy,
-			   GnomeCanvasItem **actual_item)
-{
-	*actual_item = item;
-	return 0.0;
-}
-
-
-static gint
-e_calendar_item_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	ECalendarItem *calitem;
-
-	calitem = E_CALENDAR_ITEM (item);
-
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-		return e_calendar_item_button_press (calitem, event);
-	case GDK_BUTTON_RELEASE:
-		return e_calendar_item_button_release (calitem, event);
-	case GDK_MOTION_NOTIFY:
-		return e_calendar_item_motion (calitem, event);
-	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-
-
-/* This checks if any fonts have changed, and if so it recalculates the
-   text sizes and the minimum month size. */
-static void
-e_calendar_item_recalc_sizes		(ECalendarItem *calitem)
-{
-	GnomeCanvasItem *canvas_item;
-	GtkStyle *style;
-	GdkFont *font, *wkfont;
-	gchar *digits = "0123456789";
-	gint day, digit, max_digit_width, max_week_number_digit_width;
-	gint char_height, width, min_cell_width, min_cell_height;
-
-	canvas_item = GNOME_CANVAS_ITEM (calitem);
-	style = GTK_WIDGET (canvas_item->canvas)->style;
-
-	if (!style)
-		return;
-
-	font = calitem->font;
-	if (!font)
-		font = style->font;
-	wkfont = calitem->week_number_font;
-	if (!wkfont)
-		wkfont = font;
-
-	g_return_if_fail (font != NULL);
-	g_return_if_fail (wkfont != NULL);
-
-	char_height = font->ascent + font->descent;
-
-	/* If both fonts are the same, just return. */
-	if (font != calitem->old_font
-	    || wkfont != calitem->old_week_number_font) {
-		if (calitem->old_font)
-			gdk_font_unref (calitem->old_font);
-		calitem->old_font = font;
-		gdk_font_ref (font);
-
-		if (calitem->old_week_number_font)
-			gdk_font_unref (calitem->old_week_number_font);
-		calitem->old_week_number_font = wkfont;
-		gdk_font_ref (wkfont);
-
-		for (day = 0; day < 7; day++)
-			calitem->day_widths[day] = gdk_char_width (font, calitem->days[day]);
-
-		max_digit_width = 0;
-		max_week_number_digit_width = 0;
-		for (digit = 0; digit < 10; digit++) {
-			width = gdk_char_width (font, digits[digit]);
-			calitem->digit_widths[digit] = width;
-			max_digit_width = MAX (max_digit_width, width);
-
-			if (wkfont) {
-				width = gdk_char_width (wkfont, digits[digit]);
-				calitem->week_number_digit_widths[digit] = width;
-				max_week_number_digit_width = MAX (max_week_number_digit_width, width);
-			} else {
-				calitem->week_number_digit_widths[digit] = width;
-				max_week_number_digit_width = max_digit_width;
-			}
-		}
-		calitem->max_digit_width = max_digit_width;
-		calitem->max_week_number_digit_width = max_week_number_digit_width;
-	}
-
-	min_cell_width = calitem->max_digit_width * 2
-		+ E_CALENDAR_ITEM_MIN_CELL_XPAD;
-	min_cell_height = char_height + E_CALENDAR_ITEM_MIN_CELL_YPAD;
-
-	calitem->min_month_width = E_CALENDAR_ITEM_XPAD_BEFORE_WEEK_NUMBERS
-		+ E_CALENDAR_ITEM_XPAD_BEFORE_CELLS + min_cell_width * 7
-		+ E_CALENDAR_ITEM_XPAD_AFTER_CELLS;
-	if (calitem->show_week_numbers) {
-		calitem->min_month_width += calitem->max_week_number_digit_width * 2
-			+ E_CALENDAR_ITEM_XPAD_AFTER_WEEK_NUMBERS + 1;
-	}
-
-	calitem->min_month_height = style->klass->ythickness * 2
-		+ E_CALENDAR_ITEM_YPAD_ABOVE_MONTH_NAME + char_height
-		+ E_CALENDAR_ITEM_YPAD_BELOW_MONTH_NAME + 1
-		+ E_CALENDAR_ITEM_YPAD_ABOVE_DAY_LETTERS
-		+ char_height + E_CALENDAR_ITEM_YPAD_BELOW_DAY_LETTERS + 1
-		+ E_CALENDAR_ITEM_YPAD_ABOVE_CELLS + min_cell_height * 6
-		+ E_CALENDAR_ITEM_YPAD_BELOW_CELLS;
-}
-
-
-static void
-e_calendar_item_get_day_style		(ECalendarItem	*calitem,
-					 gint		 year,
-					 gint		 month,
-					 gint		 day,
-					 gint		 day_style,
-					 gboolean	 today,
-					 gboolean	 prev_or_next_month,
-					 gboolean	 selected,
-					 gboolean	 has_focus,
-					 gboolean	 drop_target,
-					 GdkColor      **bg_color,
-					 GdkColor      **fg_color,
-					 GdkColor      **box_color,
-					 gboolean	*bold)
-{
-	*bg_color = NULL;
-	*fg_color = NULL;
-	*box_color = NULL;
-	*bold = FALSE;
-
-	if (day_style == 1)
-		*bold = TRUE;
-
-	if (today)
-		*box_color = &calitem->colors[E_CALENDAR_ITEM_COLOR_TODAY_BOX];
-
-	if (prev_or_next_month)
-		*fg_color = &calitem->colors[E_CALENDAR_ITEM_COLOR_PREV_OR_NEXT_MONTH_FG];
-
-	if (selected) {
-		*fg_color = &calitem->colors[E_CALENDAR_ITEM_COLOR_SELECTION_FG];
-		*bg_color = &calitem->colors[E_CALENDAR_ITEM_COLOR_SELECTION_BG];
-	}
-}
-
-
-
-static gboolean
-e_calendar_item_button_press	(ECalendarItem	*calitem,
-				 GdkEvent	*event)
-{
-	gint month_offset, day;
-	gboolean all_week, round_up_end = FALSE, round_down_start = FALSE;
-
-	if (event->button.button == 4)
-		e_calendar_item_set_first_month (calitem, calitem->year,
-						 calitem->month - 1);
-	else if (event->button.button == 5)
-		e_calendar_item_set_first_month (calitem, calitem->year,
-						 calitem->month + 1);
-
-	if (!e_calendar_item_convert_position_to_day (calitem,
-						      event->button.x,
-						      event->button.y,
-						      TRUE,
-						      &month_offset, &day,
-						      &all_week))
-		return FALSE;
-
-	if (event->button.button == 3 && day == -1 
-	    && e_calendar_item_get_display_popup (calitem)) {
-		e_calendar_item_show_popup_menu (calitem,
-						 (GdkEventButton*) event,
-						 month_offset);
-		return TRUE;
-	}
-
-	if (event->button.button != 1 || day == -1)
-		return FALSE;
-
-	if (calitem->max_days_selected < 1)
-		return TRUE;
-
-	if (gnome_canvas_item_grab (GNOME_CANVAS_ITEM (calitem),
-				    GDK_POINTER_MOTION_MASK
-				    | GDK_BUTTON_RELEASE_MASK,
-				    NULL, event->button.time) != 0)
-		return FALSE;
-
-	calitem->selection_set = TRUE;
-	calitem->selection_start_month_offset = month_offset;
-	calitem->selection_start_day = day;
-	calitem->selection_end_month_offset = month_offset;
-	calitem->selection_end_day = day;
-
-	calitem->selection_real_start_month_offset = month_offset;
-	calitem->selection_real_start_day = day;
-
-	calitem->selection_from_full_week = FALSE;
-	calitem->selecting = TRUE;
-	calitem->selection_dragging_end = TRUE;
-
-	if (all_week) {
-		calitem->selection_from_full_week = TRUE;
-		round_up_end = TRUE;
-	}
-
-	if (calitem->days_to_start_week_selection == 1) {
-		round_down_start = TRUE;
-		round_up_end = TRUE;
-	}
-
-	/* Don't round up or down if we can't select a week or more. */
-	if (calitem->max_days_selected < 7) {
-		round_down_start = FALSE;
-		round_up_end = FALSE;
-	}
-
-	if (round_up_end)
-		e_calendar_item_round_up_selection (calitem, &calitem->selection_end_month_offset, &calitem->selection_end_day);
-
-	if (round_down_start)
-		e_calendar_item_round_down_selection (calitem, &calitem->selection_start_month_offset, &calitem->selection_start_day);
-
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (calitem));
-
-	return TRUE;
-}
-
-
-static gboolean
-e_calendar_item_button_release	(ECalendarItem	*calitem,
-				 GdkEvent	*event)
-{
-	if (!calitem->selecting)
-		return FALSE;
-
-	gnome_canvas_item_ungrab (GNOME_CANVAS_ITEM (calitem),
-				  event->button.time);
-
-	calitem->selecting = FALSE;
-
-	/* If the user selects the grayed dates before the first month or
-	   after the last month, we move backwards or forwards one month.
-	   The set_month() call should take care of updating the selection. */
-	if (calitem->selection_end_month_offset == -1)
-		e_calendar_item_set_first_month (calitem, calitem->year,
-						 calitem->month - 1);
-	else if (calitem->selection_start_month_offset == calitem->rows * calitem->cols)
-		e_calendar_item_set_first_month (calitem, calitem->year,
-						 calitem->month + 1);
-
-	calitem->selection_changed = TRUE;
-	e_calendar_item_queue_signal_emission (calitem);
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (calitem));
-
-	return FALSE;
-}
-
-
-static gboolean
-e_calendar_item_motion		(ECalendarItem	*calitem,
-				 GdkEvent	*event)
-{
-	gint start_month, start_day, end_month, end_day, month_offset, day;
-	gint tmp_month, tmp_day, days_in_selection;
-	gboolean all_week, round_up_end = FALSE, round_down_start = FALSE;
-
-	if (!calitem->selecting)
-		return FALSE;
-
-	if (!e_calendar_item_convert_position_to_day (calitem,
-						      event->button.x,
-						      event->button.y,
-						      TRUE,
-						      &month_offset, &day,
-						      &all_week))
-		return FALSE;
-
-	if (day == -1)
-		return FALSE;
-
-	if (calitem->selection_dragging_end) {
-		start_month = calitem->selection_real_start_month_offset;
-		start_day = calitem->selection_real_start_day;
-		end_month = month_offset;
-		end_day = day;
-	} else {
-		start_month = month_offset;
-		start_day = day;
-		end_month = calitem->selection_real_start_month_offset;
-		end_day = calitem->selection_real_start_day;
-	}
-
-	if (start_month > end_month || (start_month == end_month
-					&& start_day > end_day)) {
-		tmp_month = start_month;
-		tmp_day = start_day;
-		start_month = end_month;
-		start_day = end_day;
-		end_month = tmp_month;
-		end_day = tmp_day;
-
-		calitem->selection_dragging_end = !calitem->selection_dragging_end;
-	}
-
-	if (calitem->days_to_start_week_selection > 0) {
-		days_in_selection = e_calendar_item_get_inclusive_days (calitem, start_month, start_day, end_month, end_day);
-		if (days_in_selection >= calitem->days_to_start_week_selection) {
-			round_down_start = TRUE;
-			round_up_end = TRUE;
-		}
-	}
-
-	/* If we are over a week number and we are dragging the end of the
-	   selection, we round up to the end of this week. */
-	if (all_week && calitem->selection_dragging_end)
-		round_up_end = TRUE;
-
-	/* If the selection was started from a week number and we are dragging
-	   the start of the selection, we need to round up the end to include
-	   all of the original week selected. */
-	if (calitem->selection_from_full_week
-	    && !calitem->selection_dragging_end)
-			round_up_end = TRUE;
-
-	/* Don't round up or down if we can't select a week or more. */
-	if (calitem->max_days_selected < 7) {
-		round_down_start = FALSE;
-		round_up_end = FALSE;
-	}
-
-	if (round_up_end)
-		e_calendar_item_round_up_selection (calitem, &end_month,
-						    &end_day);
-	if (round_down_start)
-		e_calendar_item_round_down_selection (calitem, &start_month,
-						      &start_day);
-
-
-	/* Check we don't go over the maximum number of days to select. */
-	if (calitem->selection_dragging_end) {
-		e_calendar_item_check_selection_end (calitem,
-						     start_month,
-						     start_day,
-						     &end_month,
-						     &end_day);
-	} else {
-		e_calendar_item_check_selection_start (calitem,
-						       &start_month,
-						       &start_day,
-						       end_month,
-						       end_day);
-	}
-
-	if (start_month == calitem->selection_start_month_offset
-	    && start_day == calitem->selection_start_day
-	    && end_month == calitem->selection_end_month_offset
-	    && end_day == calitem->selection_end_day)
-		return FALSE;
-
-	calitem->selection_start_month_offset = start_month;
-	calitem->selection_start_day = start_day;
-	calitem->selection_end_month_offset = end_month;
-	calitem->selection_end_day = end_day;
-
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (calitem));
-
-	return TRUE;
-}
-
-
-static void
-e_calendar_item_check_selection_end	(ECalendarItem	*calitem,
-					 gint		 start_month,
-					 gint		 start_day,
-					 gint		*end_month,
-					 gint		*end_day)
-{
-	gint year, month, max_month, max_day, days_in_month;
-
-	if (calitem->max_days_selected <= 0)
-		return;
-
-	year = calitem->year;
-	month = calitem->month + start_month;
-	e_calendar_item_normalize_date (calitem, &year, &month);
-
-	max_month = start_month;
-	max_day = start_day + calitem->max_days_selected - 1;
-
-	for (;;) {
-		days_in_month = DAYS_IN_MONTH (year, month);
-		if (max_day <= days_in_month)
-			break;
-		max_month++;
-		month++;
-		if (month == 12) {
-			year++;
-			month = 0;
-		}
-		max_day -= days_in_month;
-	}
-
-	if (*end_month > max_month) {
-		*end_month = max_month;
-		*end_day = max_day;
-	} else if (*end_month == max_month && *end_day > max_day) {
-		*end_day = max_day;
-	}
-}
-
-
-static void
-e_calendar_item_check_selection_start	(ECalendarItem	*calitem,
-					 gint		*start_month,
-					 gint		*start_day,
-					 gint		 end_month,
-					 gint		 end_day)
-{
-	gint year, month, min_month, min_day, days_in_month;
-
-	if (calitem->max_days_selected <= 0)
-		return;
-
-	year = calitem->year;
-	month = calitem->month + end_month;
-	e_calendar_item_normalize_date (calitem, &year, &month);
-
-	min_month = end_month;
-	min_day = end_day - calitem->max_days_selected + 1;
-
-	while (min_day <= 0) {
-		min_month--;
-		month--;
-		if (month == -1) {
-			year--;
-			month = 11;
-		}
-		days_in_month = DAYS_IN_MONTH (year, month);
-		min_day += days_in_month;
-	}
-
-	if (*start_month < min_month) {
-		*start_month = min_month;
-		*start_day = min_day;
-	} else if (*start_month == min_month && *start_day < min_day) {
-		*start_day = min_day;
-	}
-}
-
-
-/* Converts a position within the item to a month & day.
-   The month returned is 0 for the top-left month displayed.
-   If the position is over the month heading -1 is returned for the day.
-   If the position is over a week number the first day of the week is returned
-   and entire_week is set to TRUE.
-   It returns FALSE if the position is completely outside all months. */
-static gboolean
-e_calendar_item_convert_position_to_day	(ECalendarItem	*calitem,
-					 gint		 event_x,
-					 gint		 event_y,
-					 gboolean	 round_empty_positions,
-					 gint		*month_offset,
-					 gint		*day,
-					 gboolean	*entire_week)
-{
-	GnomeCanvasItem *item;
-	GtkWidget *widget;
-	GtkStyle *style;
-	gint xthickness, ythickness, char_height;
-	gint x, y, row, col, cells_x, cells_y, day_row, day_col;
-	gint first_day_offset, days_in_month, days_in_prev_month;
-	gint week_num_x1, week_num_x2;
-
-	item = GNOME_CANVAS_ITEM (calitem);
-	widget = GTK_WIDGET (item->canvas);
-	style = widget->style;
-	char_height = style->font->ascent + style->font->descent;
-	xthickness = style->klass->xthickness;
-	ythickness = style->klass->ythickness;
-
-	*entire_week = FALSE;
-
-	x = event_x - xthickness - calitem->x_offset;
-	y = event_y - ythickness;
-
-	if (x < 0 || y < 0)
-		return FALSE;
-
-	row = y / calitem->month_height;
-	col = x / calitem->month_width;
-
-	if (row >= calitem->rows || col >= calitem->cols)
-		return FALSE;
-
-	*month_offset = row * calitem->cols + col;
-
-	x = x % calitem->month_width;
-	y = y % calitem->month_height;
-
-	if (y < ythickness * 2 + E_CALENDAR_ITEM_YPAD_ABOVE_MONTH_NAME
-	    + char_height + E_CALENDAR_ITEM_YPAD_BELOW_MONTH_NAME) {
-		*day = -1;
-		return TRUE;
-	}
-
-	cells_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
-		+ char_height + E_CALENDAR_ITEM_YPAD_BELOW_DAY_LETTERS + 1
-		+ E_CALENDAR_ITEM_YPAD_ABOVE_CELLS;
-	y -= cells_y;
-	if (y < 0)
-		return FALSE;
-	day_row = y / calitem->cell_height;
-	if (day_row >= E_CALENDAR_ROWS_PER_MONTH)
-		return FALSE;
-
-	week_num_x1 = E_CALENDAR_ITEM_XPAD_BEFORE_WEEK_NUMBERS + calitem->month_lpad;
-
-	if (calitem->show_week_numbers) {
-		week_num_x2 = week_num_x1
-			+ calitem->max_week_number_digit_width * 2;
-		if (x >= week_num_x1 && x < week_num_x2)
-			*entire_week = TRUE;
-		cells_x = week_num_x2 + E_CALENDAR_ITEM_XPAD_AFTER_WEEK_NUMBERS + 1;
-	} else {
-		cells_x = week_num_x1;
-	}
-
-	if (*entire_week) {
-		day_col = 0;
-	} else {
-		cells_x += E_CALENDAR_ITEM_XPAD_BEFORE_CELLS;
-		x -= cells_x;
-		if (x < 0)
-			return FALSE;
-		day_col = x / calitem->cell_width;
-		if (day_col >= E_CALENDAR_COLS_PER_MONTH)
-			return FALSE;
-	}
-
-	*day = day_row * E_CALENDAR_COLS_PER_MONTH + day_col;
-
-	e_calendar_item_get_month_info (calitem, row, col, &first_day_offset,
-					&days_in_month, &days_in_prev_month);
-	if (*day < first_day_offset) {
-		if (*entire_week || (row == 0 && col == 0)) {
-			(*month_offset)--;
-			*day = days_in_prev_month + 1 - first_day_offset
-				+ *day;
-			return TRUE;
-		} else if (round_empty_positions) {
-			*day = first_day_offset;
-		} else {
-			return FALSE;
-		}
-	}
-
-	*day -= first_day_offset - 1;
-
-	if (*day > days_in_month) {
-		if (row == calitem->rows - 1 && col == calitem->cols - 1) {
-			(*month_offset)++;
-			*day -= days_in_month;
-			return TRUE;
-		} else if (round_empty_positions) {
-			*day = days_in_month;
-		} else {
-			return FALSE;
-		}
-	}
-
-	return TRUE;
-}
-
-
-static void
-e_calendar_item_get_month_info	(ECalendarItem	*calitem,
-				 gint		 row,
-				 gint		 col,
-				 gint		*first_day_offset,
-				 gint		*days_in_month,
-				 gint		*days_in_prev_month)
-{
-	gint year, month, start_weekday, first_day_of_month;
-	struct tm tmp_tm = { 0 };
-
-	month = calitem->month + row * calitem->cols + col;
-	year = calitem->year + month / 12;
-	month = month % 12;
-
-	*days_in_month = DAYS_IN_MONTH (year, month);
-	if (month == 0)
-		*days_in_prev_month = DAYS_IN_MONTH (year - 1, 11);
-	else
-		*days_in_prev_month = DAYS_IN_MONTH (year, month - 1);
-
-	tmp_tm.tm_year = year - 1900;
-	tmp_tm.tm_mon = month;
-	tmp_tm.tm_mday = 1;
-	tmp_tm.tm_isdst = -1;
-	mktime (&tmp_tm);
-
-	/* Convert to 0 (Monday) to 6 (Sunday). */
-	start_weekday = (tmp_tm.tm_wday + 6) % 7;
-
-	first_day_of_month = (start_weekday + 7 - calitem->week_start_day) % 7;
-
-	if (row == 0 && col == 0 && first_day_of_month == 0)
-		*first_day_offset = 7;
-	else
-		*first_day_offset = first_day_of_month;
-}
-
-
-void
-e_calendar_item_get_first_month(ECalendarItem	*calitem,
-				gint		*year,
-				gint		*month)
-{
-	*year = calitem->year;
-	*month = calitem->month;
-}
-
-
-/* This also handles values of month < 0 or > 11 by updating the year. */
-void
-e_calendar_item_set_first_month(ECalendarItem	*calitem,
-				gint		 year,
-				gint		 month)
-{
-	gint new_year, new_month, months_diff, num_months;
-	gint old_days_in_selection, new_days_in_selection;
-
-	new_year = year;
-	new_month = month;
-	e_calendar_item_normalize_date	(calitem, &new_year, &new_month);
-
-	if (calitem->year == new_year && calitem->month == new_month)
-		return;
-
-	/* Update the selection. */
-	num_months = calitem->rows * calitem->cols;
-	months_diff = (new_year - calitem->year) * 12
-		+ new_month - calitem->month;
-
-	if (calitem->selection_set) {
-		if (!calitem->move_selection_when_moving
-		    || (calitem->selection_start_month_offset - months_diff >= 0
-			&& calitem->selection_end_month_offset - months_diff < num_months)) {
-			calitem->selection_start_month_offset -= months_diff;
-			calitem->selection_end_month_offset -= months_diff;
-			calitem->selection_real_start_month_offset -= months_diff;
-
-			calitem->year = new_year;
-			calitem->month = new_month;
-		} else {
-			old_days_in_selection = e_calendar_item_get_inclusive_days (calitem, calitem->selection_start_month_offset, calitem->selection_start_day, calitem->selection_end_month_offset, calitem->selection_end_day);
-
-			/* Make sure the selection will be displayed. */
-			if (calitem->selection_start_month_offset < 0
-			    || calitem->selection_start_month_offset >= num_months) {
-				calitem->selection_end_month_offset -= calitem->selection_start_month_offset;
-				calitem->selection_start_month_offset = 0;
-			}
-
-			/* We want to ensure that the same number of days are
-			   selected after we have moved the selection. */
-			calitem->year = new_year;
-			calitem->month = new_month;
-
-			e_calendar_item_ensure_valid_day (calitem, &calitem->selection_start_month_offset, &calitem->selection_start_day);
-			e_calendar_item_ensure_valid_day (calitem, &calitem->selection_end_month_offset, &calitem->selection_end_day);
-
-			if (calitem->round_selection_when_moving) {
-				e_calendar_item_round_down_selection (calitem, &calitem->selection_start_month_offset, &calitem->selection_start_day);
-			}
-
-			new_days_in_selection = e_calendar_item_get_inclusive_days (calitem, calitem->selection_start_month_offset, calitem->selection_start_day, calitem->selection_end_month_offset, calitem->selection_end_day);
-
-			if (old_days_in_selection != new_days_in_selection)
-				e_calendar_item_add_days_to_selection (calitem, old_days_in_selection - new_days_in_selection);
-
-			/* Flag that we need to emit the "selection_changed"
-			   signal. We don't want to emit it here since setting
-			   the "year" and "month" args would result in 2
-			   signals emitted. */
-			calitem->selection_changed = TRUE;
-		}
-	} else {
-		calitem->year = new_year;
-		calitem->month = new_month;
-	}
-
-	e_calendar_item_date_range_changed (calitem);
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (calitem));
-}
-
-/* Get the maximum number of days selectable */
-gint
-e_calendar_item_get_max_days_sel       (ECalendarItem	*calitem)
-{
-	return calitem->max_days_selected;
-}
-
-
-/* Set the maximum number of days selectable */
-void	 
-e_calendar_item_set_max_days_sel       (ECalendarItem	*calitem,
-					gint             days)
-{
-	calitem->max_days_selected = MAX (0, days);
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (calitem));
-}
-
-
-/* Get the maximum number of days before whole weeks are selected */
-gint     
-e_calendar_item_get_days_start_week_sel(ECalendarItem	*calitem)
-{
-	return calitem->days_to_start_week_selection;
-}
-
-
-/* Set the maximum number of days before whole weeks are selected */
-void	 
-e_calendar_item_set_days_start_week_sel(ECalendarItem	*calitem,
-					gint            days)
-{
-	calitem->days_to_start_week_selection = days;
-}
-
-gboolean 
-e_calendar_item_get_display_popup      (ECalendarItem	*calitem)
-{
-	return calitem->display_popup;
-}
-
-
-void	 
-e_calendar_item_set_display_popup      (ECalendarItem	*calitem,
-					gboolean        display)
-{
-	calitem->display_popup = display;
-}
-
-
-/* This will make sure that the given year & month are valid, i.e. if month
-   is < 0 or > 11 the year and month will be updated accordingly. */
-static void
-e_calendar_item_normalize_date	(ECalendarItem	*calitem,
-				 gint		*year,
-				 gint		*month)
-{
-	if (*month >= 0) {
-		*year += *month / 12;
-		*month = *month % 12;
-	} else {
-		*year += *month / 12 - 1;
-		*month = *month % 12;
-		if (*month != 0)
-			*month += 12;
-	}
-}
-
-
-/* Adds or subtracts days from the selection. It is used when we switch months
-   and the selection extends past the end of a month but we want to keep the
-   number of days selected the same. days should not be more than 30. */
-static void
-e_calendar_item_add_days_to_selection	(ECalendarItem	*calitem,
-					 gint		 days)
-{
-	gint year, month, days_in_month;
-
-	year = calitem->year;
-	month = calitem->month + calitem->selection_end_month_offset;
-	e_calendar_item_normalize_date (calitem, &year,	&month);
-
-	calitem->selection_end_day += days;
-	if (calitem->selection_end_day <= 0) {
-		month--;
-		e_calendar_item_normalize_date (calitem, &year,	&month);
-		calitem->selection_end_month_offset--;
-		calitem->selection_end_day += DAYS_IN_MONTH (year, month);
-	} else {
-		days_in_month = DAYS_IN_MONTH (year, month);
-		if (calitem->selection_end_day > days_in_month) {
-			calitem->selection_end_month_offset++;
-			calitem->selection_end_day -= days_in_month;
-		}
-	}
-}
-
-
-/* Gets the range of dates actually shown. Months are 0 to 11.
-   This also includes the last days of the previous month and the first days
-   of the following month, which are normally shown in gray.
-   It returns FALSE if no dates are currently shown. */
-gboolean
-e_calendar_item_get_date_range	(ECalendarItem	*calitem,
-				 gint		*start_year,
-				 gint		*start_month,
-				 gint		*start_day,
-				 gint		*end_year,
-				 gint		*end_month,
-				 gint		*end_day)
-{
-	gint first_day_offset, days_in_month, days_in_prev_month;
-
-	if (calitem->rows == 0 || calitem->cols == 0)
-		return FALSE;
-
-	/* Calculate the first day shown. This will be one of the greyed-out
-	   days before the first full month begins. */
-	e_calendar_item_get_month_info (calitem, 0, 0, &first_day_offset,
-					&days_in_month, &days_in_prev_month);
-	*start_year = calitem->year;
-	*start_month = calitem->month - 1;
-	if (*start_month == -1) {
-		(*start_year)--;
-		*start_month = 11;
-	}
-	*start_day = days_in_prev_month + 1 - first_day_offset;
-
-
-	/* Calculate the last day shown. This will be one of the greyed-out
-	   days after the last full month ends. */
-	e_calendar_item_get_month_info (calitem, calitem->rows - 1,
-					calitem->cols - 1, &first_day_offset,
-					&days_in_month, &days_in_prev_month);
-	*end_month = calitem->month + calitem->rows * calitem->cols;
-	*end_year = calitem->year + *end_month / 12;
-	*end_month %= 12;
-	*end_day = E_CALENDAR_ROWS_PER_MONTH * E_CALENDAR_COLS_PER_MONTH
-		- first_day_offset - days_in_month;
-
-	return TRUE;
-}
-
-
-/* Simple way to mark days so they appear bold.
-   A more flexible interface may be added later. */
-void
-e_calendar_item_clear_marks	(ECalendarItem	*calitem)
-{
-	GnomeCanvasItem *item;
-
-	item = GNOME_CANVAS_ITEM (calitem);
-
-	g_free (calitem->styles);
-	calitem->styles = NULL;
-
-	gnome_canvas_request_redraw (item->canvas, item->x1, item->y1,
-				     item->x2, item->y2);
-}
-
-
-void
-e_calendar_item_mark_day	(ECalendarItem	*calitem,
-				 gint		 year,
-				 gint		 month,
-				 gint		 day,
-				 guint8		 day_style)
-{
-	gint month_offset;
-
-	month_offset = (year - calitem->year) * 12 + month - calitem->month;
-	if (month_offset < -1 || month_offset > calitem->rows * calitem->cols)
-		return;
-
-	if (!calitem->styles)
-		calitem->styles = g_new0 (guint8, (calitem->rows * calitem->cols + 2) * 32);
-
-	calitem->styles[(month_offset + 1) * 32 + day] = day_style;
-}
-
-
-void
-e_calendar_item_mark_days	(ECalendarItem	*calitem,
-				 gint		 start_year,
-				 gint		 start_month,
-				 gint		 start_day,
-				 gint		 end_year,
-				 gint		 end_month,
-				 gint		 end_day,
-				 guint8		 day_style)
-{
-	gint month_offset, end_month_offset, day;
-
-	month_offset = (start_year - calitem->year) * 12 + start_month
-		- calitem->month;
-	day = start_day;
-	if (month_offset > calitem->rows * calitem->cols)
-		return;
-	if (month_offset < -1) {
-		month_offset = -1;
-		day = 1;
-	}
-
-	end_month_offset = (end_year - calitem->year) * 12 + end_month
-		- calitem->month;
-	if (end_month_offset < -1)
-		return;
-	if (end_month_offset > calitem->rows * calitem->cols) {
-		end_month_offset = calitem->rows * calitem->cols;
-		end_day = 31;
-	}
-
-	if (month_offset > end_month_offset)
-		return;
-
-	if (!calitem->styles)
-		calitem->styles = g_new0 (guint8, (calitem->rows * calitem->cols + 2) * 32);
-
-	for (;;) {
-		if (month_offset == end_month_offset && day > end_day)
-			break;
-
-		calitem->styles[(month_offset + 1) * 32 + day] = day_style;
-
-		day++;
-		if (day == 32) {
-			month_offset++;
-			day = 1;
-			if (month_offset > end_month_offset)
-				break;
-		}
-	}
-}
-
-
-/* Rounds up the given day to the end of the week. */
-static void
-e_calendar_item_round_up_selection	(ECalendarItem	*calitem,
-					 gint		*month_offset,
-					 gint		*day)
-{
-	gint year, month, weekday, days, days_in_month;
-	struct tm tmp_tm = { 0 };
-
-	year = calitem->year;
-	month = calitem->month + *month_offset;
-	e_calendar_item_normalize_date (calitem, &year, &month);
-
-	tmp_tm.tm_year = year - 1900;
-	tmp_tm.tm_mon = month;
-	tmp_tm.tm_mday = *day;
-	tmp_tm.tm_isdst = -1;
-	mktime (&tmp_tm);
-
-	/* Convert to 0 (Monday) to 6 (Sunday). */
-	weekday = (tmp_tm.tm_wday + 6) % 7;
-
-	/* Calculate how many days to the end of the row. */
-	days = (calitem->week_start_day + 6 - weekday) % 7;
-
-	*day += days;
-	days_in_month = DAYS_IN_MONTH (year, month);
-	if (*day > days_in_month) {
-		(*month_offset)++;
-		*day -= days_in_month;
-	}
-}
-
-
-/* Rounds down the given day to the start of the week. */
-static void
-e_calendar_item_round_down_selection	(ECalendarItem	*calitem,
-					 gint		*month_offset,
-					 gint		*day)
-{
-	gint year, month, weekday, days, days_in_month;
-	struct tm tmp_tm = { 0 };
-
-	year = calitem->year;
-	month = calitem->month + *month_offset;
-	e_calendar_item_normalize_date (calitem, &year, &month);
-
-	tmp_tm.tm_year = year - 1900;
-	tmp_tm.tm_mon = month;
-	tmp_tm.tm_mday = *day;
-	tmp_tm.tm_isdst = -1;
-	mktime (&tmp_tm);
-
-	/* Convert to 0 (Monday) to 6 (Sunday). */
-	weekday = (tmp_tm.tm_wday + 6) % 7;
-
-	/* Calculate how many days to the start of the row. */
-	days = (weekday + 7 - calitem->week_start_day) % 7;
-
-	*day -= days;
-	if (*day <= 0) {
-		month--;
-		if (month == -1) {
-			year--;
-			month = 11;
-		}
-		days_in_month = DAYS_IN_MONTH (year, month);
-		(*month_offset)--;
-		*day += days_in_month;
-	}
-}
-
-
-static gint
-e_calendar_item_get_inclusive_days	(ECalendarItem	*calitem,
-					 gint		 start_month_offset,
-					 gint		 start_day,
-					 gint		 end_month_offset,
-					 gint		 end_day)
-{
-	gint start_year, start_month, end_year, end_month, days = 0;
-
-	start_year = calitem->year;
-	start_month = calitem->month + start_month_offset;
-	e_calendar_item_normalize_date (calitem, &start_year, &start_month);
-
-	end_year = calitem->year;
-	end_month = calitem->month + end_month_offset;
-	e_calendar_item_normalize_date (calitem, &end_year, &end_month);
-
-	while (start_year < end_year || start_month < end_month) {
-		days += DAYS_IN_MONTH (start_year, start_month);
-		start_month++;
-		if (start_month == 12) {
-			start_year++;
-			start_month = 0;
-		}
-	}
-
-	days += end_day - start_day + 1;
-
-	return days;
-}
-
-
-/* If the day is off the end of the month it is set to the last day of the
-   month. */
-static void
-e_calendar_item_ensure_valid_day	(ECalendarItem	*calitem,
-					 gint		*month_offset,
-					 gint		*day)
-{
-	gint year, month, days_in_month;
-
-	year = calitem->year;
-	month = calitem->month + *month_offset;
-	e_calendar_item_normalize_date (calitem, &year, &month);
-
-	days_in_month = DAYS_IN_MONTH (year, month);
-	if (*day > days_in_month)
-		*day = days_in_month;
-}
-
-
-gboolean
-e_calendar_item_get_selection		(ECalendarItem	*calitem,
-					 GDate		*start_date,
-					 GDate		*end_date)
-{
-	gint start_year, start_month, start_day;
-	gint end_year, end_month, end_day;
-
-	g_date_clear (start_date, 1);
-	g_date_clear (end_date, 1);
-
-	if (!calitem->selection_set)
-		return FALSE;
-
-	start_year = calitem->year;
-	start_month = calitem->month + calitem->selection_start_month_offset;
-	e_calendar_item_normalize_date (calitem, &start_year, &start_month);
-	start_day = calitem->selection_start_day;
-
-	end_year = calitem->year;
-	end_month = calitem->month + calitem->selection_end_month_offset;
-	e_calendar_item_normalize_date (calitem, &end_year, &end_month);
-	end_day = calitem->selection_end_day;
-
-	g_date_set_dmy (start_date, start_day, start_month + 1, start_year);
-	g_date_set_dmy (end_date, end_day, end_month + 1, end_year);
-
-	return TRUE;
-}
-
-
-void
-e_calendar_item_set_selection	(ECalendarItem	*calitem,
-				 GDate		*start_date,
-				 GDate		*end_date)
-{
-	gint start_year, start_month, start_day;
-	gint end_year, end_month, end_day;
-	gint new_start_month_offset, new_start_day;
-	gint new_end_month_offset, new_end_day;
-	gboolean need_update;
-
-	g_return_if_fail (E_IS_CALENDAR_ITEM (calitem));
-
-	/* If the user is in the middle of a selection, we must abort it. */
-	if (calitem->selecting) {
-		gnome_canvas_item_ungrab (GNOME_CANVAS_ITEM (calitem),
-					  GDK_CURRENT_TIME);
-		calitem->selecting = FALSE;
-	}
-
-	/* If start_date is NULL, we clear the selection without changing the
-	   month shown. */
-	if (start_date == NULL) {
-		calitem->selection_set = FALSE;
-		calitem->selection_changed = TRUE;
-		e_calendar_item_queue_signal_emission (calitem);
-		gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (calitem));
-		return;
-	}
-
-	if (end_date == NULL)
-		end_date = start_date;
-		
-	g_return_if_fail (g_date_compare (start_date, end_date) <= 0);
-
-	start_year = g_date_year (start_date);
-	start_month = g_date_month (start_date) - 1;
-	start_day = g_date_day (start_date);
-	end_year = g_date_year (end_date);
-	end_month = g_date_month (end_date) - 1;
-	end_day = g_date_day (end_date);
-
-	need_update = e_calendar_item_ensure_days_visible (calitem,
-							   start_year,
-							   start_month,
-							   start_day,
-							   end_year,
-							   end_month,
-							   end_day);
-
-	new_start_month_offset = (start_year - calitem->year) * 12
-		+ start_month - calitem->month;
-	new_start_day = start_day;
-
-	/* This may go outside the visible months, but we don't care. */
-	new_end_month_offset = (end_year - calitem->year) * 12
-		+ end_month - calitem->month;
-	new_end_day = end_day;
-
-
-	if (!calitem->selection_set
-	    || calitem->selection_start_month_offset != new_start_month_offset
-	    || calitem->selection_start_day != new_start_day
-	    || calitem->selection_end_month_offset != new_end_month_offset
-	    || calitem->selection_end_day != new_end_day) {
-		need_update = TRUE;
-		calitem->selection_changed = TRUE;
-		e_calendar_item_queue_signal_emission (calitem);
-		calitem->selection_set = TRUE;
-		calitem->selection_start_month_offset = new_start_month_offset;
-		calitem->selection_start_day = new_start_day;
-		calitem->selection_end_month_offset = new_end_month_offset;
-		calitem->selection_end_day = new_end_day;
-
-		calitem->selection_real_start_month_offset = new_start_month_offset;
-		calitem->selection_real_start_day = new_start_day;
-		calitem->selection_from_full_week = FALSE;
-	}
-
-	if (need_update)
-		gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (calitem));
-}
-
-
-/* This tries to ensure that the given time range is visible. If the range
-   given is longer than we can show, only the start of it will be visible.
-   Note that this will not update the selection. That should be done somewhere
-   else. It returns TRUE if the visible range has been changed. */
-static gboolean
-e_calendar_item_ensure_days_visible	(ECalendarItem	*calitem,
-					 gint		 start_year,
-					 gint		 start_month,
-					 gint		 start_day,
-					 gint		 end_year,
-					 gint		 end_month,
-					 gint		 end_day)
-{
-	gint current_end_year, current_end_month;
-	gint months_shown, months;
-	gint first_day_offset, days_in_month, days_in_prev_month;
-	gboolean need_update = FALSE;
-
-	months_shown = calitem->rows * calitem->cols;
-	months = (end_year - start_year) * 12 + end_month - start_month;
-
-	/* Calculate the range of months currently displayed. */
-	current_end_year = calitem->year;
-	current_end_month = calitem->month + months_shown - 1;
-	e_calendar_item_normalize_date (calitem, &current_end_year,
-					&current_end_month);
-
-	/* Try to ensure that the end month is shown. */
-	if (end_year > current_end_year
-	    || (end_year == current_end_year
-		&& end_month > current_end_month)) {
-		need_update = TRUE;
-		calitem->year = end_year;
-		calitem->month = end_month - months_shown + 1;
-		e_calendar_item_normalize_date (calitem, &calitem->year,
-						&calitem->month);
-	}
-
-	/* Now try to ensure that the start month is shown. We do this after
-	   the end month so that the start month will always be shown. */
-	if (start_year < calitem->year
-	    || (start_year == calitem->year
-		&& start_month < calitem->month)) {
-		need_update = TRUE;
-
-		/* First we see if the start of the selection will fit in the
-		   leftover days of the month before the first one shown. */
-		calitem->year = start_year;
-		calitem->month = start_month + 1;
-		e_calendar_item_normalize_date (calitem, &calitem->year,
-						&calitem->month);
-
-		e_calendar_item_get_month_info (calitem, 0, 0,
-						&first_day_offset,
-						&days_in_month,
-						&days_in_prev_month);
-
-		if (start_day <= days_in_prev_month - first_day_offset) {
-			calitem->year = start_year;
-			calitem->month = start_month;
-		}
-	}
-
-	if (need_update)
-		e_calendar_item_date_range_changed (calitem);
-
-	return need_update;
-}
-
-
-static void
-e_calendar_item_show_popup_menu		(ECalendarItem	*calitem,
-					 GdkEventButton	*event,
-					 gint		 month_offset)
-{
-	GtkWidget *menu, *submenu, *menuitem, *label;
-	gint year, month;
-	gchar buffer[64];
-	struct tm tmp_tm;
-
-	menu = gtk_menu_new ();
-
-	for (year = calitem->year - 2; year <= calitem->year + 2; year++) {
-		g_snprintf (buffer, 64, "%i", year);
-		menuitem = gtk_menu_item_new_with_label (buffer);
-		gtk_widget_show (menuitem);
-		gtk_container_add (GTK_CONTAINER (menu), menuitem);
-
-		submenu = gtk_menu_new ();
-		gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
-
-		gtk_object_set_data (GTK_OBJECT (submenu), "year",
-				     GINT_TO_POINTER (year));
-		gtk_object_set_data (GTK_OBJECT (submenu), "month_offset",
-				     GINT_TO_POINTER (month_offset));
-
-		for (month = 0; month < 12; month++) {
-			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);
-			strftime (buffer, sizeof (buffer), "%B", &tmp_tm);
-
-			menuitem = gtk_menu_item_new ();
-			gtk_widget_show (menuitem);
-			gtk_container_add (GTK_CONTAINER (submenu), menuitem);
-
-			label = gtk_label_new (buffer);
-			gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-			gtk_widget_show (label);
-			gtk_container_add (GTK_CONTAINER (menuitem), label);
-
-			gtk_object_set_data (GTK_OBJECT (menuitem), "month",
-					     GINT_TO_POINTER (month));
-
-			gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
-					    GTK_SIGNAL_FUNC (e_calendar_item_on_menu_item_activate), calitem);
-		}
-	}
-
-	/* Run the menu modal so we can destroy it after. */
-	gtk_signal_connect (GTK_OBJECT (menu), "deactivate",
-			    GTK_SIGNAL_FUNC (gtk_main_quit), NULL);
-	gtk_menu_popup (GTK_MENU (menu), NULL, NULL,
-			e_calendar_item_position_menu, calitem,
-			event->button, event->time);
-	gtk_grab_add (menu);
-	gtk_main ();
-	gtk_grab_remove (menu);
-	gtk_widget_destroy (menu);
-}
-
-
-static void
-e_calendar_item_on_menu_item_activate	(GtkWidget	*menuitem,
-					 ECalendarItem	*calitem)
-{
-	gint year, month_offset, month;
-
-	year = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (menuitem->parent), "year"));
-	month_offset = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (menuitem->parent), "month_offset"));
-	month = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (menuitem), "month"));
-
-	month -= month_offset;
-	e_calendar_item_normalize_date (calitem, &year, &month);
-	e_calendar_item_set_first_month (calitem, year, month);
-}
-
-
-static void
-e_calendar_item_position_menu	(GtkMenu            *menu,
-				 gint               *x,
-				 gint               *y,
-				 gpointer            user_data)
-{
-	GtkRequisition requisition;
-	gint screen_width, screen_height;
-
-	gtk_widget_get_child_requisition (GTK_WIDGET (menu), &requisition);
-
-	*x -= 2;
-	*y -= requisition.height / 2;
-
-	screen_width = gdk_screen_width ();
-	screen_height = gdk_screen_height ();
-
-	*x = CLAMP (*x, 0, screen_width - requisition.width);
-	*y = CLAMP (*y, 0, screen_height - requisition.height);
-}
-
-
-/* Sets the function to call to get the colors to use for a particular day. */
-void
-e_calendar_item_set_style_callback	(ECalendarItem	*calitem,
-					 ECalendarItemStyleCallback cb,
-					 gpointer	 data,
-					 GtkDestroyNotify destroy)
-{
-	g_return_if_fail (E_IS_CALENDAR_ITEM (calitem));
-
-	if (calitem->style_callback_data && calitem->style_callback_destroy)
-		(*calitem->style_callback_destroy) (calitem->style_callback_data);
-
-	calitem->style_callback = cb;
-	calitem->style_callback_data = data;
-	calitem->style_callback_destroy = destroy;
-}
-
-
-static void
-e_calendar_item_date_range_changed	(ECalendarItem	*calitem)
-{
-	g_free (calitem->styles);
-	calitem->styles = NULL;
-	calitem->date_range_changed = TRUE;
-	e_calendar_item_queue_signal_emission (calitem);
-}
-
-
-static void
-e_calendar_item_queue_signal_emission	(ECalendarItem	*calitem)
-{
-	if (calitem->signal_emission_idle_id == 0) {
-		calitem->signal_emission_idle_id = g_idle_add_full (G_PRIORITY_HIGH, e_calendar_item_signal_emission_idle_cb, calitem, NULL);
-	}
-}
-
-
-static gboolean
-e_calendar_item_signal_emission_idle_cb	(gpointer data)
-{
-	ECalendarItem *calitem;
-
-	g_return_val_if_fail (E_IS_CALENDAR_ITEM (data), FALSE);
-
-	GDK_THREADS_ENTER ();
-
-	calitem = E_CALENDAR_ITEM (data);
-
-	calitem->signal_emission_idle_id = 0;
-
-	if (calitem->date_range_changed) {
-		gtk_signal_emit (GTK_OBJECT (calitem),
-				 e_calendar_item_signals[DATE_RANGE_CHANGED]);
-		calitem->date_range_changed = FALSE;
-	}
-
-	if (calitem->selection_changed) {
-		gtk_signal_emit (GTK_OBJECT (calitem),
-				 e_calendar_item_signals[SELECTION_CHANGED]);
-		calitem->selection_changed = FALSE;
-	}
-
-	GDK_THREADS_LEAVE ();
-	return FALSE;
-}
-
-
-/* Sets a callback to use to get the current time. This is useful if the
-   application needs to use its own timezone data rather than rely on the
-   Unix timezone. */
-void
-e_calendar_item_set_get_time_callback	(ECalendarItem	*calitem,
-					 ECalendarItemGetTimeCallback cb,
-					 gpointer	 data,
-					 GtkDestroyNotify destroy)
-{
-	g_return_if_fail (E_IS_CALENDAR_ITEM (calitem));
-
-	if (calitem->time_callback_data && calitem->time_callback_destroy)
-		(*calitem->time_callback_destroy) (calitem->time_callback_data);
-
-	calitem->time_callback = cb;
-	calitem->time_callback_data = data;
-	calitem->time_callback_destroy = destroy;
-}
diff --git a/widgets/misc/e-calendar-item.h b/widgets/misc/e-calendar-item.h
deleted file mode 100644
index 0ef25ed62a..0000000000
--- a/widgets/misc/e-calendar-item.h
+++ /dev/null
@@ -1,339 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2000, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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
- */
-#ifndef _E_CALENDAR_ITEM_H_
-#define _E_CALENDAR_ITEM_H_
-
-#include <libgnomeui/gnome-canvas.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * ECalendarItem - canvas item displaying a calendar.
- */
-
-#define	E_CALENDAR_ITEM_YPAD_ABOVE_MONTH_NAME	1
-#define	E_CALENDAR_ITEM_YPAD_BELOW_MONTH_NAME	1
-
-/* Used to mark days as bold in e_calendar_item_mark_day(). */
-#define E_CALENDAR_ITEM_MARK_BOLD	1
-
-
-/* These index our colors array. */
-typedef enum
-{
-	E_CALENDAR_ITEM_COLOR_TODAY_BOX,
-	E_CALENDAR_ITEM_COLOR_SELECTION_FG,
-	E_CALENDAR_ITEM_COLOR_SELECTION_BG,
-	E_CALENDAR_ITEM_COLOR_PREV_OR_NEXT_MONTH_FG,
-	
-	E_CALENDAR_ITEM_COLOR_LAST
-} ECalendarItemColors;
-
-typedef struct _ECalendarItem       ECalendarItem;
-typedef struct _ECalendarItemClass  ECalendarItemClass;
-
-/* The type of the callback function optionally used to get the colors to
-   use for each day. */
-typedef void (*ECalendarItemStyleCallback)   (ECalendarItem	*calitem,
-					      gint		 year,
-					      gint		 month,
-					      gint		 day,
-					      gint		 day_style,
-					      gboolean		 today,
-					      gboolean		 prev_or_next_month,
-					      gboolean		 selected,
-					      gboolean		 has_focus,
-					      gboolean		 drop_target,
-					      GdkColor	       **bg_color,
-					      GdkColor	       **fg_color,
-					      GdkColor	       **box_color,
-					      gboolean		*bold,
-					      gpointer		 data);
-
-/* The type of the callback function optionally used to get the current time.
- */
-typedef struct tm (*ECalendarItemGetTimeCallback) (ECalendarItem *calitem,
-						   gpointer	  data);
-
-
-#define E_CALENDAR_ITEM(obj)     (GTK_CHECK_CAST((obj), \
-        e_calendar_item_get_type (), ECalendarItem))
-#define E_CALENDAR_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\
-	e_calendar_item_get_type ()))
-#define E_IS_CALENDAR_ITEM(o)    (GTK_CHECK_TYPE((o), \
-	e_calendar_item_get_type ()))
-
-struct _ECalendarItem
-{
-	GnomeCanvasItem canvas_item;
-
-	/* The year & month of the first calendar being displayed. */
-	gint year;
-	gint month;	/* 0 to 11 */
-
-	/* Points to an array of styles, one char for each day. We use 32
-	   chars for each month, with n + 2 months, where n is the number of
-	   complete months shown (since we show some days before the first
-	   month and after the last month grayes out).
-	   A value of 0 is the default, and 1 is bold. */
-	guint8 *styles;
-
-	/*
-	 * Options.
-	 */
-
-	/* The minimum & maximum number of rows & columns of months.
-	   If the maximum values are -1 then there is no maximum.
-	   The minimum valies default to 1. The maximum values to -1. */
-	gint min_rows;
-	gint min_cols;
-	gint max_rows;
-	gint max_cols;
-
-	/* The actual number of rows & columns of months. */
-	gint rows;
-	gint cols;
-
-	/* Whether we show week nubers. */
-	gboolean show_week_numbers;
-
-	/* The first day of the week, 0 (Monday) to 6 (Sunday). */
-	gint week_start_day;
-
-	/* Whether the cells expand to fill extra space. */
-	gboolean expand;
-
-	/* The maximum number of days that can be selected. Defaults to 1. */
-	gint max_days_selected;
-
-	/* The number of days selected before we switch to selecting whole
-	   weeks, or -1 if we never switch. Defaults to -1. */
-	gint days_to_start_week_selection;
-
-	/* Whether the selection is moved when we move back/forward one month.
-	   Used for things like the EDateEdit which only want the selection to
-	   be changed when the user explicitly selects a day. */
-	gboolean move_selection_when_moving;
-
-	/* Whether the selection is rounded down to the nearest week when we
-	   move back/forward one month. Used for the week view. */
-	gboolean round_selection_when_moving;
-
-	/* Whether to display the pop-up, TRUE by default */
-	gboolean display_popup;
-
-	/*
-	 * Internal stuff.
-	 */
-
-	/* Bounds of item. */
-	gdouble x1, y1, x2, y2;
-
-	/* The minimum size of each month, based on the fonts used. */
-	gint min_month_width;
-	gint min_month_height;
-
-	/* The actual size of each month, after dividing extra space. */
-	gint month_width;
-	gint month_height;
-
-	/* The offset to the left edge of the first calendar. */
-	gint x_offset;
-
-	/* The padding around each calendar month. */
-	gint month_lpad, month_rpad;
-	gint month_tpad, month_bpad;
-
-	/* The size of each cell. */
-	gint cell_width;
-	gint cell_height;
-
-	/* The current selection. The month offsets are from 0, which is the
-	   top-left calendar month view. Note that -1 is used for the last days
-	   from the previous month. The days are real month days. */
-	gboolean selecting;
-	gboolean selection_dragging_end;
-	gboolean selection_from_full_week;
-	gboolean selection_set;
-	gint selection_start_month_offset;
-	gint selection_start_day;
-	gint selection_end_month_offset;
-	gint selection_end_day;
-	gint selection_real_start_month_offset;
-	gint selection_real_start_day;
-
-	/* The first character of each day of the week, e.g. 'MTWTFSS'. */
-	gchar *days;
-
-	/* Widths of the day characters. */
-	gint day_widths[7];
-
-	/* Widths of the digits, '0' .. '9'. */
-	gint digit_widths[10];
-	gint max_digit_width;
-	gint week_number_digit_widths[10];
-	gint max_week_number_digit_width;
-
-	/* Fonts for drawing text. If font isn't set it uses the font from the
-	   canvas widget. If week_number_font isn't set it uses font. */
-	GdkFont *font, *old_font;
-	GdkFont *week_number_font, *old_week_number_font;
-
-	ECalendarItemStyleCallback style_callback;
-	gpointer style_callback_data;
-	GtkDestroyNotify style_callback_destroy;
-
-	ECalendarItemGetTimeCallback time_callback;
-	gpointer time_callback_data;
-	GtkDestroyNotify time_callback_destroy;
-
-	/* Colors for drawing. */
-	GdkColor colors[E_CALENDAR_ITEM_COLOR_LAST];
-
-	/* Our idle handler for emitting signals. */
-	gint signal_emission_idle_id;
-
-	/* A flag to indicate that the selection or date range has changed.
-	   When set the idle function will emit the signal and reset it to
-	   FALSE. This is so we don't emit it several times when args are set
-	   etc. */
-	gboolean selection_changed;
-	gboolean date_range_changed;
-};
-
-struct _ECalendarItemClass
-{
-	GnomeCanvasItemClass parent_class;
-
-	void (* date_range_changed)	(ECalendarItem *calitem);
-	void (* selection_changed)	(ECalendarItem *calitem);
-};
-
-
-GtkType  e_calendar_item_get_type		(void);
-
-/* FIXME: months are 0-11 throughout, but 1-12 may be better. */
-
-void	 e_calendar_item_get_first_month	(ECalendarItem	*calitem,
-						 gint		*year,
-						 gint		*month);
-void	 e_calendar_item_set_first_month	(ECalendarItem	*calitem,
-						 gint		 year,
-						 gint		 month);
-
-/* Get the maximum number of days selectable */
-gint     e_calendar_item_get_max_days_sel       (ECalendarItem	*calitem);
-
-/* Set the maximum number of days selectable */
-void	 e_calendar_item_set_max_days_sel       (ECalendarItem	*calitem,
-						 gint            days);
-
-/* Get the maximum number of days selectable */
-gint     e_calendar_item_get_days_start_week_sel(ECalendarItem	*calitem);
-
-/* Get the maximum number of days before whole weeks are selected */
-void	 e_calendar_item_set_days_start_week_sel(ECalendarItem	*calitem,
-						 gint            days);
-
-/* Set the maximum number of days before whole weeks are selected */
-gboolean e_calendar_item_get_display_popup      (ECalendarItem	*calitem);
-
-/* Get the maximum number of days before whole weeks are selected */
-void	 e_calendar_item_set_display_popup      (ECalendarItem	*calitem,
-						 gboolean        display);
-
-/* Set the maximum number of days before whole weeks are selected */
-gint     e_calendar_item_get_days_start_week_sel(ECalendarItem	*calitem);
-
-/* Set the maximum number of days selectable */
-void	 e_calendar_item_set_days_start_week_sel(ECalendarItem	*calitem,
-						 gint            days);
-
-/* Gets the range of dates actually shown. Months are 0 to 11.
-   This also includes the last days of the previous month and the first days
-   of the following month, which are normally shown in gray.
-   It returns FALSE if no dates are currently shown. */
-gboolean e_calendar_item_get_date_range		(ECalendarItem	*calitem,
-						 gint		*start_year,
-						 gint		*start_month,
-						 gint		*start_day,
-						 gint		*end_year,
-						 gint		*end_month,
-						 gint		*end_day);
-
-/* Returns the selected date range. It returns FALSE if no days are currently
-   selected. */
-gboolean e_calendar_item_get_selection		(ECalendarItem	*calitem,
-						 GDate		*start_date,
-						 GDate		*end_date);
-/* Sets the selected date range, and changes the date range shown so at least
-   the start of the selection is shown. If start_date is NULL it clears the
-   selection. */
-void	 e_calendar_item_set_selection		(ECalendarItem	*calitem,
-						 GDate		*start_date,
-						 GDate		*end_date);
-
-/* Marks a particular day. Passing E_CALENDAR_ITEM_MARK_BOLD as the day style
-   will result in the day being shown as bold by default. The style callback
-   could support more day_styles, or the style callback could determine the
-   colors itself, without needing to mark days. */
-void	 e_calendar_item_clear_marks		(ECalendarItem	*calitem);
-void	 e_calendar_item_mark_day		(ECalendarItem	*calitem,
-						 gint		 year,
-						 gint		 month,
-						 gint		 day,
-						 guint8		 day_style);
-
-/* Mark a range of days. Any days outside the currently shown range are
-   ignored. */
-void	 e_calendar_item_mark_days		(ECalendarItem	*calitem,
-						 gint		 start_year,
-						 gint		 start_month,
-						 gint		 start_day,
-						 gint		 end_year,
-						 gint		 end_month,
-						 gint		 end_day,
-						 guint8		 day_style);
-
-/* Sets the function to call to get the colors to use for a particular day. */
-void	 e_calendar_item_set_style_callback	(ECalendarItem	*calitem,
-						 ECalendarItemStyleCallback cb,
-						 gpointer	 data,
-						 GtkDestroyNotify destroy);
-
-/* Sets a callback to use to get the current time. This is useful if the
-   application needs to use its own timezone data rather than rely on the
-   Unix timezone. */
-void	 e_calendar_item_set_get_time_callback	(ECalendarItem	*calitem,
-						 ECalendarItemGetTimeCallback cb,
-						 gpointer	 data,
-						 GtkDestroyNotify destroy);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_CALENDAR_ITEM_H_ */
diff --git a/widgets/misc/e-calendar.c b/widgets/misc/e-calendar.c
deleted file mode 100644
index cfb1375e45..0000000000
--- a/widgets/misc/e-calendar.c
+++ /dev/null
@@ -1,604 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2000, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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
- */
-
-/*
- * ECalendar - displays a table of monthly calendars, allowing highlighting
- * and selection of one or more days. Like GtkCalendar with more features.
- * Most of the functionality is in the ECalendarItem canvas item, though
- * we also add GnomeCanvasWidget buttons to go to the previous/next month and
- * to got to the current day.
- */
-
-#include <config.h>
-
-#include "e-calendar.h"
-
-#include <glib.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkpixmap.h>
-#include <gtk/gtksignal.h>
-#include <libgnomeui/gnome-canvas-widget.h>
-#include <gal/util/e-util.h>
-
-#define E_CALENDAR_SMALL_FONT	\
-	"-adobe-utopia-regular-r-normal-*-*-100-*-*-p-*-iso8859-*"
-#define E_CALENDAR_SMALL_FONT_FALLBACK	\
-	"-adobe-helvetica-medium-r-normal-*-*-80-*-*-p-*-iso8859-*"
-
-/* The space between the arrow buttons and the edge of the widget. */
-#define E_CALENDAR_ARROW_BUTTON_X_PAD	2
-#define E_CALENDAR_ARROW_BUTTON_Y_PAD	0
-
-/* Vertical padding. The padding above the button includes the space for the
-   horizontal line. */
-#define	E_CALENDAR_YPAD_ABOVE_LOWER_BUTTONS		4
-#define	E_CALENDAR_YPAD_BELOW_LOWER_BUTTONS		3
-
-/* Horizontal padding inside & between buttons. */
-#define E_CALENDAR_IXPAD_BUTTONS			4
-#define E_CALENDAR_XPAD_BUTTONS				8
-
-/* The time between steps when the prev/next buttons is pressed, in 1/1000ths
-   of a second, and the number of timeouts we skip before we start
-   automatically moving back/forward. */
-#define E_CALENDAR_AUTO_MOVE_TIMEOUT		150
-#define E_CALENDAR_AUTO_MOVE_TIMEOUT_DELAY	2
-
-static char * left_arrow_xpm[] = {
-	"7 7 3 1",
-	" 	c None",
-	".	c #949594",
-	"+	c #000000",
-	"     .+",
-	"   .+++",
-	" .+++++",
-	"+++++++",
-	" .+++++",
-	"   .+++",
-	"     .+"
-};
-
-static char * right_arrow_xpm[] = {
-	"7 7 3 1",
-	" 	c None",
-	".	c #949594",
-	"+	c #000000",
-	"+.     ",
-	"+++.   ",
-	"+++++. ",
-	"+++++++",
-	"+++++. ",
-	"+++.   ",
-	"+.     "
-};
-
-
-static void e_calendar_class_init	(ECalendarClass *class);
-static void e_calendar_init		(ECalendar	*cal);
-static void e_calendar_destroy		(GtkObject	*object);
-static void e_calendar_realize		(GtkWidget	*widget);
-static void e_calendar_style_set	(GtkWidget	*widget,
-					 GtkStyle	*previous_style);
-static void e_calendar_size_request	(GtkWidget      *widget,
-					 GtkRequisition *requisition);
-static void e_calendar_size_allocate	(GtkWidget	*widget,
-					 GtkAllocation	*allocation);
-static void e_calendar_draw		(GtkWidget	*widget,
-					 GdkRectangle	*area);
-static gint e_calendar_drag_motion	(GtkWidget      *widget,
-					 GdkDragContext *context,
-					 gint            x,
-					 gint            y,
-					 guint           time);
-static void e_calendar_drag_leave	(GtkWidget      *widget,
-					 GdkDragContext *context,
-					 guint           time);
-
-static void e_calendar_on_prev_pressed	(ECalendar	*cal);
-static void e_calendar_on_prev_released	(ECalendar	*cal);
-static void e_calendar_on_next_pressed	(ECalendar	*cal);
-static void e_calendar_on_next_released	(ECalendar	*cal);
-
-static void e_calendar_start_auto_move	(ECalendar	*cal,
-					 gboolean	 moving_forward);
-static gboolean e_calendar_auto_move_handler	(gpointer	 data);
-static void e_calendar_stop_auto_move	(ECalendar	*cal);
-
-static GnomeCanvasClass *parent_class;
-static GtkLayoutClass *grandparent_class;
-
-E_MAKE_TYPE (e_calendar, "ECalendar", ECalendar,
-	     e_calendar_class_init, e_calendar_init, E_CANVAS_TYPE)
-
-
-static void
-e_calendar_class_init (ECalendarClass *class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-
-	object_class = (GtkObjectClass *) class;
-	widget_class = (GtkWidgetClass *) class;
-
-	parent_class = gtk_type_class (E_CANVAS_TYPE);
-	grandparent_class = gtk_type_class (GTK_TYPE_LAYOUT);
-
-	object_class->destroy = e_calendar_destroy;
-
-	widget_class->realize		   = e_calendar_realize;
-	widget_class->style_set		   = e_calendar_style_set;
- 	widget_class->size_request	   = e_calendar_size_request;
- 	widget_class->size_allocate	   = e_calendar_size_allocate;
-	widget_class->draw		   = e_calendar_draw;
-	widget_class->drag_motion	   = e_calendar_drag_motion;
-	widget_class->drag_leave	   = e_calendar_drag_leave;
-}
-
-
-static void
-e_calendar_init (ECalendar *cal)
-{
-	GnomeCanvasGroup *canvas_group;
-	GdkFont *small_font;
-	GtkWidget *button, *pixmap;
-	GdkColormap *colormap;
-	GdkPixmap *gdk_pixmap;
-	GdkBitmap *gdk_mask;
-
-	GTK_WIDGET_UNSET_FLAGS (cal, GTK_CAN_FOCUS);
-
-	/* Create the small font. */
-	small_font = gdk_font_load (E_CALENDAR_SMALL_FONT);
-	if (!small_font)
-		small_font = gdk_font_load (E_CALENDAR_SMALL_FONT_FALLBACK);
-	if (!small_font)
-		g_warning ("Couldn't load font");
-
-	canvas_group = GNOME_CANVAS_GROUP (GNOME_CANVAS (cal)->root);
-
-	cal->calitem = E_CALENDAR_ITEM (gnome_canvas_item_new (canvas_group,
-							       e_calendar_item_get_type (),
-							       "week_number_font", small_font,
-							       NULL));
-
-	if (small_font)
-		gdk_font_unref (small_font);
-
-
-	/* Create the arrow buttons to move to the previous/next month. */
-	button = gtk_button_new ();
-	GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_FOCUS);
-	gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
-	gtk_widget_show (button);
-	gtk_signal_connect_object (GTK_OBJECT (button), "pressed",
-				   GTK_SIGNAL_FUNC (e_calendar_on_prev_pressed),
-				   GTK_OBJECT (cal));
-	gtk_signal_connect_object (GTK_OBJECT (button), "released",
-				   GTK_SIGNAL_FUNC (e_calendar_on_prev_released),
-				   GTK_OBJECT (cal));
-
-	colormap = gtk_widget_get_colormap (GTK_WIDGET (cal));
-	gdk_pixmap = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap,
-							    &gdk_mask, NULL,
-							    left_arrow_xpm);
-	pixmap = gtk_pixmap_new (gdk_pixmap, gdk_mask);
-	gtk_widget_show (pixmap);
-	gdk_pixmap_unref (gdk_pixmap);
-	gdk_bitmap_unref (gdk_mask);
-	gtk_container_add (GTK_CONTAINER (button), pixmap);
-
-	cal->prev_item = gnome_canvas_item_new (canvas_group,
-						gnome_canvas_widget_get_type (),
-						"widget", button,
-						NULL);
-
-	button = gtk_button_new ();
-	GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_FOCUS);
-	gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
-	gtk_widget_show (button);
-	gtk_signal_connect_object (GTK_OBJECT (button), "pressed",
-				   GTK_SIGNAL_FUNC (e_calendar_on_next_pressed),
-				   GTK_OBJECT (cal));
-	gtk_signal_connect_object (GTK_OBJECT (button), "released",
-				   GTK_SIGNAL_FUNC (e_calendar_on_next_released),
-				   GTK_OBJECT (cal));
-
-	gdk_pixmap = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap,
-							    &gdk_mask, NULL,
-							    right_arrow_xpm);
-	pixmap = gtk_pixmap_new (gdk_pixmap, gdk_mask);
-	gtk_widget_show (pixmap);
-	gdk_pixmap_unref (gdk_pixmap);
-	gdk_bitmap_unref (gdk_mask);
-	gtk_container_add (GTK_CONTAINER (button), pixmap);
-
-	cal->next_item = gnome_canvas_item_new (canvas_group,
-						gnome_canvas_widget_get_type (),
-						"widget", button,
-						NULL);
-
-	cal->min_rows = 1;
-	cal->min_cols = 1;
-	cal->max_rows = -1;
-	cal->max_cols = -1;
-
-	cal->timeout_id = 0;
-}
-
-
-/**
- * e_calendar_new:
- * @Returns: a new #ECalendar.
- *
- * Creates a new #ECalendar.
- **/
-GtkWidget *
-e_calendar_new			(void)
-{
-	GtkWidget *cal;
-
-	cal = gtk_type_new (e_calendar_get_type ());
-
-	return cal;
-}
-
-
-static void
-e_calendar_destroy		(GtkObject *object)
-{
-	ECalendar *cal;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (E_IS_CALENDAR (object));
-
-	cal = E_CALENDAR (object);
-
-	if (cal->timeout_id != 0) {
-		gtk_timeout_remove (cal->timeout_id);
-		cal->timeout_id = 0;
-	}
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-static void
-e_calendar_realize (GtkWidget *widget)
-{
-	(*GTK_WIDGET_CLASS (parent_class)->realize) (widget);
-
-	/* Set the background of the canvas window to the normal color,
-	   or the arrow buttons are not displayed properly. */
-	gdk_window_set_background (GTK_LAYOUT (widget)->bin_window,
-				   &widget->style->bg[GTK_STATE_NORMAL]);
-}
-
-
-static void
-e_calendar_style_set		(GtkWidget	*widget,
-				 GtkStyle	*previous_style)
-{
-	if (GTK_WIDGET_CLASS (parent_class)->style_set)
-		(*GTK_WIDGET_CLASS (parent_class)->style_set) (widget,
-							       previous_style);
-
-	/* Set the background of the canvas window to the normal color,
-	   or the arrow buttons are not displayed properly. */
-	if (GTK_WIDGET_REALIZED (widget->parent))
-		gdk_window_set_background (GTK_LAYOUT (widget)->bin_window,
-					   &widget->style->bg[GTK_STATE_NORMAL]);
-}
-
-
-static void
-e_calendar_size_request		(GtkWidget      *widget,
-				 GtkRequisition *requisition)
-{
-	ECalendar *cal;
-	GtkStyle *style;
-	gint col_width, row_height, width, height;
-
-	cal = E_CALENDAR (widget);
-	style = GTK_WIDGET (cal)->style;
-
-	gtk_object_get (GTK_OBJECT (cal->calitem),
-			"row_height", &row_height,
-			"column_width", &col_width,
-			NULL);
-
-	height = row_height * cal->min_rows;
-	width = col_width * cal->min_cols;
-
-	requisition->width = width + style->klass->xthickness * 2;
-	requisition->height = height + style->klass->ythickness * 2;
-}
-
-
-static void
-e_calendar_size_allocate	(GtkWidget	*widget,
-				 GtkAllocation	*allocation)
-{
-	ECalendar *cal;
-	GdkFont *font;
-	gdouble old_x2, old_y2, new_x2, new_y2;
-	gdouble xthickness, ythickness, arrow_button_size;
-
-	cal = E_CALENDAR (widget);
-	font = widget->style->font;
-	xthickness = widget->style->klass->xthickness;
-	ythickness = widget->style->klass->ythickness;
-
-	(*GTK_WIDGET_CLASS (parent_class)->size_allocate) (widget, allocation);
-
-	/* Set the scroll region to its allocated size, if changed. */
-	gnome_canvas_get_scroll_region (GNOME_CANVAS (cal),
-					NULL, NULL, &old_x2, &old_y2);
-	new_x2 = widget->allocation.width - 1;
-	new_y2 = widget->allocation.height - 1;
-	if (old_x2 != new_x2 || old_y2 != new_y2)
-		gnome_canvas_set_scroll_region (GNOME_CANVAS (cal),
-						0, 0, new_x2, new_y2);
-
-	/* Take off space for line & buttons if shown. */
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (cal->calitem),
-			       "x1", 0.0,
-			       "y1", 0.0,
-			       "x2", new_x2,
-			       "y2", new_y2,
-			       NULL);
-
-
-	/* Position the arrow buttons. */
-	arrow_button_size = font->ascent + font->descent
-		+ E_CALENDAR_ITEM_YPAD_ABOVE_MONTH_NAME
-		+ E_CALENDAR_ITEM_YPAD_BELOW_MONTH_NAME
-		- E_CALENDAR_ARROW_BUTTON_Y_PAD * 2;
-
-	gnome_canvas_item_set (cal->prev_item,
-			       "x", xthickness * 2
-			       + E_CALENDAR_ARROW_BUTTON_X_PAD,
-			       "y", ythickness * 2
-			       + E_CALENDAR_ARROW_BUTTON_Y_PAD,
-			       "width", arrow_button_size,
-			       "height", arrow_button_size,
-			       NULL);
-
-	gnome_canvas_item_set (cal->next_item,
-			       "x", new_x2 + 1 - xthickness * 2
-			       - E_CALENDAR_ARROW_BUTTON_X_PAD
-			       - arrow_button_size,
-			       "y", ythickness * 2
-			       + E_CALENDAR_ARROW_BUTTON_Y_PAD,
-			       "width", arrow_button_size,
-			       "height", arrow_button_size,
-			       NULL);
-}
-
-
-static void
-e_calendar_draw			(GtkWidget	*widget,
-				 GdkRectangle	*area)
-{
-	ECalendar *cal;
-
-	cal = E_CALENDAR (widget);
-
-	(*GTK_WIDGET_CLASS (parent_class)->draw) (widget, area);
-
-	/* GnomeCanvas bug workaround to draw the GnomeCanvasWidgets. */
-#if 0
-	(*GTK_WIDGET_CLASS (grandparent_class)->draw) (widget, area);
-#endif
-}
-
-
-void
-e_calendar_set_minimum_size	(ECalendar	*cal,
-				 gint		 rows,
-				 gint		 cols)
-{
-	g_return_if_fail (E_IS_CALENDAR (cal));
-
-	cal->min_rows = rows;
-	cal->min_cols = cols;
-
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (cal->calitem),
-			       "minimum_rows", rows,
-			       "minimum_columns", cols,
-			       NULL);
-
-	gtk_widget_queue_resize (GTK_WIDGET (cal));
-}
-
-
-void
-e_calendar_set_maximum_size	(ECalendar	*cal,
-				 gint		 rows,
-				 gint		 cols)
-{
-	g_return_if_fail (E_IS_CALENDAR (cal));
-
-	cal->max_rows = rows;
-	cal->max_cols = cols;
-
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (cal->calitem),
-			       "maximum_rows", rows,
-			       "maximum_columns", cols,
-			       NULL);
-
-	gtk_widget_queue_resize (GTK_WIDGET (cal));
-}
-
-
-/* Returns the border size on each side of the month displays. */
-void
-e_calendar_get_border_size	(ECalendar	*cal,
-				 gint		*top,
-				 gint		*bottom,
-				 gint		*left,
-				 gint		*right)
-{
-	GtkStyle *style;
-
-	g_return_if_fail (E_IS_CALENDAR (cal));
-
-	style = GTK_WIDGET (cal)->style;
-
-	if (style) {
-		*top    = style->klass->ythickness;
-		*bottom = style->klass->ythickness;
-		*left   = style->klass->xthickness;
-		*right  = style->klass->xthickness;
-	} else {
-		*top = *bottom = *left = *right = 0;
-	}
-}
-
-
-static void
-e_calendar_on_prev_pressed	(ECalendar	*cal)
-{
-	e_calendar_start_auto_move (cal, FALSE);
-}
-
-
-static void
-e_calendar_on_next_pressed	(ECalendar	*cal)
-{
-	e_calendar_start_auto_move (cal, TRUE);
-}
-
-
-static void
-e_calendar_start_auto_move	(ECalendar	*cal,
-				 gboolean	 moving_forward)
-{
-	ECalendarItem *calitem;
-	gint offset;
-
-	if (cal->timeout_id == 0) {
-		cal->timeout_id = g_timeout_add (E_CALENDAR_AUTO_MOVE_TIMEOUT,
-						 e_calendar_auto_move_handler,
-						 cal);
-	}
-	cal->timeout_delay = E_CALENDAR_AUTO_MOVE_TIMEOUT_DELAY;
-	cal->moving_forward = moving_forward;
-
-	calitem = cal->calitem;
-	offset = cal->moving_forward ? 1 : -1;
-	e_calendar_item_set_first_month (calitem, calitem->year,
-					 calitem->month + offset);
-}
-
-
-static gboolean
-e_calendar_auto_move_handler	(gpointer	 data)
-{
-	ECalendar *cal;
-	ECalendarItem *calitem;
-	gint offset;
-
-	g_return_val_if_fail (E_IS_CALENDAR (data), FALSE);
-
-	cal = E_CALENDAR (data);
-	calitem = cal->calitem;
-
-	GDK_THREADS_ENTER ();
-
-	if (cal->timeout_delay > 0) {
-		cal->timeout_delay--;
-	} else {
-		offset = cal->moving_forward ? 1 : -1;
-		e_calendar_item_set_first_month (calitem, calitem->year,
-						 calitem->month + offset);
-	}
-
-	GDK_THREADS_LEAVE ();
-	return TRUE;
-}
-
-
-static void
-e_calendar_on_prev_released	(ECalendar	*cal)
-{
-	e_calendar_stop_auto_move (cal);
-}
-
-
-static void
-e_calendar_on_next_released	(ECalendar	*cal)
-{
-	e_calendar_stop_auto_move (cal);
-}
-
-
-static void
-e_calendar_stop_auto_move	(ECalendar	*cal)
-{
-	if (cal->timeout_id != 0) {
-		gtk_timeout_remove (cal->timeout_id);
-		cal->timeout_id = 0;
-	}
-}
-
-
-static gint
-e_calendar_drag_motion (GtkWidget      *widget,
-			GdkDragContext *context,
-			gint            x,
-			gint            y,
-			guint           time)
-{
-	ECalendar *cal;
-
-	g_return_val_if_fail (E_IS_CALENDAR (widget), FALSE);
-
-	cal = E_CALENDAR (widget);
-
-#if 0
-	g_print ("In e_calendar_drag_motion\n");
-#endif
-
-	return FALSE;
-}
-
-
-static void
-e_calendar_drag_leave (GtkWidget      *widget,
-		       GdkDragContext *context,
-		       guint           time)
-{
-	ECalendar *cal;
-
-	g_return_if_fail (E_IS_CALENDAR (widget));
-
-	cal = E_CALENDAR (widget);
-
-#if 0
-	g_print ("In e_calendar_drag_leave\n");
-#endif
-}
-
diff --git a/widgets/misc/e-calendar.h b/widgets/misc/e-calendar.h
deleted file mode 100644
index ded6467eb6..0000000000
--- a/widgets/misc/e-calendar.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2000, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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
- */
-#ifndef _E_CALENDAR_H_
-#define _E_CALENDAR_H_
-
-#include <gtk/gtkwidget.h>
-#include <gal/widgets/e-canvas.h>
-#include "e-calendar-item.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * ECalendar - displays a table of monthly calendars, allowing highlighting
- * and selection of one or more days. Like GtkCalendar with more features.
- * Most of the functionality is in the ECalendarItem canvas item, though
- * we also add GnomeCanvasWidget buttons to go to the previous/next month and
- * to got to the current day.
- */
-
-#define E_CALENDAR(obj)          GTK_CHECK_CAST (obj, e_calendar_get_type (), ECalendar)
-#define E_CALENDAR_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, e_calendar_get_type (), ECalendarClass)
-#define E_IS_CALENDAR(obj)       GTK_CHECK_TYPE (obj, e_calendar_get_type ())
-
-
-typedef struct _ECalendar       ECalendar;
-typedef struct _ECalendarClass  ECalendarClass;
-
-struct _ECalendar
-{
-	ECanvas canvas;
-
-	ECalendarItem *calitem;
-
-	GnomeCanvasItem *prev_item;
-	GnomeCanvasItem *next_item;
-
-	gint min_rows;
-	gint min_cols;
-
-	gint max_rows;
-	gint max_cols;
-
-	/* These are all used when the prev/next buttons are held down.
-	   moving_forward is TRUE if we are moving forward in time, i.e. the
-	   next button is pressed. */
-	gint timeout_id;
-	gint timeout_delay;
-	gboolean moving_forward;
-};
-
-struct _ECalendarClass
-{
-	ECanvasClass parent_class;
-};
-
-
-GtkType	   e_calendar_get_type		(void);
-GtkWidget* e_calendar_new		(void);
-
-void	   e_calendar_set_minimum_size	(ECalendar	*cal,
-					 gint		 rows,
-					 gint		 cols);
-void	   e_calendar_set_maximum_size	(ECalendar	*cal,
-					 gint		 rows,
-					 gint		 cols);
-
-/* Returns the border size on each side of the month displays. */
-void	   e_calendar_get_border_size	(ECalendar	*cal,
-					 gint		*top,
-					 gint		*bottom,
-					 gint		*left,
-					 gint		*right);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_CALENDAR_H_ */
diff --git a/widgets/misc/e-canvas-utils.c b/widgets/misc/e-canvas-utils.c
deleted file mode 100644
index 50fcf0d7e5..0000000000
--- a/widgets/misc/e-canvas-utils.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-canvas-utils.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "e-canvas-utils.h"
-
-void
-e_canvas_item_move_absolute (GnomeCanvasItem *item, double dx, double dy)
-{
-	double translate[6];
-
-	g_return_if_fail (item != NULL);
-	g_return_if_fail (GNOME_IS_CANVAS_ITEM (item));
-
-	art_affine_translate (translate, dx, dy);
-
-	gnome_canvas_item_affine_absolute (item, translate);
-}
-
-static double
-compute_offset(int top, int bottom, int page_top, int page_bottom)
-{
-	int size = bottom - top;
-	int offset = 0;
-
-	if (top <= page_top && bottom >= page_bottom)
-		return 0;
-
-	if (bottom > page_bottom)
-		offset = (bottom - page_bottom);
-	if (top < page_top + offset)
-		offset = (top - page_top);
-
-	if (top <= page_top + offset && bottom >= page_bottom + offset)
-		return offset;
-
-	if (top < page_top + size * 3 / 2 + offset)
-		offset = top - (page_top + size * 3 / 2);
-	if (bottom > page_bottom - size * 3 / 2 + offset)
-		offset = bottom - (page_bottom - size * 3 / 2);
-	if (top < page_top + size * 3 / 2 + offset)
-		offset = top - ((page_top + page_bottom - (bottom - top)) / 2);
-
-	return offset;
-}
-
-
-static void
-e_canvas_show_area (GnomeCanvas *canvas, double x1, double y1, double x2, double y2)
-{
-	GtkAdjustment *h, *v;
-	int dx = 0, dy = 0;
-	
-	g_return_if_fail (canvas != NULL);
-	g_return_if_fail (GNOME_IS_CANVAS (canvas));
-
-	h = gtk_layout_get_hadjustment(GTK_LAYOUT(canvas));
-	dx = compute_offset(x1, x2, h->value, h->value + h->page_size);
-	if (dx)
-		gtk_adjustment_set_value(h, CLAMP(h->value + dx, h->lower, h->upper - h->page_size));
-
-	v = gtk_layout_get_vadjustment(GTK_LAYOUT(canvas));
-	dy = compute_offset(y1, y2, v->value, v->value + v->page_size);
-	if (dy)
-		gtk_adjustment_set_value(v, CLAMP(v->value + dy, v->lower, v->upper - v->page_size));
-}
-
-void
-e_canvas_item_show_area (GnomeCanvasItem *item, double x1, double y1, double x2, double y2)
-{
-	g_return_if_fail (item != NULL);
-	g_return_if_fail (GNOME_IS_CANVAS_ITEM (item));
-	
-	gnome_canvas_item_i2w(item, &x1, &y1);
-	gnome_canvas_item_i2w(item, &x2, &y2);
-
-	e_canvas_show_area(item->canvas, x1, y1, x2, y2);
-}
-
-typedef struct {
-	double x1;
-	double y1;
-	double x2;
-	double y2;
-	GnomeCanvas *canvas;
-} DoubsAndCanvas;
-
-static gboolean
-show_area_timeout (gpointer data)
-{
-	DoubsAndCanvas *dac = data;
-
-	if (!GTK_OBJECT_DESTROYED(dac->canvas))
-		e_canvas_show_area(dac->canvas, dac->x1, dac->y1, dac->x2, dac->y2);
-	gtk_object_unref(GTK_OBJECT(dac->canvas));
-	g_free(dac);
-	return FALSE;
-}
-
-void
-e_canvas_item_show_area_delayed (GnomeCanvasItem *item, double x1, double y1, double x2, double y2, gint delay)
-{
-	DoubsAndCanvas *dac;
-	
-	g_return_if_fail (item != NULL);
-	g_return_if_fail (GNOME_IS_CANVAS_ITEM (item));
-	
-	gnome_canvas_item_i2w(item, &x1, &y1);
-	gnome_canvas_item_i2w(item, &x2, &y2);
-
-	dac = g_new(DoubsAndCanvas, 1);
-	dac->x1 = x1;
-	dac->y1 = y1;
-	dac->x2 = x2;
-	dac->y2 = y2;
-	dac->canvas = item->canvas;
-	gtk_object_ref(GTK_OBJECT(item->canvas));
-	g_timeout_add(delay, show_area_timeout, dac);
-}
diff --git a/widgets/misc/e-canvas-utils.h b/widgets/misc/e-canvas-utils.h
deleted file mode 100644
index 97a9989fb9..0000000000
--- a/widgets/misc/e-canvas-utils.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-canvas-utils.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __E_CANVAS_UTILS__
-#define __E_CANVAS_UTILS__
-
-#include <libgnomeui/gnome-canvas.h>
-
-BEGIN_GNOME_DECLS
-
-void e_canvas_item_move_absolute (GnomeCanvasItem *item, double dx, double dy);
-void e_canvas_item_show_area     (GnomeCanvasItem *item, double x1, double y1, double x2, double y2);
-void e_canvas_item_show_area_delayed     (GnomeCanvasItem *item, double x1, double y1, double x2, double y2, gint delay);
-
-END_GNOME_DECLS
-
-#endif /* __E_CANVAS_UTILS__ */
diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c
deleted file mode 100644
index 5879d4f672..0000000000
--- a/widgets/misc/e-canvas-vbox.c
+++ /dev/null
@@ -1,350 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-canvas-vbox.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <math.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtksignal.h>
-#include "e-canvas-vbox.h"
-#include "e-canvas-utils.h"
-#include "e-canvas.h"
-#include "gal/util/e-util.h"
-
-static void e_canvas_vbox_init		(ECanvasVbox		 *CanvasVbox);
-static void e_canvas_vbox_class_init	(ECanvasVboxClass	 *klass);
-static void e_canvas_vbox_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_canvas_vbox_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_canvas_vbox_destroy (GtkObject *object);
-
-static gint e_canvas_vbox_event   (GnomeCanvasItem *item, GdkEvent *event);
-static void e_canvas_vbox_realize (GnomeCanvasItem *item);
-
-static void e_canvas_vbox_reflow (GnomeCanvasItem *item, int flags);
-
-static void e_canvas_vbox_real_add_item(ECanvasVbox *e_canvas_vbox, GnomeCanvasItem *item);
-static void e_canvas_vbox_resize_children (GnomeCanvasItem *item);
-
-static GnomeCanvasGroupClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_WIDTH,
-	ARG_MINIMUM_WIDTH,
-	ARG_HEIGHT,
-	ARG_SPACING,
-};
-
-GtkType
-e_canvas_vbox_get_type (void)
-{
-  static GtkType type = 0;
-
-  if (!type)
-    {
-      static const GtkTypeInfo info =
-      {
-        "ECanvasVbox",
-        sizeof (ECanvasVbox),
-        sizeof (ECanvasVboxClass),
-        (GtkClassInitFunc) e_canvas_vbox_class_init,
-        (GtkObjectInitFunc) e_canvas_vbox_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      type = gtk_type_unique (gnome_canvas_group_get_type (), &info);
-    }
-
-  return type;
-}
-
-static void
-e_canvas_vbox_class_init (ECanvasVboxClass *klass)
-{
-	GtkObjectClass *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	object_class = (GtkObjectClass*) klass;
-	item_class = (GnomeCanvasItemClass *) klass;
-
-	parent_class = gtk_type_class (gnome_canvas_group_get_type ());
-  
-	gtk_object_add_arg_type ("ECanvasVbox::width", GTK_TYPE_DOUBLE, 
-				 GTK_ARG_READWRITE, ARG_WIDTH); 
-	gtk_object_add_arg_type ("ECanvasVbox::minimum_width", GTK_TYPE_DOUBLE, 
-				 GTK_ARG_READWRITE, ARG_MINIMUM_WIDTH); 
-	gtk_object_add_arg_type ("ECanvasVbox::height", GTK_TYPE_DOUBLE, 
-				 GTK_ARG_READABLE, ARG_HEIGHT);
-	gtk_object_add_arg_type ("ECanvasVbox::spacing", GTK_TYPE_DOUBLE, 
-				 GTK_ARG_READWRITE, ARG_SPACING);
-
-	klass->add_item       = e_canvas_vbox_real_add_item;
- 
-	object_class->set_arg   = e_canvas_vbox_set_arg;
-	object_class->get_arg   = e_canvas_vbox_get_arg;
-	object_class->destroy   = e_canvas_vbox_destroy;
-  
-	/* GnomeCanvasItem method overrides */
-	item_class->event       = e_canvas_vbox_event;
-	item_class->realize     = e_canvas_vbox_realize;
-}
-
-static void
-e_canvas_vbox_init (ECanvasVbox *vbox)
-{
-	vbox->items = NULL;
-
-	vbox->width = 10;
-	vbox->minimum_width = 10;
-	vbox->height = 10;
-	vbox->spacing = 0;
-
-	e_canvas_item_set_reflow_callback(GNOME_CANVAS_ITEM(vbox), e_canvas_vbox_reflow);
-}
-
-static void
-e_canvas_vbox_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	ECanvasVbox *e_canvas_vbox;
-
-	item = GNOME_CANVAS_ITEM (o);
-	e_canvas_vbox = E_CANVAS_VBOX (o);
-	
-	switch (arg_id){
-	case ARG_WIDTH:
-	case ARG_MINIMUM_WIDTH:
-		e_canvas_vbox->minimum_width = GTK_VALUE_DOUBLE (*arg);
-		e_canvas_vbox_resize_children(item);
-		e_canvas_item_request_reflow(item);
-		break;
-	case ARG_SPACING:
-		e_canvas_vbox->spacing = GTK_VALUE_DOUBLE (*arg);
-		e_canvas_item_request_reflow(item);
-		break;
-	}
-}
-
-static void
-e_canvas_vbox_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ECanvasVbox *e_canvas_vbox;
-
-	e_canvas_vbox = E_CANVAS_VBOX (object);
-
-	switch (arg_id) {
-	case ARG_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = e_canvas_vbox->width;
-		break;
-	case ARG_MINIMUM_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = e_canvas_vbox->minimum_width;
-		break;
-	case ARG_HEIGHT:
-		GTK_VALUE_DOUBLE (*arg) = e_canvas_vbox->height;
-		break;
-	case ARG_SPACING:
-		GTK_VALUE_DOUBLE (*arg) = e_canvas_vbox->spacing;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-/* Used from g_list_foreach(); disconnects from an item's signals */
-static void
-disconnect_item_cb (gpointer data, gpointer user_data)
-{
-	ECanvasVbox *vbox;
-	GnomeCanvasItem *item;
-
-	vbox = E_CANVAS_VBOX (user_data);
-
-	item = GNOME_CANVAS_ITEM (data);
-	gtk_signal_disconnect_by_data (GTK_OBJECT (item), vbox);
-}
-
-static void
-e_canvas_vbox_destroy (GtkObject *object)
-{
-	ECanvasVbox *vbox = E_CANVAS_VBOX(object);
-
-	g_list_foreach(vbox->items, disconnect_item_cb, vbox);
-	g_list_free(vbox->items);
-	vbox->items = NULL;
-	
-	GTK_OBJECT_CLASS(parent_class)->destroy (object);
-}
-
-static gint
-e_canvas_vbox_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	gint return_val = TRUE;
-
-	switch (event->type) {
-	case GDK_KEY_PRESS:
-		switch (event->key.keyval) {
-		case GDK_Left:
-		case GDK_KP_Left:
-		case GDK_Right:
-		case GDK_KP_Right:
-		case GDK_Down:
-		case GDK_KP_Down:
-		case GDK_Up:
-		case GDK_KP_Up:
-		case GDK_Return:
-		case GDK_KP_Enter:
-			return_val = TRUE;
-			break;
-		default:
-			return_val = FALSE;
-			break;
-		}
-		break;
-	default:
-		return_val = FALSE;
-		break;
-	}
-	if (!return_val) {
-		if (GNOME_CANVAS_ITEM_CLASS(parent_class)->event)
-			return GNOME_CANVAS_ITEM_CLASS (parent_class)->event (item, event);
-	}
-	return return_val;
-	
-}
-
-static void
-e_canvas_vbox_realize (GnomeCanvasItem *item)
-{
-	if (GNOME_CANVAS_ITEM_CLASS(parent_class)->realize)
-		(* GNOME_CANVAS_ITEM_CLASS(parent_class)->realize) (item);
-	
-	e_canvas_vbox_resize_children(item);
-	e_canvas_item_request_reflow(item);
-}
-
-static void
-e_canvas_vbox_remove_item (GnomeCanvasItem *item, ECanvasVbox *vbox)
-{
-	if (!GTK_OBJECT_DESTROYED (vbox))
-		vbox->items = g_list_remove(vbox->items, item);
-}
-
-static void
-e_canvas_vbox_real_add_item(ECanvasVbox *e_canvas_vbox, GnomeCanvasItem *item)
-{
-	e_canvas_vbox->items = g_list_append(e_canvas_vbox->items, item);
-	gtk_signal_connect(GTK_OBJECT(item), "destroy",
-			   GTK_SIGNAL_FUNC(e_canvas_vbox_remove_item), e_canvas_vbox);
-	if ( GTK_OBJECT_FLAGS( e_canvas_vbox ) & GNOME_CANVAS_ITEM_REALIZED ) {
-		gnome_canvas_item_set(item,
-				      "width", (double) e_canvas_vbox->minimum_width,
-				      NULL);
-		e_canvas_item_request_reflow(item);
-	}
-}
-
-static void
-e_canvas_vbox_resize_children (GnomeCanvasItem *item)
-{
-	GList *list;
-	ECanvasVbox *e_canvas_vbox;
-
-	e_canvas_vbox = E_CANVAS_VBOX (item);
-	for ( list = e_canvas_vbox->items; list; list = list->next ) {
-		GnomeCanvasItem *child = GNOME_CANVAS_ITEM(list->data);
-		gnome_canvas_item_set(child,
-				      "width", (double) e_canvas_vbox->minimum_width,
-				      NULL);
-	}
-}
-
-static void
-e_canvas_vbox_reflow( GnomeCanvasItem *item, int flags )
-{
-	ECanvasVbox *e_canvas_vbox = E_CANVAS_VBOX(item);
-	if ( GTK_OBJECT_FLAGS( e_canvas_vbox ) & GNOME_CANVAS_ITEM_REALIZED ) {
-
-		gdouble old_height;
-		gdouble running_height;
-		gdouble old_width;
-		gdouble max_width;
-
-		old_width = e_canvas_vbox->width;
-		max_width = e_canvas_vbox->minimum_width;
-
-		old_height = e_canvas_vbox->height;
-		running_height = 0;
-
-		if (e_canvas_vbox->items == NULL) {
-		} else {
-			GList *list;
-			gdouble item_height;
-			gdouble item_width;
-
-			list = e_canvas_vbox->items;
-			gtk_object_get (GTK_OBJECT(list->data),
-					"height", &item_height,
-					"width", &item_width,
-					NULL);
-			e_canvas_item_move_absolute(GNOME_CANVAS_ITEM(list->data),
-						    (double) 0,
-						    (double) running_height);
-			running_height += item_height;
-			if (max_width < item_width)
-				max_width = item_width;
-			list = g_list_next(list);
-			
-			for( ; list; list = g_list_next(list)) {
-				running_height += e_canvas_vbox->spacing;
-
-				gtk_object_get (GTK_OBJECT(list->data),
-						"height", &item_height,
-						"width", &item_width,
-						NULL);
-
-				e_canvas_item_move_absolute(GNOME_CANVAS_ITEM(list->data),
-							    (double) 0,
-							    (double) running_height);
-
-				running_height += item_height;
-				if (max_width < item_width)
-					max_width = item_width;
-			}
-				 
-		}
-		e_canvas_vbox->height = running_height;
-		e_canvas_vbox->width = max_width;
-		if (old_height != e_canvas_vbox->height ||
-		    old_width !=  e_canvas_vbox->width)
-			e_canvas_item_request_parent_reflow(item);
-	}
-}
-
-void
-e_canvas_vbox_add_item(ECanvasVbox *e_canvas_vbox, GnomeCanvasItem *item)
-{
-	if (E_CANVAS_VBOX_CLASS(GTK_OBJECT(e_canvas_vbox)->klass)->add_item)
-		(E_CANVAS_VBOX_CLASS(GTK_OBJECT(e_canvas_vbox)->klass)->add_item) (e_canvas_vbox, item);
-}
diff --git a/widgets/misc/e-canvas-vbox.h b/widgets/misc/e-canvas-vbox.h
deleted file mode 100644
index 1dfaf7a726..0000000000
--- a/widgets/misc/e-canvas-vbox.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-canvas-vbox.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CANVAS_VBOX_H__
-#define __E_CANVAS_VBOX_H__
-
-#include <gtk/gtktypeutils.h>
-#include <libgnomeui/gnome-canvas.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* ECanvasVbox - A canvas item container.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * width        double          RW              width of the CanvasVbox
- * height       double          R               height of the CanvasVbox
- * spacing      double          RW              Spacing between items.
- */
-
-#define E_CANVAS_VBOX_TYPE			(e_canvas_vbox_get_type ())
-#define E_CANVAS_VBOX(obj)			(GTK_CHECK_CAST ((obj), E_CANVAS_VBOX_TYPE, ECanvasVbox))
-#define E_CANVAS_VBOX_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CANVAS_VBOX_TYPE, ECanvasVboxClass))
-#define E_IS_CANVAS_VBOX(obj)		(GTK_CHECK_TYPE ((obj), E_CANVAS_VBOX_TYPE))
-#define E_IS_CANVAS_VBOX_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CANVAS_VBOX_TYPE))
-
-
-typedef struct _ECanvasVbox       ECanvasVbox;
-typedef struct _ECanvasVboxClass  ECanvasVboxClass;
-
-struct _ECanvasVbox
-{
-	GnomeCanvasGroup parent;
-
-	/* item specific fields */
-	GList *items; /* Of type GnomeCanvasItem */
-
-	double width;
-	double minimum_width;
-	double height;
-	double spacing;
-};
-
-struct _ECanvasVboxClass
-{
-	GnomeCanvasGroupClass parent_class;
-
-	/* Virtual methods. */
-	void (* add_item) (ECanvasVbox *CanvasVbox, GnomeCanvasItem *item);
-};
-
-/* 
- * To be added to a CanvasVbox, an item must have the argument "width" as
- * a Read/Write argument and "height" as a Read Only argument.  It
- * should also do an ECanvas parent CanvasVbox request if its size
- * changes.
- */
-void       e_canvas_vbox_add_item(ECanvasVbox *e_canvas_vbox, GnomeCanvasItem *item);
-GtkType    e_canvas_vbox_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CANVAS_VBOX_H__ */
diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c
deleted file mode 100644
index fea3746ce1..0000000000
--- a/widgets/misc/e-canvas.c
+++ /dev/null
@@ -1,762 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-canvas.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <gtk/gtksignal.h>
-#include "e-canvas.h"
-
-static void e_canvas_init           (ECanvas         *card);
-static void e_canvas_destroy        (GtkObject        *object);
-static void e_canvas_class_init	    (ECanvasClass    *klass);
-static void e_canvas_realize        (GtkWidget        *widget);
-static void e_canvas_unrealize      (GtkWidget        *widget);
-static gint e_canvas_key            (GtkWidget        *widget,
-				     GdkEventKey      *event);
-
-static gint e_canvas_visibility     (GtkWidget        *widget,
-				     GdkEventVisibility *event,
-				     ECanvas          *canvas);
-
-static gint e_canvas_focus_in       (GtkWidget        *widget,
-				     GdkEventFocus    *event);
-static gint e_canvas_focus_out      (GtkWidget        *widget,
-				     GdkEventFocus    *event);
-
-static int emit_event (GnomeCanvas *canvas, GdkEvent *event);
-
-static GnomeCanvasClass *parent_class = NULL;
-
-enum {
-	REFLOW,
-	LAST_SIGNAL
-};
-
-static guint e_canvas_signals [LAST_SIGNAL] = { 0, };
-
-GtkType
-e_canvas_get_type (void)
-{
-	static GtkType canvas_type = 0;
-
-	if (!canvas_type)
-	{
-		static const GtkTypeInfo canvas_info =
-		{
-			"ECanvas",
-			sizeof (ECanvas),
-			sizeof (ECanvasClass),
-			(GtkClassInitFunc) e_canvas_class_init,
-			(GtkObjectInitFunc) e_canvas_init,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-
-		canvas_type = gtk_type_unique (gnome_canvas_get_type (), &canvas_info);
-	}
-
-	return canvas_type;
-}
-
-static void
-e_canvas_class_init (ECanvasClass *klass)
-{
-	GtkObjectClass *object_class;
-	GnomeCanvasClass *canvas_class;
-	GtkWidgetClass *widget_class;
-
-	object_class = (GtkObjectClass*) klass;
-	canvas_class = (GnomeCanvasClass *) klass;
-	widget_class = (GtkWidgetClass *) klass;
-
-	parent_class = gtk_type_class (gnome_canvas_get_type ());
-
-	object_class->destroy = e_canvas_destroy;
-
-	widget_class->key_press_event = e_canvas_key;
-	widget_class->key_release_event = e_canvas_key;
-	widget_class->focus_in_event = e_canvas_focus_in;
-	widget_class->focus_out_event = e_canvas_focus_out;
-	widget_class->realize = e_canvas_realize;
-	widget_class->unrealize = e_canvas_unrealize;
-
-	klass->reflow = NULL;
-
-	e_canvas_signals [REFLOW] =
-		gtk_signal_new ("reflow",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ECanvasClass, reflow),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, e_canvas_signals, LAST_SIGNAL);
-}
-
-static void
-e_canvas_init (ECanvas *canvas)
-{
-	canvas->selection = NULL;
-	canvas->cursor = NULL;
-	canvas->ic = NULL;
-	canvas->ic_attr = NULL;
-	canvas->tooltip_window = NULL;
-}
-
-static void
-e_canvas_destroy (GtkObject *object)
-{
-	ECanvas *canvas = E_CANVAS(object);
-
-	if (canvas->idle_id)
-		g_source_remove(canvas->idle_id);
-
-	if (canvas->toplevel) {
-		if (canvas->visibility_notify_id)
-			gtk_signal_disconnect (GTK_OBJECT(canvas->toplevel),
-					       canvas->visibility_notify_id);
-		canvas->visibility_notify_id = 0;
-
-		gtk_object_unref(GTK_OBJECT(canvas->toplevel));
-		canvas->toplevel = NULL;
-	}
-
-	e_canvas_hide_tooltip(canvas);
-
-	if ((GTK_OBJECT_CLASS (parent_class))->destroy)
-		(*(GTK_OBJECT_CLASS (parent_class))->destroy) (object);
-}
-
-GtkWidget *
-e_canvas_new ()
-{
-	return GTK_WIDGET (gtk_type_new (e_canvas_get_type ()));
-}
-
-
-/* Returns whether the item is an inferior of or is equal to the parent. */
-static int
-is_descendant (GnomeCanvasItem *item, GnomeCanvasItem *parent)
-{
-	for (; item; item = item->parent)
-		if (item == parent)
-			return TRUE;
-
-	return FALSE;
-}
-
-/* Emits an event for an item in the canvas, be it the current item, grabbed
- * item, or focused item, as appropriate.
- */
-static int
-emit_event (GnomeCanvas *canvas, GdkEvent *event)
-{
-	GdkEvent ev;
-	gint finished;
-	GnomeCanvasItem *item;
-	GnomeCanvasItem *parent;
-	guint mask;
-
-	/* Perform checks for grabbed items */
-
-	if (canvas->grabbed_item && !is_descendant (canvas->current_item, canvas->grabbed_item))
-		return FALSE;
-
-	if (canvas->grabbed_item) {
-		switch (event->type) {
-		case GDK_ENTER_NOTIFY:
-			mask = GDK_ENTER_NOTIFY_MASK;
-			break;
-
-		case GDK_LEAVE_NOTIFY:
-			mask = GDK_LEAVE_NOTIFY_MASK;
-			break;
-
-		case GDK_MOTION_NOTIFY:
-			mask = GDK_POINTER_MOTION_MASK;
-			break;
-
-		case GDK_BUTTON_PRESS:
-		case GDK_2BUTTON_PRESS:
-		case GDK_3BUTTON_PRESS:
-			mask = GDK_BUTTON_PRESS_MASK;
-			break;
-
-		case GDK_BUTTON_RELEASE:
-			mask = GDK_BUTTON_RELEASE_MASK;
-			break;
-
-		case GDK_KEY_PRESS:
-			mask = GDK_KEY_PRESS_MASK;
-			break;
-
-		case GDK_KEY_RELEASE:
-			mask = GDK_KEY_RELEASE_MASK;
-			break;
-
-		default:
-			mask = 0;
-			break;
-		}
-
-		if (!(mask & canvas->grabbed_event_mask))
-			return FALSE;
-	}
-
-	/* Convert to world coordinates -- we have two cases because of diferent
-	 * offsets of the fields in the event structures.
-	 */
-
-	ev = *event;
-
-	switch (ev.type) {
-	case GDK_ENTER_NOTIFY:
-	case GDK_LEAVE_NOTIFY:
-		gnome_canvas_window_to_world (canvas,
-					      ev.crossing.x, ev.crossing.y,
-					      &ev.crossing.x, &ev.crossing.y);
-		break;
-
-	case GDK_MOTION_NOTIFY:
-	case GDK_BUTTON_PRESS:
-	case GDK_2BUTTON_PRESS:
-	case GDK_3BUTTON_PRESS:
-	case GDK_BUTTON_RELEASE:
-		gnome_canvas_window_to_world (canvas,
-					      ev.motion.x, ev.motion.y,
-					      &ev.motion.x, &ev.motion.y);
-		break;
-
-	default:
-		break;
-	}
-
-	/* Choose where we send the event */
-
-	item = canvas->current_item;
-
-	if (canvas->focused_item
-	    && ((event->type == GDK_KEY_PRESS) || (event->type == GDK_KEY_RELEASE) || (event->type == GDK_FOCUS_CHANGE)))
-		item = canvas->focused_item;
-
-	/* The event is propagated up the hierarchy (for if someone connected to
-	 * a group instead of a leaf event), and emission is stopped if a
-	 * handler returns TRUE, just like for GtkWidget events.
-	 */
-
-	finished = FALSE;
-
-	while (item && !finished) {
-		gtk_object_ref (GTK_OBJECT (item));
-
-		gtk_signal_emit_by_name (GTK_OBJECT (item), "event",
-					 &ev,
-					 &finished);
-
-		if (GTK_OBJECT_DESTROYED (item))
-			finished = TRUE;
-
-		parent = item->parent;
-		gtk_object_unref (GTK_OBJECT (item));
-
-		item = parent;
-	}
-
-	return finished;
-}
-
-/* Key event handler for the canvas */
-static gint
-e_canvas_key (GtkWidget *widget, GdkEventKey *event)
-{
-	GnomeCanvas *canvas;
-	GdkEvent full_event;
-
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (GNOME_IS_CANVAS (widget), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	canvas = GNOME_CANVAS (widget);
-	
-	full_event.key = *event;
-
-	return emit_event (canvas, &full_event);
-}
-
-/* Key event handler for the canvas */
-static gint
-e_canvas_visibility (GtkWidget *widget, GdkEventVisibility *event, ECanvas *canvas)
-{
-	if (! canvas->visibility_first) {
-		e_canvas_hide_tooltip(canvas);
-	}
-	canvas->visibility_first = FALSE;
-
-	return FALSE;
-}
-
-
-/**
- * e_canvas_item_grab_focus:
- * @item: A canvas item.
- * @widget_too: Whether or not to grab the widget-level focus too
- *
- * Makes the specified item take the keyboard focus, so all keyboard
- * events will be sent to it. If the canvas widget itself did not have
- * the focus and @widget_too is %TRUE, it grabs that focus as well.
- **/
-void
-e_canvas_item_grab_focus (GnomeCanvasItem *item, gboolean widget_too)
-{
-	GnomeCanvasItem *focused_item;
-	GdkEvent ev;
-
-	g_return_if_fail (item != NULL);
-	g_return_if_fail (GNOME_IS_CANVAS_ITEM (item));
-	g_return_if_fail (GTK_WIDGET_CAN_FOCUS (GTK_WIDGET (item->canvas)));
-
-	focused_item = item->canvas->focused_item;
-
-	if (focused_item) {
-		ev.focus_change.type = GDK_FOCUS_CHANGE;
-		ev.focus_change.window = GTK_LAYOUT (item->canvas)->bin_window;
-		ev.focus_change.send_event = FALSE;
-		ev.focus_change.in = FALSE;
-
-		emit_event (item->canvas, &ev);
-	}
-
-	item->canvas->focused_item = item;
-
-	if (widget_too && !GTK_WIDGET_HAS_FOCUS (GTK_WIDGET(item->canvas))) {
-		gtk_widget_grab_focus (GTK_WIDGET (item->canvas));
-	}
-
-	if (focused_item) {
-		ev.focus_change.type = GDK_FOCUS_CHANGE;
-		ev.focus_change.window = GTK_LAYOUT (item->canvas)->bin_window;
-		ev.focus_change.send_event = FALSE;
-		ev.focus_change.in = TRUE;
-
-		emit_event (item->canvas, &ev);
-	}
-}
-
-/* Focus in handler for the canvas */
-static gint
-e_canvas_focus_in (GtkWidget *widget, GdkEventFocus *event)
-{
-	GnomeCanvas *canvas;
-	ECanvas *ecanvas;
-	GdkEvent full_event;
-
-	canvas = GNOME_CANVAS (widget);
-	ecanvas = E_CANVAS (widget);
-
-	GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
-
-	if (ecanvas->ic)
-		gdk_im_begin (ecanvas->ic, canvas->layout.bin_window);
-
-	if (canvas->focused_item) {
-		full_event.focus_change = *event;
-		return emit_event (canvas, &full_event);
-	} else {
-		return FALSE;
-	}
-}
-
-/* Focus out handler for the canvas */
-static gint
-e_canvas_focus_out (GtkWidget *widget, GdkEventFocus *event)
-{
-	GnomeCanvas *canvas;
-	ECanvas *ecanvas;
-	GdkEvent full_event;
-
-	canvas = GNOME_CANVAS (widget);
-	ecanvas = E_CANVAS (widget);
-
-	GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
-
-	if (ecanvas->ic)
-		gdk_im_end ();
-
-	if (canvas->focused_item) {
-		full_event.focus_change = *event;
-		return emit_event (canvas, &full_event);
-	} else {
-		return FALSE;
-	}
-}
-
-static void
-e_canvas_realize (GtkWidget *widget)
-{
-	ECanvas *ecanvas = E_CANVAS (widget);
-
-	if (GTK_WIDGET_CLASS (parent_class)->realize)
-		(* GTK_WIDGET_CLASS (parent_class)->realize) (widget);
-
-	gdk_window_set_back_pixmap (GTK_LAYOUT (widget)->bin_window, NULL, FALSE);
-
-	if (gdk_im_ready () && (ecanvas->ic_attr = gdk_ic_attr_new ()) != NULL) {
-		GdkEventMask mask;
-		GdkICAttr *attr = ecanvas->ic_attr;
-		GdkICAttributesType attrmask = GDK_IC_ALL_REQ;
-		GdkIMStyle style;
-		GdkIMStyle supported_style = GDK_IM_PREEDIT_NONE |
-			GDK_IM_PREEDIT_NOTHING |
-			GDK_IM_STATUS_NONE |
-			GDK_IM_STATUS_NOTHING;
-
-		attr->style = style = gdk_im_decide_style (supported_style);
-		attr->client_window = ecanvas->parent.layout.bin_window;
-
-		ecanvas->ic = gdk_ic_new (attr, attrmask);
-		if (ecanvas->ic != NULL) {
-			mask = gdk_window_get_events (attr->client_window);
-			mask |= gdk_ic_get_events (ecanvas->ic);
-			gdk_window_set_events (attr->client_window, mask);
-
-			if (GTK_WIDGET_HAS_FOCUS (widget))
-				gdk_im_begin (ecanvas->ic, attr->client_window);
-		} else
-			g_warning ("Can't create input context.");
-	}
-
-}
-
-static void
-e_canvas_unrealize (GtkWidget *widget)
-{
-	ECanvas * ecanvas = E_CANVAS (widget);
-	if (ecanvas->ic) {
-		gdk_ic_destroy (ecanvas->ic);
-		ecanvas->ic = NULL;
-	}
-	if (ecanvas->ic_attr) {
-		gdk_ic_attr_destroy (ecanvas->ic_attr);
-		ecanvas->ic_attr = NULL;
-	}
-	if (GTK_WIDGET_CLASS (parent_class)->unrealize)
-		(* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
-}
-
-static void
-e_canvas_item_invoke_reflow (GnomeCanvasItem *item, int flags)
-{
-	GnomeCanvasGroup *group;
-	GList *list;
-	GnomeCanvasItem *child;
-
-	if (GNOME_IS_CANVAS_GROUP (item)) {
-		group = GNOME_CANVAS_GROUP (item);
-		for (list = group->item_list; list; list = list->next) {
-			child = GNOME_CANVAS_ITEM (list->data);
-			if (child->object.flags & E_CANVAS_ITEM_DESCENDENT_NEEDS_REFLOW)
-				e_canvas_item_invoke_reflow (child, flags);
-		}
-	}
-
-	if (item->object.flags & E_CANVAS_ITEM_NEEDS_REFLOW) {
-		ECanvasItemReflowFunc func;
-		func = gtk_object_get_data (GTK_OBJECT (item),
-					    "ECanvasItem::reflow_callback");
-		if (func)
-			func (item, flags);
-	}
-
-	item->object.flags &= ~E_CANVAS_ITEM_NEEDS_REFLOW;
-	item->object.flags &= ~E_CANVAS_ITEM_DESCENDENT_NEEDS_REFLOW;
-}
-
-static void
-do_reflow (ECanvas *canvas)
-{
-	if (GNOME_CANVAS(canvas)->root->object.flags & E_CANVAS_ITEM_DESCENDENT_NEEDS_REFLOW)
-		e_canvas_item_invoke_reflow (GNOME_CANVAS(canvas)->root, 0);
-}
-
-/* Idle handler for the e-canvas.  It deals with pending reflows. */
-static gint
-idle_handler (gpointer data)
-{
-	ECanvas *canvas;
-
-	GDK_THREADS_ENTER();
-
-	canvas = E_CANVAS (data);
-	do_reflow (canvas);
-
-	/* Reset idle id */
-	canvas->idle_id = 0;
-
-	gtk_signal_emit (GTK_OBJECT (canvas),
-			 e_canvas_signals [REFLOW]);
-
-	GDK_THREADS_LEAVE();
-
-	return FALSE;
-}
-
-/* Convenience function to add an idle handler to a canvas */
-static void
-add_idle (ECanvas *canvas)
-{
-	if (canvas->idle_id != 0)
-		return;
-
-	canvas->idle_id = g_idle_add_full (G_PRIORITY_HIGH_IDLE, idle_handler, (gpointer) canvas, NULL);
-}
-
-static void
-e_canvas_item_descendent_needs_reflow (GnomeCanvasItem *item)
-{
-	if (item->object.flags & E_CANVAS_ITEM_DESCENDENT_NEEDS_REFLOW)
-		return;
-
-	item->object.flags |= E_CANVAS_ITEM_DESCENDENT_NEEDS_REFLOW;
-	if (item->parent)
-		e_canvas_item_descendent_needs_reflow(item->parent);
-}
-
-void
-e_canvas_item_request_reflow (GnomeCanvasItem *item)
-{
-	if (item->object.flags & GNOME_CANVAS_ITEM_REALIZED) {
-		item->object.flags |= E_CANVAS_ITEM_NEEDS_REFLOW;
-		e_canvas_item_descendent_needs_reflow(item);
-		add_idle(E_CANVAS(item->canvas));
-	}
-}
-
-void
-e_canvas_item_request_parent_reflow (GnomeCanvasItem *item)
-{
-	g_return_if_fail(item != NULL);
-	g_return_if_fail(GNOME_IS_CANVAS_ITEM(item));
-	e_canvas_item_request_reflow(item->parent);
-}
-
-void
-e_canvas_item_set_reflow_callback (GnomeCanvasItem *item, ECanvasItemReflowFunc func)
-{
-	gtk_object_set_data(GTK_OBJECT(item), "ECanvasItem::reflow_callback", (gpointer) func);
-}
-
-
-void
-e_canvas_item_set_selection_callback (GnomeCanvasItem *item, ECanvasItemSelectionFunc func)
-{
-	gtk_object_set_data(GTK_OBJECT(item), "ECanvasItem::selection_callback", (gpointer) func);
-}
-
-void
-e_canvas_item_set_selection_compare_callback (GnomeCanvasItem *item, ECanvasItemSelectionCompareFunc func)
-{
-	gtk_object_set_data(GTK_OBJECT(item), "ECanvasItem::selection_compare_callback", (gpointer) func);
-}
-
-void
-e_canvas_item_set_cursor (GnomeCanvasItem *item, gpointer id)
-{
-	GList *list;
-	int flags;
-	ECanvas *canvas;
-	ECanvasSelectionInfo *info;
-	ECanvasItemSelectionFunc func;
-
-	g_return_if_fail(item != NULL);
-	g_return_if_fail(GNOME_IS_CANVAS_ITEM(item));
-	g_return_if_fail(item->canvas != NULL);
-	g_return_if_fail(E_IS_CANVAS(item->canvas));
-
-	canvas = E_CANVAS(item->canvas);
-	flags = E_CANVAS_ITEM_SELECTION_DELETE_DATA;
-
-	for (list = canvas->selection; list; list = g_list_next(list)) {
-		info = list->data;
-
-		func = gtk_object_get_data(GTK_OBJECT(info->item), "ECanvasItem::selection_callback");
-		if (func)
-			func(info->item, flags, info->id);
-		g_message ("ECANVAS: free info (2): item %p, id %p",
-			   info->item, info->id);
-		gtk_object_unref (GTK_OBJECT (info->item));
-		g_free(info);
-	}
-	g_list_free(canvas->selection);
-
-	canvas->selection = NULL;
-
-	gnome_canvas_item_grab_focus(item);
-
-	info = g_new(ECanvasSelectionInfo, 1);
-	info->item = item;
-	gtk_object_ref (GTK_OBJECT (info->item));
-	info->id = id;
-	g_message ("ECANVAS: new info item %p, id %p", item, id);
-
-	flags = E_CANVAS_ITEM_SELECTION_SELECT | E_CANVAS_ITEM_SELECTION_CURSOR;
-	func = gtk_object_get_data(GTK_OBJECT(item), "ECanvasItem::selection_callback");
-	if (func)
-		func(item, flags, id);
-
-	canvas->selection = g_list_prepend(canvas->selection, info);
-	canvas->cursor = info;
-}
-
-void
-e_canvas_item_set_cursor_end (GnomeCanvasItem *item, gpointer id)
-{
-}
-
-void
-e_canvas_item_add_selection (GnomeCanvasItem *item, gpointer id)
-{
-	int flags;
-	ECanvas *canvas;
-	ECanvasSelectionInfo *info;
-	ECanvasItemSelectionFunc func;
-	GList *list;
-
-	g_return_if_fail(item != NULL);
-	g_return_if_fail(GNOME_IS_CANVAS_ITEM(item));
-	g_return_if_fail(item->canvas != NULL);
-	g_return_if_fail(E_IS_CANVAS(item->canvas));
-
-	flags = E_CANVAS_ITEM_SELECTION_SELECT;
-	canvas = E_CANVAS(item->canvas);
-
-	if (canvas->cursor) {
-		func = gtk_object_get_data(GTK_OBJECT(canvas->cursor->item), "ECanvasItem::selection_callback");
-		if (func)
-			func(canvas->cursor->item, flags, canvas->cursor->id);
-	}
-
-	gnome_canvas_item_grab_focus(item);
-
-	flags = E_CANVAS_ITEM_SELECTION_SELECT | E_CANVAS_ITEM_SELECTION_CURSOR;
-
-	for (list = canvas->selection; list; list = g_list_next(list)) {
-		ECanvasSelectionInfo *search;
-		search = list->data;
-
-		if (search->item == item) {
-			ECanvasItemSelectionCompareFunc compare_func;
-			compare_func = gtk_object_get_data(GTK_OBJECT(search->item), "ECanvasItem::selection_compare_callback");
-
-			if (compare_func(search->item, search->id, id, 0) == 0) {
-				canvas->cursor = search;
-				func = gtk_object_get_data(GTK_OBJECT(item), "ECanvasItem::selection_callback");
-				if (func)
-					func(item, flags, search->id);
-				return;
-			}
-		}
-	}
-
-	info = g_new(ECanvasSelectionInfo, 1);
-	info->item = item;
-	gtk_object_ref (GTK_OBJECT (info->item));
-	info->id = id;
-	g_message ("ECANVAS: new info (2): item %p, id %p", item, id);
-
-	func = gtk_object_get_data(GTK_OBJECT(item), "ECanvasItem::selection_callback");
-	if (func)
-		func(item, flags, id);
-
-	canvas->selection = g_list_prepend(canvas->selection, info);
-	canvas->cursor = info;
-}
-
-void
-e_canvas_item_remove_selection (GnomeCanvasItem *item, gpointer id)
-{
-	int flags;
-	ECanvas *canvas;
-	ECanvasSelectionInfo *info;
-	GList *list;
-
-	g_return_if_fail(item != NULL);
-	g_return_if_fail(GNOME_IS_CANVAS_ITEM(item));
-	g_return_if_fail(item->canvas != NULL);
-	g_return_if_fail(E_IS_CANVAS(item->canvas));
-
-	flags = E_CANVAS_ITEM_SELECTION_DELETE_DATA;
-	canvas = E_CANVAS(item->canvas);
-
-	for (list = canvas->selection; list; list = g_list_next(list)) {
-		info = list->data;
-
-		if (info->item == item) {
-			ECanvasItemSelectionCompareFunc compare_func;
-			compare_func = gtk_object_get_data(GTK_OBJECT(info->item), "ECanvasItem::selection_compare_callback");
-
-			if (compare_func(info->item, info->id, id, 0) == 0) {
-				ECanvasItemSelectionFunc func;
-				func = gtk_object_get_data(GTK_OBJECT(info->item), "ECanvasItem::selection_callback");
-				if (func)
-					func(info->item, flags, info->id);
-				canvas->selection = g_list_remove_link(canvas->selection, list);
-
-				if (canvas->cursor == info)
-					canvas->cursor = NULL;
-
-				g_message ("ECANVAS: removing info: item %p, info %p",
-					   info->item, info->id);
-				gtk_object_unref (GTK_OBJECT (info->item));
-				g_free(info);
-				g_list_free_1(list);
-				break;
-			}
-		}
-	}
-}
-
-void e_canvas_popup_tooltip (ECanvas *canvas, GtkWidget *widget, int x, int y)
-{
-	if (canvas->tooltip_window && canvas->tooltip_window != widget) {
-		e_canvas_hide_tooltip(canvas);
-	}
-	canvas->tooltip_window = widget;
-	canvas->visibility_first = TRUE;
-	if (canvas->toplevel == NULL) {
-		canvas->toplevel = gtk_widget_get_toplevel (GTK_WIDGET(canvas));
-		if (canvas->toplevel) {
-			gtk_widget_add_events(canvas->toplevel, GDK_VISIBILITY_NOTIFY_MASK);
-			gtk_object_ref(GTK_OBJECT(canvas->toplevel));
-			canvas->visibility_notify_id =
-				gtk_signal_connect (GTK_OBJECT (canvas->toplevel), "visibility_notify_event",
-						    GTK_SIGNAL_FUNC (e_canvas_visibility), canvas);
-		}
-	}
-	gtk_widget_popup (widget, x, y);
-}
-
-void e_canvas_hide_tooltip  (ECanvas *canvas)
-{
-	if (canvas->tooltip_window) {
-		gtk_widget_destroy (canvas->tooltip_window);
-		canvas->tooltip_window = NULL;
-	}
-}
diff --git a/widgets/misc/e-canvas.h b/widgets/misc/e-canvas.h
deleted file mode 100644
index 820dcddc2e..0000000000
--- a/widgets/misc/e-canvas.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-canvas.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CANVAS_H__
-#define __E_CANVAS_H__
-
-#include <libgnomeui/gnome-canvas.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* ECanvas - A class derived from canvas for the purpose of adding
- * evolution specific canvas hacks.
- */
-
-#define E_CANVAS_TYPE			(e_canvas_get_type ())
-#define E_CANVAS(obj)			(GTK_CHECK_CAST ((obj), E_CANVAS_TYPE, ECanvas))
-#define E_CANVAS_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CANVAS_TYPE, ECanvasClass))
-#define E_IS_CANVAS(obj)		(GTK_CHECK_TYPE ((obj), E_CANVAS_TYPE))
-#define E_IS_CANVAS_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CANVAS_TYPE))
-
-typedef void		(*ECanvasItemReflowFunc)		(GnomeCanvasItem *item,
-								 gint   	  flags);
-
-typedef void            (*ECanvasItemSelectionFunc)             (GnomeCanvasItem *item,
-								 gint             flags,
-								 gpointer         user_data);
-/* Returns the same as strcmp does. */
-typedef gint            (*ECanvasItemSelectionCompareFunc)      (GnomeCanvasItem *item,
-								 gpointer         data1,
-								 gpointer         data2,
-								 gint             flags);
-
-
-typedef struct _ECanvas       ECanvas;
-typedef struct _ECanvasClass  ECanvasClass;
-
-/* Object flags for items */
-enum {
-	E_CANVAS_ITEM_NEEDS_REFLOW            = 1 << 13,
-	E_CANVAS_ITEM_DESCENDENT_NEEDS_REFLOW = 1 << 14
-};
-
-enum {
-	E_CANVAS_ITEM_SELECTION_SELECT        = 1 << 0, /* TRUE = select.  FALSE = unselect. */
-	E_CANVAS_ITEM_SELECTION_CURSOR        = 1 << 1, /* TRUE = has become cursor.  FALSE = not cursor. */
-	E_CANVAS_ITEM_SELECTION_DELETE_DATA   = 1 << 2,
-};
-
-typedef struct {
-	GnomeCanvasItem *item;
-	gpointer         id;
-} ECanvasSelectionInfo;
-
-struct _ECanvas
-{
-	GnomeCanvas parent;
-		             
-	int                   idle_id;
-	GList                *selection;
-	ECanvasSelectionInfo *cursor;
-
-	GtkWidget            *tooltip_window;
-	int                   visibility_notify_id;
-	GtkWidget            *toplevel;
-	guint visibility_first : 1;
-
-	/* Input context for dead key support */
-	GdkIC     *ic;
-	GdkICAttr *ic_attr;
-};
-
-struct _ECanvasClass
-{
-	GnomeCanvasClass parent_class;
-	void (* reflow) (ECanvas *canvas);
-};
-
-
-GtkType    e_canvas_get_type (void);
-GtkWidget *e_canvas_new      (void);
-
-/* Used to send all of the keystroke events to a specific item as well as
- * GDK_FOCUS_CHANGE events.
- */
-void e_canvas_item_grab_focus (GnomeCanvasItem *item, gboolean widget_too);
-
-void e_canvas_item_request_reflow (GnomeCanvasItem *item);
-void e_canvas_item_request_parent_reflow (GnomeCanvasItem *item);
-void e_canvas_item_set_reflow_callback (GnomeCanvasItem *item, ECanvasItemReflowFunc func);
-
-void e_canvas_item_set_selection_callback (GnomeCanvasItem *item, ECanvasItemSelectionFunc func);
-void e_canvas_item_set_selection_compare_callback (GnomeCanvasItem *item, ECanvasItemSelectionCompareFunc func);
-
-void e_canvas_item_set_cursor (GnomeCanvasItem *item, gpointer id);
-void e_canvas_item_add_selection (GnomeCanvasItem *item, gpointer id);
-void e_canvas_item_remove_selection (GnomeCanvasItem *item, gpointer id);
-
-/* Not implemented yet. */
-void e_canvas_item_set_cursor_end (GnomeCanvasItem *item, gpointer id);
-
-void e_canvas_popup_tooltip (ECanvas *canvas, GtkWidget *widget, int x, int y);
-void e_canvas_hide_tooltip  (ECanvas *canvas);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CANVAS_H__ */
diff --git a/widgets/misc/e-cell-date-edit.c b/widgets/misc/e-cell-date-edit.c
deleted file mode 100644
index f6670c844e..0000000000
--- a/widgets/misc/e-cell-date-edit.c
+++ /dev/null
@@ -1,910 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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
- */
-
-/*
- * ECellDateEdit - a subclass of ECellPopup used to show a date with a popup
- * window to edit it.
- */
-
-#include <config.h>
-
-#include "e-cell-date-edit.h"
-
-#include <string.h>
-#include <time.h>
-#include <glib.h>
-#include <gdk/gdkkeysyms.h>
-#include <gal/util/e-util.h>
-#include <gal/e-table/e-table-item.h>
-#include <libgnomeui/gnome-messagebox.h>
-#include <libgnomeui/gnome-stock.h>
-#include <libgnome/gnome-i18n.h>
-#include "e-util/e-time-utils.h"
-/* This depends on ECalendar which is why I didn't put it in gal. */
-#include "e-calendar.h"
-
-static void e_cell_date_edit_class_init		(GtkObjectClass	*object_class);
-static void e_cell_date_edit_init		(ECellDateEdit	*ecde);
-static void e_cell_date_edit_destroy		(GtkObject	*object);
-static void e_cell_date_edit_get_arg		(GtkObject	*o,
-						 GtkArg		*arg,
-						 guint		 arg_id);
-static void e_cell_date_edit_set_arg		(GtkObject	*o,
-						 GtkArg		*arg,
-						 guint		 arg_id);
-
-static gint e_cell_date_edit_do_popup		(ECellPopup	*ecp,
-						 GdkEvent	*event);
-static void e_cell_date_edit_set_popup_values	(ECellDateEdit	*ecde);
-static void e_cell_date_edit_select_matching_time(ECellDateEdit	*ecde,
-						  char		*time);
-static void e_cell_date_edit_show_popup		(ECellDateEdit	*ecde);
-static void e_cell_date_edit_get_popup_pos	(ECellDateEdit	*ecde,
-						 gint		*x,
-						 gint		*y,
-						 gint		*height,
-						 gint		*width);
-
-static void e_cell_date_edit_rebuild_time_list	(ECellDateEdit	*ecde);
-
-static int e_cell_date_edit_key_press		(GtkWidget	*popup_window,
-						 GdkEventKey	*event,
-						 ECellDateEdit	*ecde);
-static void e_cell_date_edit_on_ok_clicked	(GtkWidget	*button,
-						 ECellDateEdit	*ecde);
-static void e_cell_date_edit_show_time_invalid_warning	(ECellDateEdit	*ecde);
-static void e_cell_date_edit_on_now_clicked	(GtkWidget	*button,
-						 ECellDateEdit	*ecde);
-static void e_cell_date_edit_on_none_clicked	(GtkWidget	*button,
-						 ECellDateEdit	*ecde);
-static void e_cell_date_edit_on_today_clicked	(GtkWidget	*button,
-						 ECellDateEdit	*ecde);
-static void e_cell_date_edit_update_cell	(ECellDateEdit	*ecde,
-						 char		*text);
-static void e_cell_date_edit_on_time_selected	(GtkList	*list,
-						 ECellDateEdit	*ecde);
-static void e_cell_date_edit_hide_popup		(ECellDateEdit	*ecde);
-
-/* Our arguments. */
-enum {
-	ARG_0,
-	ARG_SHOW_TIME,
-	ARG_SHOW_NOW_BUTTON,
-	ARG_SHOW_TODAY_BUTTON,
-	ARG_ALLOW_NO_DATE_SET,
-	ARG_USE_24_HOUR_FORMAT,
-	ARG_LOWER_HOUR,
-	ARG_UPPER_HOUR
-};
-
-static ECellPopupClass *parent_class;
-
-
-E_MAKE_TYPE (e_cell_date_edit, "ECellDateEdit", ECellDateEdit,
-	     e_cell_date_edit_class_init, e_cell_date_edit_init,
-	     e_cell_popup_get_type());
-
-
-static void
-e_cell_date_edit_class_init		(GtkObjectClass	*object_class)
-{
-	ECellPopupClass *ecpc = (ECellPopupClass *) object_class;
-
-	gtk_object_add_arg_type ("ECellDateEdit::show_time",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE,
-				 ARG_SHOW_TIME);
-	gtk_object_add_arg_type ("ECellDateEdit::show_now_button",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE,
-				 ARG_SHOW_NOW_BUTTON);
-	gtk_object_add_arg_type ("ECellDateEdit::show_today_button",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE,
-				 ARG_SHOW_TODAY_BUTTON);
-	gtk_object_add_arg_type ("ECellDateEdit::allow_no_date_set",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE,
-				 ARG_ALLOW_NO_DATE_SET);
-	gtk_object_add_arg_type ("ECellDateEdit::use_24_hour_format",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE,
-				 ARG_USE_24_HOUR_FORMAT);
-	gtk_object_add_arg_type ("ECellDateEdit::lower_hour",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE,
-				 ARG_LOWER_HOUR);
-	gtk_object_add_arg_type ("ECellDateEdit::upper_hour",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE,
-				 ARG_UPPER_HOUR);
-
-	object_class->destroy = e_cell_date_edit_destroy;
-	object_class->get_arg = e_cell_date_edit_get_arg;
-	object_class->set_arg = e_cell_date_edit_set_arg;
-
-	ecpc->popup = e_cell_date_edit_do_popup;
-
-	parent_class = gtk_type_class (e_cell_popup_get_type ());
-}
-
-
-static void
-e_cell_date_edit_init			(ECellDateEdit	*ecde)
-{
-	GtkWidget *frame, *vbox, *hbox, *vbox2;
-	GtkWidget *scrolled_window, *list, *bbox;
-	GtkWidget *now_button, *today_button, *none_button, *ok_button;
-
-	ecde->lower_hour = 0;
-	ecde->upper_hour = 24;
-	ecde->use_24_hour_format = TRUE;
-	ecde->need_time_list_rebuild = TRUE;
-	ecde->freeze_count = 0;
-	ecde->time_callback = NULL;
-	ecde->time_callback_data = NULL;
-	ecde->time_callback_destroy = NULL;
-
-	/* We create one popup window for the ECell, since there will only
-	   ever be one popup in use at a time. */
-	ecde->popup_window = gtk_window_new (GTK_WINDOW_POPUP);
-
-	gtk_window_set_policy (GTK_WINDOW (ecde->popup_window),
-			       TRUE, TRUE, FALSE);
-  
-	frame = gtk_frame_new (NULL);
-	gtk_container_add (GTK_CONTAINER (ecde->popup_window), frame);
-	gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
-	gtk_widget_show (frame);
-
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (frame), vbox);
-        gtk_widget_show (vbox);
-
-	hbox = gtk_hbox_new (FALSE, 4);
-	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
-        gtk_widget_show (hbox);
-
-	ecde->calendar = e_calendar_new ();
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (E_CALENDAR (ecde->calendar)->calitem),
-			       "move_selection_when_moving", FALSE,
-			       NULL);
-	gtk_box_pack_start (GTK_BOX (hbox), ecde->calendar, TRUE, TRUE, 0);
-	gtk_widget_show (ecde->calendar);
-
-	vbox2 = gtk_vbox_new (FALSE, 2);
-	gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 0);
-        gtk_widget_show (vbox2);
-
-	ecde->time_entry = gtk_entry_new ();
-	gtk_widget_set_usize (ecde->time_entry, 50, -1);
-	gtk_box_pack_start (GTK_BOX (vbox2), ecde->time_entry,
-			    FALSE, FALSE, 0);
-	gtk_widget_show (ecde->time_entry);
-
-	scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-	gtk_box_pack_start (GTK_BOX (vbox2), scrolled_window, TRUE, TRUE, 0);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
-					GTK_POLICY_NEVER,
-					GTK_POLICY_ALWAYS);
-	gtk_widget_show (scrolled_window);
-
-	list = gtk_list_new ();
-	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window), list);
-	gtk_container_set_focus_vadjustment (GTK_CONTAINER (list),
-					     gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrolled_window)));
-	gtk_widget_show (list);
-	ecde->time_list = list;
-	gtk_signal_connect (GTK_OBJECT (list), "selection-changed",
-			    GTK_SIGNAL_FUNC (e_cell_date_edit_on_time_selected),
-			    ecde);
-
-	bbox = gtk_hbutton_box_new ();
-	gtk_container_set_border_width (GTK_CONTAINER (bbox), 4);
-	gtk_button_box_set_spacing (GTK_BUTTON_BOX (bbox), 2);
-	gtk_button_box_set_child_ipadding (GTK_BUTTON_BOX (bbox), 2, 0);
-	gtk_button_box_set_child_size (GTK_BUTTON_BOX (bbox), 0, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
-        gtk_widget_show (bbox);
-
-	now_button = gtk_button_new_with_label (_("Now"));
-	gtk_container_add (GTK_CONTAINER (bbox), now_button);
-        gtk_widget_show (now_button);
-	gtk_signal_connect (GTK_OBJECT (now_button), "clicked",
-			    GTK_SIGNAL_FUNC (e_cell_date_edit_on_now_clicked),
-			    ecde);
-	ecde->now_button = now_button;
-
-	today_button = gtk_button_new_with_label (_("Today"));
-	gtk_container_add (GTK_CONTAINER (bbox), today_button);
-        gtk_widget_show (today_button);
-	gtk_signal_connect (GTK_OBJECT (today_button), "clicked",
-			    GTK_SIGNAL_FUNC (e_cell_date_edit_on_today_clicked),
-			    ecde);
-	ecde->today_button = today_button;
-
-	none_button = gtk_button_new_with_label (_("None"));
-	gtk_container_add (GTK_CONTAINER (bbox), none_button);
-        gtk_widget_show (none_button);
-	gtk_signal_connect (GTK_OBJECT (none_button), "clicked",
-			    GTK_SIGNAL_FUNC (e_cell_date_edit_on_none_clicked),
-			    ecde);
-	ecde->none_button = none_button;
-
-	ok_button = gtk_button_new_with_label (_("OK"));
-	gtk_container_add (GTK_CONTAINER (bbox), ok_button);
-        gtk_widget_show (ok_button);
-	gtk_signal_connect (GTK_OBJECT (ok_button), "clicked",
-			    GTK_SIGNAL_FUNC (e_cell_date_edit_on_ok_clicked),
-			    ecde);
-
-
-	gtk_signal_connect (GTK_OBJECT (ecde->popup_window),
-			    "key_press_event",
-			    GTK_SIGNAL_FUNC (e_cell_date_edit_key_press),
-			    ecde);
-}
-
-
-/**
- * e_cell_date_edit_new:
- *
- * Creates a new ECellDateEdit renderer.
- *
- * Returns: an ECellDateEdit object.
- */
-ECell *
-e_cell_date_edit_new			(void)
-{
-	ECellDateEdit *ecde = gtk_type_new (e_cell_date_edit_get_type ());
-
-	return (ECell*) ecde;
-}
-
-
-/*
- * GtkObject::destroy method
- */
-static void
-e_cell_date_edit_destroy		(GtkObject *object)
-{
-	ECellDateEdit *ecde = E_CELL_DATE_EDIT (object);
-
-	e_cell_date_edit_set_get_time_callback (ecde, NULL, NULL, NULL);
-
-	gtk_widget_unref (ecde->popup_window);
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-
-static void
-e_cell_date_edit_get_arg		(GtkObject	*o,
-					 GtkArg		*arg,
-					 guint		 arg_id)
-{
-	ECellDateEdit *ecde;
-
-	ecde = E_CELL_DATE_EDIT (o);
-
-	switch (arg_id) {
-	case ARG_SHOW_TIME:
-		GTK_VALUE_BOOL (*arg) = GTK_WIDGET_VISIBLE (ecde->time_entry) ? TRUE : FALSE;
-		break;
-	case ARG_SHOW_NOW_BUTTON:
-		GTK_VALUE_BOOL (*arg) = GTK_WIDGET_VISIBLE (ecde->now_button) ? TRUE : FALSE;
-		break;
-	case ARG_SHOW_TODAY_BUTTON:
-		GTK_VALUE_BOOL (*arg) = GTK_WIDGET_VISIBLE (ecde->today_button) ? TRUE : FALSE;
-		break;
-	case ARG_ALLOW_NO_DATE_SET:
-		GTK_VALUE_BOOL (*arg) = GTK_WIDGET_VISIBLE (ecde->none_button) ? TRUE : FALSE;
-		break;
-	case ARG_USE_24_HOUR_FORMAT:
-		GTK_VALUE_BOOL (*arg) = ecde->use_24_hour_format;
-		break;
-	case ARG_LOWER_HOUR:
-		GTK_VALUE_INT (*arg) = ecde->lower_hour;
-		break;
-	case ARG_UPPER_HOUR:
-		GTK_VALUE_INT (*arg) = ecde->upper_hour;
-		break;
-	default:
-		g_warning ("Invalid arg");
-	}
-}
-
-
-static void
-e_cell_date_edit_set_arg		(GtkObject	*o,
-					 GtkArg		*arg,
-					 guint		 arg_id)
-{
-	ECellDateEdit *ecde;
-	gint ivalue;
-	gboolean bvalue;
-
-	ecde = E_CELL_DATE_EDIT (o);
-	
-	switch (arg_id){
-	case ARG_SHOW_TIME:
-		bvalue = GTK_VALUE_BOOL (*arg);
-		if (bvalue) {
-			gtk_widget_show (ecde->time_entry);
-			gtk_widget_show (ecde->time_list);
-		} else {
-			gtk_widget_hide (ecde->time_entry);
-			gtk_widget_hide (ecde->time_list);
-		}
-		break;
-	case ARG_SHOW_NOW_BUTTON:
-		bvalue = GTK_VALUE_BOOL (*arg);
-		if (bvalue) {
-			gtk_widget_show (ecde->now_button);
-		} else {
-			gtk_widget_hide (ecde->now_button);
-		}
-		break;
-	case ARG_SHOW_TODAY_BUTTON:
-		bvalue = GTK_VALUE_BOOL (*arg);
-		if (bvalue) {
-			gtk_widget_show (ecde->today_button);
-		} else {
-			gtk_widget_hide (ecde->today_button);
-		}
-		break;
-	case ARG_ALLOW_NO_DATE_SET:
-		bvalue = GTK_VALUE_BOOL (*arg);
-		if (bvalue) {
-			gtk_widget_show (ecde->none_button);
-		} else {
-			/* FIXME: What if we have no date set now. */
-			gtk_widget_hide (ecde->none_button);
-		}
-		break;
-	case ARG_USE_24_HOUR_FORMAT:
-		bvalue = GTK_VALUE_BOOL (*arg);
-		if (ecde->use_24_hour_format != bvalue) {
-			ecde->use_24_hour_format = bvalue;
-			ecde->need_time_list_rebuild = TRUE;
-		}
-		break;
-	case ARG_LOWER_HOUR:
-		ivalue = GTK_VALUE_INT (*arg);
-		ivalue = CLAMP (ivalue, 0, 24);
-		if (ecde->lower_hour != ivalue) {
-			ecde->lower_hour = ivalue;
-			ecde->need_time_list_rebuild = TRUE;
-		}
-		break;
-	case ARG_UPPER_HOUR:
-		ivalue = GTK_VALUE_INT (*arg);
-		ivalue = CLAMP (ivalue, 0, 24);
-		if (ecde->upper_hour != ivalue) {
-			ecde->upper_hour = ivalue;
-			ecde->need_time_list_rebuild = TRUE;
-		}
-		break;
-	default:
-		g_warning ("Invalid arg");
-	}
-
-#if 0
-	if (ecde->need_time_list_rebuild && ecde->freeze_count == 0)
-		e_cell_date_edit_rebuild_time_list (ecde);
-#endif
-}
-
-
-static gint
-e_cell_date_edit_do_popup		(ECellPopup	*ecp,
-					 GdkEvent	*event)
-{
-	ECellDateEdit *ecde = E_CELL_DATE_EDIT (ecp);
-	guint32 time;
-
-	e_cell_date_edit_show_popup (ecde);
-	e_cell_date_edit_set_popup_values (ecde);
-
-	if (event->type == GDK_BUTTON_PRESS) {
-		time = event->button.time;
-	} else {
-		time = event->key.time;
-	}
-
-	gtk_grab_add (ecde->popup_window);
-
-	return TRUE;
-}
-
-
-static void
-e_cell_date_edit_set_popup_values	(ECellDateEdit	*ecde)
-{
-	ECellPopup *ecp = E_CELL_POPUP (ecde);
-	ECellView *ecv = (ECellView*) ecp->popup_cell_view;
-	ETableItem *eti = E_TABLE_ITEM (ecp->popup_cell_view->cell_view.e_table_item_view);
-	ETableCol *ecol;
-	char *cell_text;
-	ETimeParseStatus status;
-	struct tm date_tm;
-	GDate date;
-	ECalendarItem *calitem;
-	char buffer[64];
-
-	ecol = e_table_header_get_column (eti->header, ecp->popup_view_col);
-	cell_text = e_table_model_value_at (ecv->e_table_model,
-					    ecol->col_idx, ecp->popup_row);
-
-	status = e_time_parse_date_and_time (cell_text, &date_tm);
-
-	/* If there is no date and time set, or the date is invalid, we clear
-	   the selections, else we select the appropriate date & time. */
-	calitem = E_CALENDAR_ITEM (E_CALENDAR (ecde->calendar)->calitem);
-	if (status == E_TIME_PARSE_NONE || status == E_TIME_PARSE_INVALID) {
-		gtk_entry_set_text (GTK_ENTRY (ecde->time_entry), "");
-		e_calendar_item_set_selection (calitem, NULL, NULL);
-		gtk_list_unselect_all (GTK_LIST (ecde->time_list));
-	} else {
-		e_time_format_time (&date_tm, ecde->use_24_hour_format, FALSE,
-				    buffer, sizeof (buffer));
-		gtk_entry_set_text (GTK_ENTRY (ecde->time_entry), buffer);
-
-		g_date_clear (&date, 1);
-		g_date_set_dmy (&date, date_tm.tm_mday, date_tm.tm_mon + 1,
-				date_tm.tm_year + 1900);
-		e_calendar_item_set_selection (calitem, &date, &date);
-
-		e_cell_date_edit_select_matching_time (ecde, buffer);
-	}
-}
-
-
-static void
-e_cell_date_edit_select_matching_time	(ECellDateEdit	*ecde,
-					 char		*time)
-{
-	GtkList *list;
-	GtkWidget *listitem, *label;
-	GList *elem;
-	gboolean found = FALSE;
-	char *list_item_text;
-
-	list = GTK_LIST (ecde->time_list);
-	elem = list->children;
-	while (elem) {
-		listitem = GTK_WIDGET (elem->data);
-		label = GTK_BIN (listitem)->child;
-		gtk_label_get (GTK_LABEL (label), &list_item_text);
-
-		if (!strcmp (list_item_text, time)) {
-			found = TRUE;
-			gtk_list_select_child (list, listitem);
-			break;
-		}
-
-		elem = elem->next;
-	}
-
-	if (!found)
-		gtk_list_unselect_all (list);
-}
-
-
-static void
-e_cell_date_edit_show_popup		(ECellDateEdit	*ecde)
-{
-	gint x, y, width, height, old_width, old_height;
-
-	if (ecde->need_time_list_rebuild)
-		e_cell_date_edit_rebuild_time_list (ecde);
-
-	/* This code is practically copied from GtkCombo. */
-	old_width = ecde->popup_window->allocation.width;
-	old_height  = ecde->popup_window->allocation.height;
-
-	e_cell_date_edit_get_popup_pos (ecde, &x, &y, &height, &width);
-
-	gtk_widget_set_uposition (ecde->popup_window, x, y);
-	gtk_widget_set_usize (ecde->popup_window, width, height);
-	gtk_widget_realize (ecde->popup_window);
-	gdk_window_resize (ecde->popup_window->window, width, height);
-	gtk_widget_show (ecde->popup_window);
-
-	/* Set the focus to the first widget. */
-	gtk_widget_grab_focus (ecde->time_entry);
-
-	E_CELL_POPUP (ecde)->popup_shown = TRUE;
-}
-
-
-/* Calculates the size and position of the popup window (like GtkCombo). */
-static void
-e_cell_date_edit_get_popup_pos		(ECellDateEdit	*ecde,
-					 gint		*x,
-					 gint		*y,
-					 gint		*height,
-					 gint		*width)
-{
-	ECellPopup *ecp = E_CELL_POPUP (ecde);
-	ETableItem *eti = E_TABLE_ITEM (ecp->popup_cell_view->cell_view.e_table_item_view);
-	GtkWidget *canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (eti)->canvas);
-	GtkRequisition popup_requisition;
-	gint avail_height, screen_width, column_width, row_height;
-	double x1, y1;
-  
-	gdk_window_get_origin (canvas->window, x, y);
-
-	x1 = e_table_header_col_diff (eti->header, 0, eti->editing_col + 1);
-	y1 = e_table_item_row_diff (eti, 0, eti->editing_row + 1);
-	column_width = e_table_header_col_diff (eti->header, eti->editing_col,
-						eti->editing_col + 1);
-	row_height = e_table_item_row_diff (eti, eti->editing_row,
-					    eti->editing_row + 1);
-	gnome_canvas_item_i2w (GNOME_CANVAS_ITEM (eti), &x1, &y1);
-
-	*x += x1;
-	/* The ETable positions don't include the grid lines, I think, so we
-	   add 1. */
-	*y += y1 + 1;
-
-	avail_height = gdk_screen_height () - *y;
-
-	/* We'll use the entire screen width if needed, but we save space for
-	   the vertical scrollbar in case we need to show that. */
-	screen_width = gdk_screen_width ();
-  
-	gtk_widget_size_request (ecde->popup_window, &popup_requisition);
-  
-	/* Calculate the desired width. */
-	*width = popup_requisition.width;
-
-	/* Use at least the same width as the column. */
-	if (*width < column_width)
-		*width = column_width;
-
-	/* Check if it fits in the available height. */
-	if (popup_requisition.height > avail_height) {
-		/* It doesn't fit, so we see if we have the minimum space
-		   needed. */
-		if (*y - row_height > avail_height) {
-			/* We don't, so we show the popup above the cell
-			   instead of below it. */
-			avail_height = *y - row_height;
-			*y -= (popup_requisition.height + row_height);
-			if (*y < 0)
-				*y = 0;
-		}
-	}
-
-	/* We try to line it up with the right edge of the column, but we don't
-	   want it to go off the edges of the screen. */
-	if (*x > screen_width)
-		*x = screen_width;
-	*x -= *width;
-	if (*x < 0)
-		*x = 0;
-
-	*height = popup_requisition.height;
-}
-
-
-/* This handles key press events in the popup window. If the Escape key is
-   pressed we hide the popup, and do not change the cell contents. */
-static int
-e_cell_date_edit_key_press		(GtkWidget	*popup_window,
-					 GdkEventKey	*event,
-					 ECellDateEdit	*ecde)
-{
-	g_print ("In e_cell_date_edit_key_press\n");
-
-	/* If the Escape key is pressed we hide the popup. */
-	if (event->keyval != GDK_Escape)
-		return FALSE;
-
-	e_cell_date_edit_hide_popup (ecde);
-
-	return TRUE;
-}
-
-
-/* Clears the time list and rebuilds it using the lower_hour, upper_hour
-   and use_24_hour_format settings. */
-static void
-e_cell_date_edit_rebuild_time_list		(ECellDateEdit	*ecde)
-{
-	GtkList *list;
-	GtkWidget *listitem;
-	char buffer[40];
-	struct tm tmp_tm;
-	gint hour, min;
-
-	list = GTK_LIST (ecde->time_list);
-
-	gtk_list_clear_items (list, 0, -1);
-
-	/* Fill the struct tm with some sane values. */
-	tmp_tm.tm_year = 2000;
-	tmp_tm.tm_mon = 0;
-	tmp_tm.tm_mday = 1;
-	tmp_tm.tm_sec  = 0;
-	tmp_tm.tm_isdst = 0;
-
-	for (hour = ecde->lower_hour; hour <= ecde->upper_hour; hour++) {
-
-		/* We don't want to display midnight at the end, since that is
-		   really in the next day. */
-		if (hour == 24)
-			break;
-
-		/* We want to finish on upper_hour, with min == 0. */
-		for (min = 0;
-		     min == 0 || (min < 60 && hour != ecde->upper_hour);
-		     min += 30) {
-			tmp_tm.tm_hour = hour;
-			tmp_tm.tm_min  = min;
-			e_time_format_time (&tmp_tm, ecde->use_24_hour_format,
-					    FALSE, buffer, sizeof (buffer));
-			listitem = gtk_list_item_new_with_label (buffer);
-			gtk_widget_show (listitem);
-			gtk_container_add (GTK_CONTAINER (list), listitem);
-		}
-	}
-
-	ecde->need_time_list_rebuild = FALSE;
-}
-
-
-static void
-e_cell_date_edit_on_ok_clicked		(GtkWidget	*button,
-					 ECellDateEdit	*ecde)
-{
-	ECalendarItem *calitem;
-	GDate start_date, end_date;
-	gboolean day_selected;
-	struct tm date_tm;
-	char buffer[64], *text;
-	ETimeParseStatus status;
-
-	calitem = E_CALENDAR_ITEM (E_CALENDAR (ecde->calendar)->calitem);
-	day_selected = e_calendar_item_get_selection (calitem, &start_date,
-						      &end_date);
-
-	text = gtk_entry_get_text (GTK_ENTRY (ecde->time_entry));
-	status = e_time_parse_time (text, &date_tm);
-	if (status == E_TIME_PARSE_INVALID) {
-		e_cell_date_edit_show_time_invalid_warning (ecde);
-		return;
-	}
-
-	if (day_selected) {
-		date_tm.tm_year = g_date_year (&start_date) - 1900;
-		date_tm.tm_mon = g_date_month (&start_date) - 1;
-		date_tm.tm_mday = g_date_day (&start_date);
-		/* We need to call this to set the weekday. */
-		mktime (&date_tm);
-		e_time_format_date_and_time (&date_tm,
-					     ecde->use_24_hour_format,
-					     TRUE, FALSE,
-					     buffer, sizeof (buffer));
-	} else {
-		buffer[0] = '\0';
-	}
-
-	e_cell_date_edit_update_cell (ecde, buffer);
-	e_cell_date_edit_hide_popup (ecde);
-}
-
-
-static void
-e_cell_date_edit_show_time_invalid_warning	(ECellDateEdit	*ecde)
-{
-	GtkWidget *dialog;
-	struct tm date_tm;
-	char buffer[64], *message;
-
-	/* Create a useful error message showing the correct format. */
-	date_tm.tm_year = 100;
-	date_tm.tm_mon = 0;
-	date_tm.tm_mday = 1;
-	date_tm.tm_hour = 1;
-	date_tm.tm_min = 30;
-	date_tm.tm_sec = 0;
-	date_tm.tm_isdst = -1;
-	e_time_format_time (&date_tm, ecde->use_24_hour_format, FALSE,
-			    buffer, sizeof (buffer));
-
-	message = g_strdup_printf (_("The time must be in the format: %s"),
-				   buffer);
-
-	dialog = gnome_message_box_new (message, GNOME_MESSAGE_BOX_ERROR,
-					GNOME_STOCK_BUTTON_OK, NULL);
-	/* FIXME: Fix transient settings - I'm not sure it works with popup
-	   windows. Maybe we need to use a normal window without decorations.*/
-	gtk_window_set_transient_for (GTK_WINDOW (dialog),
-				      GTK_WINDOW (ecde->popup_window));
-	gnome_dialog_run (GNOME_DIALOG (dialog));
-
-	g_free (message);
-}
-
-
-static void
-e_cell_date_edit_on_now_clicked		(GtkWidget	*button,
-					 ECellDateEdit	*ecde)
-{
-	struct tm tmp_tm;
-	time_t t;
-	char buffer[64];
-
-	g_print ("In e_cell_date_edit_on_now_clicked\n");
-
-	if (ecde->time_callback) {
-		tmp_tm = (*ecde->time_callback) (ecde, ecde->time_callback_data);
-	} else {
-		t = time (NULL);
-		tmp_tm = *localtime (&t);
-	}
-	e_time_format_date_and_time (&tmp_tm,
-				     ecde->use_24_hour_format,
-				     TRUE, FALSE,
-				     buffer, sizeof (buffer));
-
-	e_cell_date_edit_update_cell (ecde, buffer);
-	e_cell_date_edit_hide_popup (ecde);
-}
-
-
-static void
-e_cell_date_edit_on_none_clicked	(GtkWidget	*button,
-					 ECellDateEdit	*ecde)
-{
-	g_print ("In e_cell_date_edit_on_none_clicked\n");
-
-	e_cell_date_edit_update_cell (ecde, "");
-	e_cell_date_edit_hide_popup (ecde);
-}
-
-
-static void
-e_cell_date_edit_on_today_clicked	(GtkWidget	*button,
-					 ECellDateEdit	*ecde)
-{
-	struct tm tmp_tm;
-	time_t t;
-	char buffer[64];
-
-	g_print ("In e_cell_date_edit_on_today_clicked\n");
-
-	if (ecde->time_callback) {
-		tmp_tm = (*ecde->time_callback) (ecde, ecde->time_callback_data);
-	} else {
-		t = time (NULL);
-		tmp_tm = *localtime (&t);
-	}
-
-	tmp_tm.tm_hour = 0;
-	tmp_tm.tm_min = 0;
-	tmp_tm.tm_sec = 0;
-	e_time_format_date_and_time (&tmp_tm,
-				     ecde->use_24_hour_format,
-				     FALSE, FALSE,
-				     buffer, sizeof (buffer));
-
-	e_cell_date_edit_update_cell (ecde, buffer);
-	e_cell_date_edit_hide_popup (ecde);
-}
-
-
-static void
-e_cell_date_edit_update_cell		(ECellDateEdit	*ecde,
-					 char		*text)
-{
-	ECellPopup *ecp = E_CELL_POPUP (ecde);
-	ECellView *ecv = (ECellView*) ecp->popup_cell_view;
-	ETableItem *eti = E_TABLE_ITEM (ecv->e_table_item_view);
-	ETableCol *ecol;
-	gchar *old_text;
-
-	/* Compare the new text with the existing cell contents. */
-	ecol = e_table_header_get_column (eti->header, ecp->popup_view_col);
-	old_text = e_table_model_value_at (ecv->e_table_model,
-					   ecol->col_idx, ecp->popup_row);
-
-	/* If they are different, update the cell contents. */
-	if (strcmp (old_text, text)) {
-		e_table_model_set_value_at (ecv->e_table_model,
-					    ecol->col_idx, ecp->popup_row,
-					    text);
-	}
-}
-
-
-static void
-e_cell_date_edit_on_time_selected	(GtkList	*list,
-					 ECellDateEdit	*ecde)
-{
-	GtkWidget *listitem, *label;
-	char *list_item_text;
-
-	g_print ("In e_cell_date_edit_on_time_selected\n");
-
-	if (!list->selection)
-		return;
-
-	listitem = list->selection->data;
-	label = GTK_BIN (listitem)->child;
-	gtk_label_get (GTK_LABEL (label), &list_item_text);
-	gtk_entry_set_text (GTK_ENTRY (ecde->time_entry), list_item_text);
-}
-
-
-static void
-e_cell_date_edit_hide_popup		(ECellDateEdit	*ecde)
-{
-	gtk_grab_remove (ecde->popup_window);
-	gtk_widget_hide (ecde->popup_window);
-	E_CELL_POPUP (ecde)->popup_shown = FALSE;
-}
-
-
-/* These freeze and thaw the rebuilding of the time list. They are useful when
-   setting several properties which result in rebuilds of the list, e.g. the
-   lower_hour, upper_hour and use_24_hour_format properties. */
-void
-e_cell_date_edit_freeze			(ECellDateEdit	*ecde)
-{
-	g_return_if_fail (E_IS_CELL_DATE_EDIT (ecde));
-
-	ecde->freeze_count++;
-}
-
-
-void
-e_cell_date_edit_thaw			(ECellDateEdit	*ecde)
-{
-	g_return_if_fail (E_IS_CELL_DATE_EDIT (ecde));
-
-	if (ecde->freeze_count > 0) {
-		ecde->freeze_count--;
-
-		if (ecde->freeze_count == 0)
-			e_cell_date_edit_rebuild_time_list (ecde);
-	}
-}
-
-
-/* Sets a callback to use to get the current time. This is useful if the
-   application needs to use its own timezone data rather than rely on the
-   Unix timezone. */
-void
-e_cell_date_edit_set_get_time_callback (ECellDateEdit	*ecde,
-					ECellDateEditGetTimeCallback cb,
-					gpointer	 data,
-					GtkDestroyNotify destroy)
-{
-	g_return_if_fail (E_IS_CELL_DATE_EDIT (ecde));
-
-	if (ecde->time_callback_data && ecde->time_callback_destroy)
-		(*ecde->time_callback_destroy) (ecde->time_callback_data);
-
-	ecde->time_callback = cb;
-	ecde->time_callback_data = data;
-	ecde->time_callback_destroy = destroy;
-}
-
-
diff --git a/widgets/misc/e-cell-date-edit.h b/widgets/misc/e-cell-date-edit.h
deleted file mode 100644
index 67af112c94..0000000000
--- a/widgets/misc/e-cell-date-edit.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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
- */
-
-/*
- * ECellDateEdit - a subclass of ECellPopup used to show a date with a popup
- * window to edit it.
- */
-
-#ifndef _E_CELL_DATE_EDIT_H_
-#define _E_CELL_DATE_EDIT_H_
-
-#include <time.h>
-#include <gal/e-table/e-cell-popup.h>
-
-#define E_CELL_DATE_EDIT_TYPE        (e_cell_date_edit_get_type ())
-#define E_CELL_DATE_EDIT(o)          (GTK_CHECK_CAST ((o), E_CELL_DATE_EDIT_TYPE, ECellDateEdit))
-#define E_CELL_DATE_EDIT_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CELL_DATE_EDIT_TYPE, ECellDateEditClass))
-#define E_IS_CELL_DATE_EDIT(o)       (GTK_CHECK_TYPE ((o), E_CELL_DATE_EDIT_TYPE))
-#define E_IS_CELL_DATE_EDIT_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CELL_DATE_EDIT_TYPE))
-
-
-typedef struct _ECellDateEdit ECellDateEdit;
-typedef struct _ECellDateEditClass ECellDateEditClass;
-
-/* The type of the callback function optionally used to get the current time.
- */
-typedef struct tm (*ECellDateEditGetTimeCallback) (ECellDateEdit *ecde,
-						   gpointer	  data);
-
-struct _ECellDateEdit {
-	ECellPopup parent;
-
-	GtkWidget *popup_window;
-	GtkWidget *calendar;
-	GtkWidget *time_entry;
-	GtkWidget *time_list;
-
-	GtkWidget *now_button;
-	GtkWidget *today_button;
-	GtkWidget *none_button;
-
-	/* This is the range of hours we show in the time list. */
-	gint lower_hour;
-	gint upper_hour;
-
-	/* TRUE if we use 24-hour format for the time list and entry. */
-	gboolean use_24_hour_format;
-
-	/* This is TRUE if we need to rebuild the list of times. */
-	gboolean need_time_list_rebuild;
-
-	/* The freeze count for rebuilding the time list. We only rebuild when
-	   this is 0. */
-	gint freeze_count;
-
-	ECellDateEditGetTimeCallback time_callback;
-	gpointer time_callback_data;
-	GtkDestroyNotify time_callback_destroy;
-};
-
-struct _ECellDateEditClass {
-	ECellPopupClass parent_class;
-};
-
-
-GtkType    e_cell_date_edit_get_type		(void);
-ECell     *e_cell_date_edit_new			(void);
-
-
-/* These freeze and thaw the rebuilding of the time list. They are useful when
-   setting several properties which result in rebuilds of the list, e.g. the
-   lower_hour, upper_hour and use_24_hour_format properties. */
-void	   e_cell_date_edit_freeze		(ECellDateEdit	*ecde);
-void	   e_cell_date_edit_thaw		(ECellDateEdit	*ecde);
-
-
-/* Sets a callback to use to get the current time. This is useful if the
-   application needs to use its own timezone data rather than rely on the
-   Unix timezone. */
-void	   e_cell_date_edit_set_get_time_callback(ECellDateEdit	*ecde,
-						  ECellDateEditGetTimeCallback cb,
-						  gpointer	 data,
-						  GtkDestroyNotify destroy);
-
-
-#endif /* _E_CELL_DATE_EDIT_H_ */
diff --git a/widgets/misc/e-charset-picker.c b/widgets/misc/e-charset-picker.c
deleted file mode 100644
index 2ce6291e2c..0000000000
--- a/widgets/misc/e-charset-picker.c
+++ /dev/null
@@ -1,464 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/*
- * Copyright (C) 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-charset-picker.h"
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/unicode/gunicode.h>
-
-#include <iconv.h>
-
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtksignal.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <libgnomeui/gnome-stock.h>
-#include <bonobo/bonobo-ui-node.h>
-#include <bonobo/bonobo-ui-util.h>
-
-typedef enum {
-	E_CHARSET_UNKNOWN,
-	E_CHARSET_BALTIC,
-	E_CHARSET_CENTRAL_EUROPEAN,
-	E_CHARSET_CHINESE,
-	E_CHARSET_CYRILLIC,
-	E_CHARSET_GREEK,
-	E_CHARSET_JAPANESE,
-	E_CHARSET_KOREAN,
-	E_CHARSET_TURKISH,
-	E_CHARSET_UNICODE,
-	E_CHARSET_WESTERN_EUROPEAN
-} ECharsetClass;
-
-static const char *classnames[] = {
-	N_("Unknown"),
-	N_("Baltic"),
-	N_("Central European"),
-	N_("Chinese"),
-	N_("Cyrillic"),
-	N_("Greek"),
-	N_("Japanese"),
-	N_("Korean"),
-	N_("Turkish"),
-	N_("Unicode"),
-	N_("Western European"),
-};
-
-typedef struct {
-	char *name;
-	ECharsetClass class;
-	char *subclass;
-} ECharset;
-
-/* This list is based on what other mailers/browsers support. There's
- * not a lot of point in using, say, ISO-8859-3, if anything that can
- * read that can read UTF8 too.
- */
-static ECharset charsets[] = {
-	{ "ISO-8859-13", E_CHARSET_BALTIC, NULL },
-	{ "ISO-8859-4", E_CHARSET_BALTIC, NULL },
-	{ "ISO-8859-2", E_CHARSET_CENTRAL_EUROPEAN, NULL },
-	{ "Big5", E_CHARSET_CHINESE, N_("Traditional") },
-	{ "GB-2312", E_CHARSET_CHINESE, N_("Simplified") },
-	{ "HZ", E_CHARSET_CHINESE, N_("Simplified") },
-	{ "ISO-2022-CN", E_CHARSET_CHINESE, NULL },
-	{ "KOI8-R", E_CHARSET_CYRILLIC, NULL },
-	{ "Windows-1251", E_CHARSET_CYRILLIC, NULL },
-	{ "KOI8-U", E_CHARSET_CYRILLIC, N_("Ukrainian") },
-	{ "ISO-8859-5", E_CHARSET_CYRILLIC, NULL },
-	{ "ISO-8859-7", E_CHARSET_GREEK, NULL },
-	{ "ISO-2022-JP", E_CHARSET_JAPANESE, NULL },
-	{ "EUC-JP", E_CHARSET_JAPANESE, NULL },
-	{ "Shift_JIS", E_CHARSET_JAPANESE, NULL },
-	{ "EUC-KR", E_CHARSET_KOREAN, NULL },
-	{ "ISO-8859-9", E_CHARSET_TURKISH, NULL },
-	{ "UTF-8", E_CHARSET_UNICODE, NULL },
-	{ "UTF-7", E_CHARSET_UNICODE, NULL },
-	{ "ISO-8859-1", E_CHARSET_WESTERN_EUROPEAN, NULL },
-	{ "ISO-8859-15", E_CHARSET_WESTERN_EUROPEAN, N_("New") },
-};
-static const int num_charsets = sizeof (charsets) / sizeof (charsets[0]);
-
-static void
-select_item (GtkMenuShell *menu_shell, GtkWidget *item)
-{
-	gtk_menu_shell_select_item (menu_shell, item);
-	gtk_menu_shell_deactivate (menu_shell);
-}
-
-static void
-activate (GtkWidget *item, gpointer menu)
-{
-	gtk_object_set_data (GTK_OBJECT (menu), "activated_item", item);
-}
-
-static GtkWidget *
-add_charset (GtkWidget *menu, ECharset *charset, gboolean free_name)
-{
-	GtkWidget *item;
-	char *label;
-
-	if (charset->subclass) {
-		label = g_strdup_printf ("%s, %s (%s)",
-					 _(classnames[charset->class]),
-					 _(charset->subclass),
-					 charset->name);
-	} else {
-		label = g_strdup_printf ("%s (%s)",
-					 _(classnames[charset->class]),
-					 charset->name);
-	}
-
-	item = gtk_menu_item_new_with_label (label);
-	gtk_object_set_data_full (GTK_OBJECT (item), "charset",
-				  charset->name, free_name ? g_free : NULL);
-	g_free (label);
-
-	gtk_widget_show (item);
-	gtk_menu_append (GTK_MENU (menu), item);
-	gtk_signal_connect (GTK_OBJECT (item), "activate",
-			    GTK_SIGNAL_FUNC (activate), menu);
-
-	return item;
-}
-
-static gboolean
-add_other_charset (GtkWidget *menu, GtkWidget *other, char *new_charset) 
-{
-	ECharset charset = { NULL, E_CHARSET_UNKNOWN, NULL };
-	GtkWidget *item;
-	iconv_t ic;
-
-	ic = iconv_open ("UTF-8", new_charset);
-	if (ic == (iconv_t)-1) {
-		GtkWidget *window = gtk_widget_get_ancestor (other, GTK_TYPE_WINDOW);
-		e_notice (GTK_WINDOW (window), GNOME_MESSAGE_BOX_ERROR,
-			  _("Unknown character set: %s"), new_charset);
-		return FALSE;
-	}
-	iconv_close (ic);
-
-	/* Temporarily remove the "Other..." item */
-	gtk_object_ref (GTK_OBJECT (other));
-	gtk_container_remove (GTK_CONTAINER (menu), other);
-
-	/* Create new menu item */
-	charset.name = new_charset;
-	item = add_charset (menu, &charset, TRUE);
-
-	/* And re-add "Other..." */
-	gtk_menu_append (GTK_MENU (menu), other);
-	gtk_object_unref (GTK_OBJECT (other));
-
-	gtk_object_set_data_full (GTK_OBJECT (menu), "other_charset",
-				  g_strdup (new_charset), g_free);
-
-	gtk_object_set_data (GTK_OBJECT (menu), "activated_item", item);
-	select_item (GTK_MENU_SHELL (menu), item);
-	return TRUE;
-}
-
-static void
-other_charset_callback (char *new_charset, gpointer data)
-{
-	char **out = data;
-
-	*out = new_charset;
-}
-
-static void
-activate_other (GtkWidget *item, gpointer menu)
-{
-	GtkWidget *window, *dialog;
-	char *old_charset, *new_charset;
-
-	window = gtk_widget_get_ancestor (item, GTK_TYPE_WINDOW);
-	old_charset = gtk_object_get_data (GTK_OBJECT (menu), "other_charset");
-	dialog = gnome_request_dialog (FALSE,
-				       _("Enter the character set to use"),
-				       old_charset, 0, other_charset_callback,
-				       &new_charset, GTK_WINDOW (window));
-	gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-
-	if (new_charset) {
-		if (add_other_charset (menu, item, new_charset))
-			return;
-		g_free (new_charset);
-	}
-
-	/* Revert to previous selection */
-	select_item (GTK_MENU_SHELL (menu), gtk_object_get_data (GTK_OBJECT (menu), "activated_item"));
-}
-
-/**
- * e_charset_picker_new:
- * @default_charset: the default character set, or %NULL to use the
- * locale character set.
- *
- * This creates an option menu widget and fills it in with a selection
- * of available character sets. The @default_charset (or locale character
- * set if @default_charset is %NULL) will be listed first, and selected
- * by default (except that iso-8859-1 will always be used instead of
- * US-ASCII). Any other character sets of the same language class as
- * the default will be listed next, followed by the remaining character
- * sets, a separator, and an "Other..." menu item, which can be used to
- * select other charsets.
- *
- * Return value: an option menu widget, filled in and with signals
- * attached.
- */
-GtkWidget *
-e_charset_picker_new (const char *default_charset)
-{
-	GtkWidget *menu, *item;
-	int def, i;
-	char *locale_charset;
-
-	g_get_charset (&locale_charset);
-	if (!g_strcasecmp (locale_charset, "US-ASCII"))
-		locale_charset = "iso-8859-1";
-
-	if (!default_charset)
-		default_charset = locale_charset;
-	for (def = 0; def < num_charsets; def++) {
-		if (!g_strcasecmp (charsets[def].name, default_charset))
-			break;
-	}
-
-	menu = gtk_menu_new ();
-	for (i = 0; i < num_charsets; i++) {
-		item = add_charset (menu, &charsets[i], FALSE);
-		if (i == def) {
-			activate (item, menu);
-			select_item (GTK_MENU_SHELL (menu), item);
-		}
-	}
-
-	/* do the Unknown/Other section */
-	gtk_menu_append (GTK_MENU (menu), gtk_menu_item_new ());
-
-	if (def == num_charsets) {
-		ECharset other = { NULL, E_CHARSET_UNKNOWN, NULL };
-
-		/* Add an entry for @default_charset */
-		other.name = g_strdup (default_charset);
-		item = add_charset (menu, &other, TRUE);
-		activate (item, menu);
-		select_item (GTK_MENU_SHELL (menu), item);
-		gtk_object_set_data_full (GTK_OBJECT (menu), "other_charset",
-					  g_strdup (default_charset), g_free);
-		def++;
-	}
-
-	item = gtk_menu_item_new_with_label (_("Other..."));
-	gtk_signal_connect (GTK_OBJECT (item), "activate",
-			    GTK_SIGNAL_FUNC (activate_other), menu);
-	gtk_menu_append (GTK_MENU (menu), item);
-
-	gtk_widget_show_all (menu);
-	return menu;
-}
-
-/**
- * e_charset_picker_get_charset:
- * @menu: a character set menu from e_charset_picker_new()
- *
- * Return value: the currently-selected character set in @picker,
- * which must be freed with g_free().
- **/
-char *
-e_charset_picker_get_charset (GtkWidget *menu)
-{
-	GtkWidget *item;
-	char *charset;
-
-	g_return_val_if_fail (GTK_IS_MENU (menu), NULL);
-
-	item = gtk_menu_get_active (GTK_MENU (menu));
-	charset = gtk_object_get_data (GTK_OBJECT (item), "charset");
-
-	return g_strdup (charset);
-}
-
-/**
- * e_charset_picker_dialog:
- * @title: title for the dialog box
- * @prompt: prompt string for the dialog box
- * @default_charset: as for e_charset_picker_new()
- * @parent: a parent window for the dialog box, or %NULL
- *
- * This creates a new dialog box with the given @title and @prompt and
- * a character set picker menu. It then runs the dialog and returns
- * the selected character set, or %NULL if the user clicked "Cancel".
- *
- * Return value: the selected character set (which must be freed with
- * g_free()), or %NULL.
- **/
-char *
-e_charset_picker_dialog (const char *title, const char *prompt,
-			 const char *default_charset, GtkWindow *parent)
-{
-	GnomeDialog *dialog;
-	GtkWidget *label, *omenu, *picker;
-	int button;
-	char *charset;
-
-	dialog = GNOME_DIALOG (gnome_dialog_new (title, GNOME_STOCK_BUTTON_OK,
-						 GNOME_STOCK_BUTTON_CANCEL,
-						 NULL));
-	if (parent)
-		gnome_dialog_set_parent (dialog, parent);
-
-	label = gtk_label_new (prompt);
-	gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
-	picker = e_charset_picker_new (default_charset);
-	omenu = gtk_option_menu_new ();
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), picker);
-
-	gtk_container_set_border_width (GTK_CONTAINER (dialog->vbox), 4);
-	gtk_box_pack_start (GTK_BOX (dialog->vbox), label, FALSE, FALSE, 4);
-	gtk_box_pack_start (GTK_BOX (dialog->vbox), omenu, FALSE, FALSE, 4);
-
-	gtk_widget_show_all (GTK_WIDGET (dialog));
-	button = gnome_dialog_run (dialog);
-
-	if (button == 0)
-		charset = e_charset_picker_get_charset (picker);
-	else
-		charset = NULL;
-	gnome_dialog_close (dialog);
-
-	return charset;
-}
-
-/**
- * e_charset_picker_bonobo_ui_populate:
- * @uic: Bonobo UI Component
- * @default_charset: the default character set, or %NULL to use the
- * locale character set.
- * @cb: Callback function
- * @user_data: data to be passed to the callback.
- *
- * This creates a Bonobo UI menu and fills it in with a selection
- * of available character sets. The @default_charset (or locale character
- * set if @default_charset is %NULL) will be listed first, and selected
- * by default (except that iso-8859-1 will always be used instead of
- * US-ASCII). Any other character sets of the same language class as
- * the default will be listed next, followed by the remaining character
- * sets.
- **/
-void
-e_charset_picker_bonobo_ui_populate (BonoboUIComponent *uic, const char *default_charset,
-				     BonoboUIListenerFn cb, gpointer user_data)
-{
-	char *locale_charset, *encoded_label, *label;
-	GString *menuitems;
-	int def, i;
-	
-	g_get_charset (&locale_charset);
-	if (!g_strcasecmp (locale_charset, "US-ASCII"))
-		locale_charset = "iso-8859-1";
-	
-	if (!default_charset)
-		default_charset = locale_charset;
-	for (def = 0; def < num_charsets; def++) {
-		if (!g_strcasecmp (charsets[def].name, default_charset))
-			break;
-	}
-	
-	label = g_strdup (_("Character Encoding"));
-	encoded_label = bonobo_ui_util_encode_str (label);
-	menuitems = g_string_new ("");
-	g_string_sprintf (menuitems, "<submenu name=\"ECharsetPicker\" label=\"%s\">\n", encoded_label);
-	g_free (encoded_label);
-	g_free (label);
-	
-	for (i = 0; i < num_charsets; i++) {
-		char *command, *label, *encoded_label;
-		
-		if (charsets[i].subclass) {
-			label = g_strdup_printf ("%s, %s (%s)",
-						 _(classnames[charsets[i].class]),
-						 _(charsets[i].subclass),
-						 charsets[i].name);
-		} else {
-			label = g_strdup_printf ("%s (%s)",
-						 _(classnames[charsets[i].class]),
-						 charsets[i].name);
-		}
-		
-		encoded_label = bonobo_ui_util_encode_str (label);
-		g_free (label);
-		
-		command = g_strdup_printf ("<cmd name=\"Charset-%s\" label=\"%s\" type=\"radio\""
-					   " group=\"charset_picker\" state=\"%d\"/>\n",
-					   charsets[i].name, encoded_label, i == def);
-		
-		bonobo_ui_component_set (uic, "/commands", command, NULL);
-		g_free (command);
-		
-		g_string_sprintfa (menuitems, "  <menuitem name=\"Charset-%s\" verb=\"\"/>\n",
-				   charsets[i].name);
-		
-		g_free (encoded_label);
-		
-		label = g_strdup_printf ("Charset-%s", charsets[i].name);
-		bonobo_ui_component_add_listener (uic, label, cb, user_data);
-		g_free (label);
-	}
-	
-	if (def == num_charsets) {
-		char *command, *label, *encoded_label;
-		
-		label = g_strdup_printf ("%s (%s)", _("Unknown"), default_charset);
-		encoded_label = bonobo_ui_util_encode_str (label);
-		g_free (label);
-		
-		command = g_strdup_printf ("<cmd name=\"Charset-%s\" label=\"%s\" type=\"radio\""
-					   " group=\"charset_picker\" state=\"1\"/>\n",
-					   default_charset, encoded_label);
-		
-		bonobo_ui_component_set (uic, "/commands", command, NULL);
-		g_free (command);
-		
-		g_string_append (menuitems, "  <separator/>\n");
-		g_string_sprintfa (menuitems, "  <menuitem name=\"Charset-%s\" verb=\"\"/>\n",
-				   default_charset);
-		
-		g_free (encoded_label);
-		
-		label = g_strdup_printf ("Charset-%s", default_charset);
-		bonobo_ui_component_add_listener (uic, label, cb, user_data);
-		g_free (label);
-	}
-	
-	g_string_append (menuitems, "</submenu>\n");
-	
-	bonobo_ui_component_set (uic, "/menu/Edit", menuitems->str, NULL);
-	g_string_free (menuitems, TRUE);
-}
diff --git a/widgets/misc/e-charset-picker.h b/widgets/misc/e-charset-picker.h
deleted file mode 100644
index 352c09baee..0000000000
--- a/widgets/misc/e-charset-picker.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/*
- * Copyright (C) 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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.
- *
- */
-
-#ifndef _E_CHARSETPICKER_H_
-#define _E_CHARSETPICKER_H_
-
-#include <gtk/gtkwindow.h>
-#include <bonobo/bonobo-ui-component.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-GtkWidget *e_charset_picker_new (const char *default_charset);
-char      *e_charset_picker_get_charset (GtkWidget *picker);
-
-char      *e_charset_picker_dialog (const char *title, const char *prompt,
-				    const char *default_charset,
-				    GtkWindow *parent);
-
-/* bonobo equivalents */
-void       e_charset_picker_bonobo_ui_populate (BonoboUIComponent *uic, const char *default_charset,
-						BonoboUIListenerFn cb, gpointer user_data);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_CHARSETPICKER_H_ */
diff --git a/widgets/misc/e-clipped-label.c b/widgets/misc/e-clipped-label.c
deleted file mode 100644
index 4cd6658f50..0000000000
--- a/widgets/misc/e-clipped-label.c
+++ /dev/null
@@ -1,384 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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
- */
-
-/*
- * This is similar to GtkLabel but clips itself and displays '...' if it
- * can't fit inside its allocated area. The intended use is for inside buttons
- * that are a fixed size. The GtkLabel would normally display only the middle
- * part of the text, which doesn't look very good. This only supports one line
- * of text (so no wrapping/justification), without underlined characters.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-clipped-label.h"
-
-#include <math.h>
-#include <string.h>
-
-#include <glib.h>
-#include <gdk/gdki18n.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-
-
-static void e_clipped_label_class_init (EClippedLabelClass *class);
-static void e_clipped_label_init (EClippedLabel *label);
-static void e_clipped_label_size_request (GtkWidget      *widget,
-					  GtkRequisition *requisition);
-static void e_clipped_label_size_allocate (GtkWidget *widget,
-					   GtkAllocation *allocation);
-static gint e_clipped_label_expose (GtkWidget      *widget,
-				    GdkEventExpose *event);
-static void e_clipped_label_recalc_chars_displayed (EClippedLabel *label);
-static void e_clipped_label_destroy                (GtkObject *object);
-
-
-static GtkMiscClass *parent_class;
-
-/* This is the string to draw when the label is clipped, e.g. '...'. */
-static gchar *e_clipped_label_ellipsis;
-
-/* Flags used in chars_displayed field. Must be negative. */
-#define E_CLIPPED_LABEL_NEED_RECALC		-1
-#define E_CLIPPED_LABEL_SHOW_ENTIRE_LABEL	-2
-
-
-GtkType
-e_clipped_label_get_type (void)
-{
-	static GtkType e_clipped_label_type = 0;
-
-	if (!e_clipped_label_type){
-		GtkTypeInfo e_clipped_label_info = {
-			"EClippedLabel",
-			sizeof (EClippedLabel),
-			sizeof (EClippedLabelClass),
-			(GtkClassInitFunc) e_clipped_label_class_init,
-			(GtkObjectInitFunc) e_clipped_label_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		parent_class = gtk_type_class (GTK_TYPE_MISC);
-		e_clipped_label_type = gtk_type_unique (GTK_TYPE_MISC,
-							&e_clipped_label_info);
-	}
-
-	return e_clipped_label_type;
-}
-
-
-static void
-e_clipped_label_class_init (EClippedLabelClass *class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-
-	object_class = (GtkObjectClass *) class;
-	widget_class = (GtkWidgetClass *) class;
-
-	/* Method override */
-	widget_class->size_request	= e_clipped_label_size_request;
- 	widget_class->size_allocate	= e_clipped_label_size_allocate;
-	widget_class->expose_event	= e_clipped_label_expose;
-
-	object_class->destroy           = e_clipped_label_destroy;
-
-	e_clipped_label_ellipsis = _("...");
-}
-
-
-static void
-e_clipped_label_init (EClippedLabel *label)
-{
-	GTK_WIDGET_SET_FLAGS (label, GTK_NO_WINDOW);
-
-	label->label = NULL;
-	label->label_wc = NULL;
-	label->chars_displayed = E_CLIPPED_LABEL_NEED_RECALC;
-}
-
-
-/**
- * e_clipped_label_new:
- *
- * @text: The label text.
- * @Returns: A new #EClippedLabel.
- *
- * Creates a new #EClippedLabel with the given text.
- **/
-GtkWidget *
-e_clipped_label_new (const gchar *text)
-{
-	GtkWidget *label;
-
-	label = GTK_WIDGET (gtk_type_new (e_clipped_label_get_type ()));
-
-	if (text && *text)
-		e_clipped_label_set_text (E_CLIPPED_LABEL (label), text);
-
-	return label;
-}
-
-
-static void
-e_clipped_label_size_request (GtkWidget      *widget,
-			      GtkRequisition *requisition)
-{
-	EClippedLabel *label;
-	GdkFont *font;
-  
-	g_return_if_fail (E_IS_CLIPPED_LABEL (widget));
-	g_return_if_fail (requisition != NULL);
-  
-	label = E_CLIPPED_LABEL (widget);
-	font = widget->style->font;
-
-	requisition->width = 0;
-	requisition->height = font->ascent + font->descent
-		+ 2 * GTK_MISC (widget)->ypad;
-}
-
-
-static void
-e_clipped_label_size_allocate (GtkWidget *widget,
-			       GtkAllocation *allocation)
-{
-	EClippedLabel *label;
-
-	label = E_CLIPPED_LABEL (widget);
-
-	widget->allocation = *allocation;
-
-	/* Flag that we need to recalculate how many characters to display. */
-	label->chars_displayed = E_CLIPPED_LABEL_NEED_RECALC;
-}
-
-
-static gint
-e_clipped_label_expose (GtkWidget      *widget,
-			GdkEventExpose *event)
-{
-	EClippedLabel *label;
-	GtkMisc *misc;
-	gint x, y;
-	GdkFont *font;
-	gchar *tmp_str, tmp_ch;
-
-	g_return_val_if_fail (E_IS_CLIPPED_LABEL (widget), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-  
-	label = E_CLIPPED_LABEL (widget);
-	misc = GTK_MISC (widget);
-	font = widget->style->font;
-
-	/* If the label isn't visible or has no text, just return. */
-	if (!GTK_WIDGET_VISIBLE (widget) || !GTK_WIDGET_MAPPED (widget)
-	    || !label->label || (*label->label == '\0'))
-		return TRUE;
-
-	/* Recalculate the number of characters displayed, if necessary. */
-	if (label->chars_displayed == E_CLIPPED_LABEL_NEED_RECALC)
-		e_clipped_label_recalc_chars_displayed (label);
-
-	/*
-	 * GC Clipping
-	 */
-	gdk_gc_set_clip_rectangle (widget->style->white_gc,
-				   &event->area);
-	gdk_gc_set_clip_rectangle (widget->style->fg_gc[widget->state],
-				   &event->area);
-      
-	y = floor (widget->allocation.y + (gint)misc->ypad 
-		   + (((gint)widget->allocation.height - 2 * (gint)misc->ypad
-		       - (gint)font->ascent - font->descent)
-		      * misc->yalign) + 0.5) + font->ascent;
-
-	if (label->chars_displayed == E_CLIPPED_LABEL_SHOW_ENTIRE_LABEL) {
-		x = floor (widget->allocation.x + (gint)misc->xpad
-			   + (((gint)widget->allocation.width - 
-			       (gint)label->label_width - 2 * (gint)misc->xpad)
-			      * misc->xalign) + 0.5);
-
-		gtk_paint_string (widget->style, widget->window, widget->state,
-				  &event->area, widget, "label", 
-				  x, y, label->label);
-	} else {
-		x = widget->allocation.x + (gint)misc->xpad;
-
-		tmp_ch = label->label_wc[label->chars_displayed];
-		label->label_wc[label->chars_displayed] = '\0';
-		tmp_str = gdk_wcstombs (label->label_wc);
-		if (tmp_str) {
-			gtk_paint_string (widget->style, widget->window,
-					  widget->state, &event->area,
-					  widget, "label", 
-					  x, y, tmp_str);
-			g_free (tmp_str);
-		}
-		label->label_wc[label->chars_displayed] = tmp_ch;
-
-		x = widget->allocation.x + (gint)misc->xpad
-			+ label->ellipsis_x;
-		gtk_paint_string (widget->style, widget->window, widget->state,
-				  &event->area, widget, "label", 
-				  x, y, e_clipped_label_ellipsis);
-	}
-
-	gdk_gc_set_clip_mask (widget->style->white_gc, NULL);
-	gdk_gc_set_clip_mask (widget->style->fg_gc[widget->state], NULL);
-
-	return TRUE;
-}
-
-
-static void
-e_clipped_label_destroy (GtkObject *object)
-{
-	EClippedLabel *label;
-
-	g_return_if_fail (E_IS_CLIPPED_LABEL (object));
-
-	label = E_CLIPPED_LABEL(object);
-
-	g_free (label->label);
-	g_free (label->label_wc);
-}
-
-
-/**
- * e_clipped_label_get_text:
- *
- * @label: An #EClippedLabel.
- * @Return: The label text.
- *
- * Returns the label text, or NULL.
- **/
-gchar*
-e_clipped_label_get_text (EClippedLabel	*label)
-{
-	g_return_val_if_fail (E_IS_CLIPPED_LABEL (label), NULL);
-
-	return label->label;
-}
-
-
-/**
- * e_clipped_label_set_text:
- *
- * @label: An #EClippedLabel.
- * @text: The new label text.
- *
- * Sets the label text.
- **/
-void
-e_clipped_label_set_text (EClippedLabel *label,
-			  const gchar *text)
-{
-	gint len;
-
-	g_return_if_fail (E_IS_CLIPPED_LABEL (label));
-
-	if (label->label != text || !label->label || !text
-	    || strcmp (label->label, text)) {
-		g_free (label->label);
-		g_free (label->label_wc);
-		label->label = NULL;
-		label->label_wc = NULL;
-
-		if (text) {
-			label->label = g_strdup (text);
-			len = strlen (text);
-			label->label_wc = g_new (GdkWChar, len + 1);
-			label->wc_len = gdk_mbstowcs (label->label_wc,
-						      label->label, len + 1);
-			label->label_wc[label->wc_len] = '\0';
-		}
-
-		/* Reset the number of characters displayed, so it is
-		   recalculated when needed. */
-		label->chars_displayed = E_CLIPPED_LABEL_NEED_RECALC;
-
-		/* We don't queue a resize, since the label should not affect
-		   the widget size, but we queue a draw. */
-		gtk_widget_queue_draw (GTK_WIDGET (label));
-	}
-}
-
-
-static void
-e_clipped_label_recalc_chars_displayed (EClippedLabel *label)
-{
-	GdkFont *font;
-	gint max_width, width, ch, last_width;
-
-	font = GTK_WIDGET (label)->style->font;
-
-	max_width = GTK_WIDGET (label)->allocation.width
-		- 2 * GTK_MISC (label)->xpad;
-
-	if (!label->label) {
-		label->chars_displayed = 0;
-		return;
-	}
-
-	/* See if the entire label fits in the allocated width. */
-	label->label_width = gdk_string_width (font, label->label);
-	if (label->label_width <= max_width) {
-		label->chars_displayed = E_CLIPPED_LABEL_SHOW_ENTIRE_LABEL;
-		return;
-	}
-
-	/* Calculate the width of the ellipsis string. */
-	max_width -= gdk_string_measure (font, e_clipped_label_ellipsis);
-
-	if (max_width <= 0) {
-		label->chars_displayed = 0;
-		label->ellipsis_x = 0;
-		return;
-	}
-
-	/* Step through the wide-char label, adding on the widths of the
-	   characters, until we can't fit any more in. */
-	width = last_width = 0;
-	for (ch = 0; ch < label->wc_len; ch++) {
-		width += gdk_char_width_wc (font, label->label_wc[ch]);
-
-		if (width > max_width) {
-			label->chars_displayed = ch;
-			label->ellipsis_x = last_width;
-			return;
-		}
-
-		last_width = width;
-	}
-
-	g_warning ("Clipped label width not exceeded as expected");
-	label->chars_displayed = E_CLIPPED_LABEL_SHOW_ENTIRE_LABEL;
-}
-
diff --git a/widgets/misc/e-clipped-label.h b/widgets/misc/e-clipped-label.h
deleted file mode 100644
index 0910eae4fe..0000000000
--- a/widgets/misc/e-clipped-label.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 1999, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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
- */
-
-/*
- * This is similar to GtkLabel but clips itself and displays '...' if it
- * can't fit inside its allocated area. The intended use is for inside buttons
- * that are a fixed size. The GtkLabel would normally display only the middle
- * part of the text, which doesn't look very good. This only supports one line
- * of text (so no wrapping/justification), without underlined characters.
- */
-#ifndef _E_CLIPPED_LABEL_H_
-#define _E_CLIPPED_LABEL_H_
-
-#include <gtk/gtkmisc.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_CLIPPED_LABEL(obj)          GTK_CHECK_CAST (obj, e_clipped_label_get_type (), EClippedLabel)
-#define E_CLIPPED_LABEL_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, e_clipped_label_get_type (), EClippedLabelClass)
-#define E_IS_CLIPPED_LABEL(obj)       GTK_CHECK_TYPE (obj, e_clipped_label_get_type ())
-
-
-typedef struct _EClippedLabel       EClippedLabel;
-typedef struct _EClippedLabelClass  EClippedLabelClass;
-
-struct _EClippedLabel
-{
-	GtkMisc misc;
-
-	gchar *label;
-	GdkWChar *label_wc;
-
-	/* This is the number of wide characters in the label. */
-	gint wc_len;
-
-	/* This is the width of the entire label string, in pixels. */
-	gint label_width;
-
-	/* This is the number of characters we can fit in, or
-	   E_CLIPPED_LABEL_NEED_RECALC if it needs to be recalculated, or
-	   E_CLIPPED_LABEL_SHOW_ENTIRE_LABEL to show the entire label. */
-	gint chars_displayed;
-
-	/* This is the x position to display the ellipsis string, e.g. '...',
-	   relative to the start of the label. */
-	gint ellipsis_x;
-};
-
-struct _EClippedLabelClass
-{
-	GtkMiscClass parent_class;
-};
-
-
-GtkType	   e_clipped_label_get_type	(void);
-GtkWidget* e_clipped_label_new		(const gchar	*text);
-
-gchar*	   e_clipped_label_get_text	(EClippedLabel	*label);
-void	   e_clipped_label_set_text	(EClippedLabel	*label,
-					 const gchar	*text);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_CLIPPED_LABEL_H_ */
diff --git a/widgets/misc/e-colors.c b/widgets/misc/e-colors.c
deleted file mode 100644
index 2325d659e4..0000000000
--- a/widgets/misc/e-colors.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * e_color.c: General color allocation utilities
- *
- * Author:
- *  Miguel de Icaza (miguel@kernel.org)
- *
- * We keep our own color context, as the color allocation might take place
- * before things are realized.
- */
-#include <config.h>
-#include <gtk/gtkwidget.h>
-#include "e-colors.h"
-
-static gboolean e_color_inited;
-static GdkColorContext *e_color_context;
-
-GdkColor e_white, e_dark_gray, e_black;
-
-int 
-e_color_alloc (gushort red, gushort green, gushort blue)
-{
-	int failed;
-	
-	if (!e_color_inited)
-		e_color_init ();
-	
-	return gdk_color_context_get_pixel (e_color_context,
-					    red, green, blue, &failed);
-}
-
-void
-e_color_alloc_gdk (GdkColor *c)
-{
-	int failed;
-	
-	g_return_if_fail (c != NULL);
-	
-	if (!e_color_inited)
-		e_color_init ();
-	
-	c->pixel = gdk_color_context_get_pixel (e_color_context, c->red, c->green, c->blue, &failed);
-}
-
-void
-e_color_alloc_name (const char *name, GdkColor *c)
-{
-	int failed;
-	
-	g_return_if_fail (name != NULL);
-	g_return_if_fail (c != NULL);
-
-	if (!e_color_inited)
-		e_color_init ();
-	
-	gdk_color_parse (name, c);
-	c->pixel = 0;
-	c->pixel = gdk_color_context_get_pixel (e_color_context, c->red, c->green, c->blue, &failed);
-}
-
-void
-e_color_init (void)
-{
-	GdkColormap *colormap;
-
-	/* It's surprisingly easy to end up calling this twice.  Survive.  */
-	if (e_color_inited)
-		return;
-
-	colormap = gtk_widget_get_default_colormap ();
-
-	/* Initialize the color context */
-	e_color_context = gdk_color_context_new (
-		gtk_widget_get_default_visual (), colormap);
-
-	e_color_inited = TRUE;
-
-	/* Allocate the default colors */
-	gdk_color_white (colormap, &e_white);
-	gdk_color_black (colormap, &e_black);
-	e_color_alloc_name ("gray20",  &e_dark_gray);
-}
diff --git a/widgets/misc/e-colors.h b/widgets/misc/e-colors.h
deleted file mode 100644
index 6cfceb664c..0000000000
--- a/widgets/misc/e-colors.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef GNOME_APP_LIBS_COLOR_H
-#define GNOME_APP_LIBS_COLOR_H
-
-#include <glib.h>
-#include <gdk/gdk.h>
-#include <libgnome/gnome-defs.h>
-
-BEGIN_GNOME_DECLS
-
-void     e_color_init       (void);
-
-/* Return the pixel value for the given red, green and blue */
-int      e_color_alloc      (gushort red, gushort green, gushort blue);
-void     e_color_alloc_name (const char *name, GdkColor *color);
-void     e_color_alloc_gdk  (GdkColor *color);
-
-extern GdkColor e_white, e_dark_gray, e_black;
-
-END_GNOME_DECLS
-
-#endif /* GNOME_APP_LIBS_COLOR_H */
diff --git a/widgets/misc/e-cursors.c b/widgets/misc/e-cursors.c
deleted file mode 100644
index 1b5a8a226e..0000000000
--- a/widgets/misc/e-cursors.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * cursors.c: cursor handling for Gnumeric
- *
- * Authors:
- *   Miguel de Icaza (miguel@gnu.org)
- */
-#include <config.h>
-
-#include "e-cursors.h"
-
-#include "e-colors.h"
-#include "pixmaps/cursor_cross.xpm"
-#include "pixmaps/cursor_zoom_in.xpm"
-#include "pixmaps/cursor_zoom_out.xpm"
-#include "pixmaps/cursor_hand_open.xpm"
-#include "pixmaps/cursor_hand_closed.xpm"
-#include <stdio.h>
-
-#define GDK_INTERNAL_CURSOR -1
-
-typedef struct {
-	GdkCursor *cursor;
-	int       hot_x, hot_y;
-	char      **xpm;
-} CursorDef;
-
-static CursorDef cursors [] = {
-	{ NULL, 17, 17, cursor_cross_xpm },
-	{ NULL, GDK_INTERNAL_CURSOR,   GDK_CROSSHAIR,         NULL },
-	{ NULL, GDK_INTERNAL_CURSOR,   GDK_ARROW,             NULL },
-	{ NULL, GDK_INTERNAL_CURSOR,   GDK_FLEUR,             NULL },
-	{ NULL, 24, 24, cursor_zoom_in_xpm },
-	{ NULL, 24, 24, cursor_zoom_out_xpm },
-	{ NULL, GDK_INTERNAL_CURSOR,   GDK_SB_H_DOUBLE_ARROW, NULL },
-	{ NULL, GDK_INTERNAL_CURSOR,   GDK_SB_V_DOUBLE_ARROW, NULL },
-	{ NULL, GDK_INTERNAL_CURSOR,   GDK_SIZING,            NULL },
-	{ NULL, GDK_INTERNAL_CURSOR,   GDK_SIZING,            NULL },
-	{ NULL, GDK_INTERNAL_CURSOR,   GDK_HAND2,             NULL },
-	{ NULL, 10, 10, cursor_hand_open_xpm },
-	{ NULL, 10, 10, cursor_hand_closed_xpm },
-	{ NULL, 0,    0,  NULL }
-};
-
-
-static void
-create_bitmap_and_mask_from_xpm (GdkBitmap **bitmap, GdkBitmap **mask, gchar **xpm)
-{
-	int height, width, colors;
-	char pixmap_buffer [(32 * 32)/8];
-	char mask_buffer [(32 * 32)/8];
-	int x, y, pix, yofs;
-	int transparent_color, black_color;
-
-	sscanf (xpm [0], "%d %d %d %d", &height, &width, &colors, &pix);
-
-	g_assert (height == 32);
-	g_assert (width  == 32);
-	g_assert (colors <= 3);
-
-	transparent_color = ' ';
-	black_color = '.';
-
-	yofs = colors + 1;
-	for (y = 0; y < 32; y++){
-		for (x = 0; x < 32;){
-			char value = 0, maskv = 0;
-
-			for (pix = 0; pix < 8; pix++, x++){
-				if (xpm [y + yofs][x] != transparent_color){
-					maskv |= 1 << pix;
-
-					/*
-					 * Invert the colours here because it seems
-					 * to workaround a bug the Matrox G100 Xserver?
-					 * We reverse the foreground & background in the next
-					 * routine to compensate.
-					 */
-					if (xpm [y + yofs][x] == black_color){
-						value |= 1 << pix;
-					}
-				}
-			}
-			pixmap_buffer [(y * 4 + x/8)-1] = value;
-			mask_buffer [(y * 4 + x/8)-1] = maskv;
-		}
-	}
-	*bitmap = gdk_bitmap_create_from_data (NULL, pixmap_buffer, 32, 32);
-	*mask   = gdk_bitmap_create_from_data (NULL, mask_buffer, 32, 32);
-}
-
-void
-e_cursors_init (void)
-{
-	int i;
-
-	for (i = 0; cursors [i].hot_x; i++){
-		GdkBitmap *bitmap, *mask;
-
-		if (cursors [i].hot_x < 0)
-			cursors [i].cursor = gdk_cursor_new (cursors [i].hot_y);
-		else {
-			create_bitmap_and_mask_from_xpm (&bitmap, &mask, cursors [i].xpm);
-
-			/* The foreground and background colours are reversed.
-			 * See comment above for explanation.
-			 */
-			cursors [i].cursor =
-				gdk_cursor_new_from_pixmap (
-					bitmap, mask,
-					&e_black, &e_white,
-					cursors [i].hot_x,
-					cursors [i].hot_y);
-		}
-	}
-
-	g_assert (i == E_CURSOR_NUM_CURSORS);
-}
-
-void
-e_cursors_shutdown (void)
-{
-	int i;
-
-	for (i = 0; cursors [i].hot_x; i++)
-		gdk_cursor_destroy (cursors [i].cursor);
-}
-
-
-/* Returns a cursor given its type */
-GdkCursor *
-e_cursor_get (ECursorType type)
-{
-	g_return_val_if_fail (type >= 0 && type < E_CURSOR_NUM_CURSORS, NULL);
-
-	return cursors [type].cursor;
-}
diff --git a/widgets/misc/e-cursors.h b/widgets/misc/e-cursors.h
deleted file mode 100644
index 4f04ff08cc..0000000000
--- a/widgets/misc/e-cursors.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef GNOME_APP_LIB_CURSORS_H
-#define GNOME_APP_LIB_CURSORS_H
-
-#include <gdk/gdk.h>
-#include <libgnome/gnome-defs.h>
-
-BEGIN_GNOME_DECLS
-
-typedef enum {
-	E_CURSOR_FAT_CROSS,
-	E_CURSOR_THIN_CROSS,
-	E_CURSOR_ARROW,
-	E_CURSOR_MOVE,
-	E_CURSOR_ZOOM_IN,
-	E_CURSOR_ZOOM_OUT,
-	E_CURSOR_SIZE_X,
-	E_CURSOR_SIZE_Y,
-	E_CURSOR_SIZE_TL,
-	E_CURSOR_SIZE_TR,
-	E_CURSOR_PRESS,
-	E_CURSOR_HAND_OPEN,
-	E_CURSOR_HAND_CLOSED,
-	E_CURSOR_NUM_CURSORS
-} ECursorType;
-
-void    e_cursors_init      (void);
-void    e_cursors_shutdown  (void);
-
-#define e_cursor_set(win, c)					   \
-G_STMT_START {							   \
-     if (win) 							   \
-         gdk_window_set_cursor (win, e_cursor_get (c)); \
-} G_STMT_END
-
-#define e_cursor_set_widget(w, c)							     \
-G_STMT_START {									     \
-     if (GTK_WIDGET (w)->window)						     \
-	gdk_window_set_cursor (GTK_WIDGET (w)->window, e_cursor_get (c)); \
-} G_STMT_END
-
-GdkCursor *e_cursor_get (ECursorType type);
-
-END_GNOME_DECLS
-
-#endif /* GNOME_APP_LIB_CURSORS_H */
diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c
deleted file mode 100644
index 88b6173da9..0000000000
--- a/widgets/misc/e-dateedit.c
+++ /dev/null
@@ -1,1774 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2000, Ximian, Inc.
- *
- * Based on the GnomeDateEdit, part of the Gnome Library.
- * Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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
- */
-
-/*
- * EDateEdit - a widget based on GnomeDateEdit to provide a date & optional
- * time field with popups for entering a date.
- */
-
-#include <config.h>
-
-#include "e-dateedit.h"
-
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkbbox.h>
-#include <gtk/gtkcombo.h>
-#include <gtk/gtkdrawingarea.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtklist.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkvbox.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include "e-util/e-time-utils.h"
-#include "e-calendar.h"
-
-
-
-struct _EDateEditPrivate {
-	GtkWidget *date_entry;
-	GtkWidget *date_button;
-	
-	GtkWidget *space;
-
-	GtkWidget *time_combo;
-
-	GtkWidget *cal_popup;
-	GtkWidget *calendar;
-	GtkWidget *now_button;
-	GtkWidget *today_button;
-	GtkWidget *none_button;		/* This will only be visible if a
-					   'None' date/time is permitted. */
-
-	gboolean show_date;
-	gboolean show_time;
-	gboolean use_24_hour_format;
-
-	/* This is the range of hours we show in the time popup. */
-	gint lower_hour;
-	gint upper_hour;
-
-	/* This indicates whether the last date committed was invalid.
-	   (A date is committed by hitting Return, moving the keyboard focus,
-	   or selecting a date in the popup). Note that this only indicates
-	   that the date couldn't be parsed. A date set to 'None' is valid
-	   here, though e_date_edit_date_is_valid() will return FALSE if an
-	   empty date isn't actually permitted. */
-	gboolean date_is_valid;
-
-	/* This is the last valid date which was set. If the date was set to
-	   'None' or empty, date_set_to_none will be TRUE and the other fields
-	   are undefined, so don't use them. */
-	gboolean date_set_to_none;
-	gint year;
-	gint month;
-	gint day;
-
-	/* This indicates whether the last time committed was invalid.
-	   (A time is committed by hitting Return, moving the keyboard focus,
-	   or selecting a time in the popup). Note that this only indicates
-	   that the time couldn't be parsed. An empty/None time is valid
-	   here, though e_date_edit_time_is_valid() will return FALSE if an
-	   empty time isn't actually permitted. */
-	gboolean time_is_valid;
-
-	/* This is the last valid time which was set. If the time was set to
-	   'None' or empty, time_set_to_none will be TRUE and the other fields
-	   are undefined, so don't use them. */
-	gboolean time_set_to_none;
-	gint hour;
-	gint minute;
-
-	EDateEditGetTimeCallback time_callback;
-	gpointer time_callback_data;
-	GtkDestroyNotify time_callback_destroy;
-};
-
-enum {
-	CHANGED,
-	LAST_SIGNAL
-};
-
-
-static gint date_edit_signals [LAST_SIGNAL] = { 0 };
-
-
-static void e_date_edit_class_init		(EDateEditClass	*class);
-static void e_date_edit_init			(EDateEdit	*dedit);
-static void create_children			(EDateEdit	*dedit);
-static void e_date_edit_destroy			(GtkObject	*object);
-static void e_date_edit_forall			(GtkContainer   *container,
-						 gboolean	 include_internals,
-						 GtkCallback     callback,
-						 gpointer	 callback_data);
-
-static gint on_date_entry_key_press		(GtkWidget	*widget,
-						 GdkEventKey	*event,
-						 EDateEdit	*dedit);
-static void on_date_button_clicked		(GtkWidget	*widget,
-						 EDateEdit	*dedit);
-static void e_date_edit_show_date_popup		(EDateEdit	*dedit);
-static void position_date_popup			(EDateEdit	*dedit);
-static void on_date_popup_none_button_clicked	(GtkWidget	*button,
-						 EDateEdit	*dedit);
-static void on_date_popup_today_button_clicked	(GtkWidget	*button,
-						 EDateEdit	*dedit);
-static void on_date_popup_now_button_clicked	(GtkWidget	*button,
-						 EDateEdit	*dedit);
-static gint on_date_popup_delete_event		(GtkWidget	*widget,
-						 EDateEdit	*dedit);
-static gint on_date_popup_key_press		(GtkWidget	*widget,
-						 GdkEventKey	*event,
-						 EDateEdit	*dedit);
-static gint on_date_popup_button_press		(GtkWidget	*widget,
-						 GdkEventButton *event,
-						 gpointer	 data);
-static void on_date_popup_date_selected		(ECalendarItem	*calitem,
-						 EDateEdit	*dedit);
-static void hide_date_popup			(EDateEdit	*dedit);
-static void rebuild_time_popup			(EDateEdit	*dedit);
-static gboolean field_set_to_none		(char		*text);
-static gboolean e_date_edit_parse_date		(EDateEdit	*dedit,
-						 char		*date_text,
-						 struct tm	*date_tm);
-static gboolean e_date_edit_parse_time		(EDateEdit	*dedit,
-						 gchar		*time_text,
-						 struct tm	*time_tm);
-static void on_date_edit_time_selected		(GtkList	*list,
-						 EDateEdit	*dedit);
-static gint on_time_entry_key_press		(GtkWidget	*widget,
-						 GdkEventKey	*event,
-						 EDateEdit	*dedit);
-static gint on_date_entry_focus_out		(GtkEntry	*entry,
-						 GdkEventFocus  *event,
-						 EDateEdit	*dedit);
-static gint on_time_entry_focus_out		(GtkEntry	*entry,
-						 GdkEventFocus  *event,
-						 EDateEdit	*dedit);
-static void e_date_edit_update_date_entry	(EDateEdit	*dedit);
-static void e_date_edit_update_time_entry	(EDateEdit	*dedit);
-static void e_date_edit_update_time_combo_state	(EDateEdit	*dedit);
-static void e_date_edit_check_date_changed	(EDateEdit	*dedit);
-static void e_date_edit_check_time_changed	(EDateEdit	*dedit);
-static gboolean e_date_edit_set_date_internal	(EDateEdit	*dedit,
-						 gboolean	 valid,
-						 gboolean	 none,
-						 gint		 year,
-						 gint		 month,
-						 gint		 day);
-static gboolean e_date_edit_set_time_internal	(EDateEdit	*dedit,
-						 gboolean	 valid,
-						 gboolean	 none,
-						 gint		 hour,
-						 gint		 minute);
-
-
-static GtkHBoxClass *parent_class;
-
-/**
- * e_date_edit_get_type:
- *
- * Returns the GtkType for the EDateEdit widget
- */
-guint
-e_date_edit_get_type		(void)
-{
-	static guint date_edit_type = 0;
-
-	if (!date_edit_type){
-		GtkTypeInfo date_edit_info = {
-			"EDateEdit",
-			sizeof (EDateEdit),
-			sizeof (EDateEditClass),
-			(GtkClassInitFunc) e_date_edit_class_init,
-			(GtkObjectInitFunc) e_date_edit_init,
-			NULL,
-			NULL,
-		};
-
-		date_edit_type = gtk_type_unique (gtk_hbox_get_type (), &date_edit_info);
-	}
-	
-	return date_edit_type;
-}
-
-
-static void
-e_date_edit_class_init		(EDateEditClass	*class)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) class;
-	GtkContainerClass *container_class = (GtkContainerClass *) class;
-
-	object_class = (GtkObjectClass*) class;
-
-	parent_class = gtk_type_class (gtk_hbox_get_type ());
-
-	date_edit_signals [CHANGED] =
-		gtk_signal_new ("changed",
-				GTK_RUN_FIRST, object_class->type,
-				GTK_SIGNAL_OFFSET (EDateEditClass,
-						   changed),
-				gtk_signal_default_marshaller,
-				GTK_TYPE_NONE, 0);
-	
-	gtk_object_class_add_signals (object_class, date_edit_signals,
-				      LAST_SIGNAL);
-
-	object_class->destroy		= e_date_edit_destroy;
-
-	container_class->forall		= e_date_edit_forall;
-
-	class->changed = NULL;
-}
-
-
-static void
-e_date_edit_init		(EDateEdit	*dedit)
-{
-	EDateEditPrivate *priv;
-
-	dedit->priv = priv = g_new0 (EDateEditPrivate, 1);
-
-	priv->show_date = TRUE;
-	priv->show_time = TRUE;
-	priv->use_24_hour_format = TRUE;
-
-	priv->lower_hour = 0;
-	priv->upper_hour = 24;
-
-	priv->date_is_valid = TRUE;
-	priv->date_set_to_none = TRUE;
-	priv->time_is_valid = TRUE;
-	priv->time_set_to_none = TRUE;
-	priv->time_callback = NULL;
-	priv->time_callback_data = NULL;
-	priv->time_callback_destroy = NULL;
-
-	create_children (dedit);
-
-	/* Set it to the current time. */
-	e_date_edit_set_time (dedit, 0);
-}
-
-
-/**
- * e_date_edit_new:
- *
- * Description: Creates a new #EDateEdit widget which can be used
- * to provide an easy to use way for entering dates and times.
- * 
- * Returns: a new #EDateEdit widget.
- */
-GtkWidget *
-e_date_edit_new			(void)
-{
-	EDateEdit *dedit;
-
-	dedit = gtk_type_new (e_date_edit_get_type ());
-
-	return GTK_WIDGET (dedit);
-}
-
-
-static void
-create_children			(EDateEdit	*dedit)
-{
-	EDateEditPrivate *priv;
-	ECalendar *calendar;
-	GtkWidget *frame, *arrow;
-	GtkWidget *vbox, *bbox;
-
-	priv = dedit->priv;
-
-	priv->date_entry  = gtk_entry_new ();
-	gtk_widget_set_usize (priv->date_entry, 90, 0);
-	gtk_box_pack_start (GTK_BOX (dedit), priv->date_entry, FALSE, TRUE, 0);
-	
-	gtk_signal_connect (GTK_OBJECT (priv->date_entry), "key_press_event",
-			    (GtkSignalFunc) on_date_entry_key_press,
-			    dedit);
-	gtk_signal_connect_after (GTK_OBJECT (priv->date_entry),
-				  "focus_out_event",
-				  (GtkSignalFunc) on_date_entry_focus_out,
-				  dedit);
-
-	priv->date_button = gtk_button_new ();
-	gtk_signal_connect (GTK_OBJECT (priv->date_button), "clicked",
-			    GTK_SIGNAL_FUNC (on_date_button_clicked), dedit);
-	gtk_box_pack_start (GTK_BOX (dedit), priv->date_button,
-			    FALSE, FALSE, 0);
-
-	arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_OUT);
-	gtk_container_add (GTK_CONTAINER (priv->date_button), arrow);
-	gtk_widget_show (arrow);
-
-	if (priv->show_date) {
-		gtk_widget_show (priv->date_entry);
-		gtk_widget_show (priv->date_button);
-	}
-
-	/* This is just to create a space between the date & time parts. */
-	priv->space = gtk_drawing_area_new ();
-	gtk_box_pack_start (GTK_BOX (dedit), priv->space, FALSE, FALSE, 2);
-
-
-	priv->time_combo = gtk_combo_new ();
-	gtk_widget_set_usize (GTK_COMBO (priv->time_combo)->entry, 90, 0);
-	gtk_box_pack_start (GTK_BOX (dedit), priv->time_combo, FALSE, TRUE, 0);
-	rebuild_time_popup (dedit);
-
-	gtk_signal_connect (GTK_OBJECT (GTK_COMBO (priv->time_combo)->entry),
-			    "key_press_event",
-			    (GtkSignalFunc) on_time_entry_key_press,
-			    dedit);
-	gtk_signal_connect_after (GTK_OBJECT (GTK_COMBO (priv->time_combo)->entry),
-				  "focus_out_event",
-				  (GtkSignalFunc) on_time_entry_focus_out,
-				  dedit);
-	gtk_signal_connect_after (GTK_OBJECT (GTK_COMBO (priv->time_combo)->list),
-				  "selection_changed",
-				  (GtkSignalFunc) on_date_edit_time_selected,
-				  dedit);
-
-	if (priv->show_time)
-		gtk_widget_show (priv->time_combo);
-
-	if (priv->show_date && priv->show_time)
-		gtk_widget_show (priv->space);
-
-	priv->cal_popup = gtk_window_new (GTK_WINDOW_POPUP);
-	gtk_widget_set_events (priv->cal_popup,
-			       gtk_widget_get_events (priv->cal_popup)
-			       | GDK_KEY_PRESS_MASK);
-	gtk_signal_connect (GTK_OBJECT (priv->cal_popup), "delete_event",
-			    (GtkSignalFunc) on_date_popup_delete_event,
-			    dedit);
-	gtk_signal_connect (GTK_OBJECT (priv->cal_popup), "key_press_event",
-			    (GtkSignalFunc) on_date_popup_key_press,
-			    dedit);
-	gtk_signal_connect (GTK_OBJECT (priv->cal_popup), "button_press_event",
-			    (GtkSignalFunc) on_date_popup_button_press,
-			    dedit);
-	gtk_window_set_policy (GTK_WINDOW (priv->cal_popup),
-			       FALSE, FALSE, TRUE);
-
-	frame = gtk_frame_new (NULL);
-	gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
-	gtk_container_add (GTK_CONTAINER (priv->cal_popup), frame);
-	gtk_widget_show (frame);
-
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (frame), vbox);
-        gtk_widget_show (vbox);
-
-	priv->calendar = e_calendar_new ();
-	calendar = E_CALENDAR (priv->calendar);
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (calendar->calitem),
-			       "maximum_days_selected", 1,
-			       "move_selection_when_moving", FALSE,
-			       NULL);
-
-	gtk_signal_connect (GTK_OBJECT (calendar->calitem),
-			    "selection_changed",
-			    GTK_SIGNAL_FUNC (on_date_popup_date_selected), dedit);
-
-	gtk_box_pack_start (GTK_BOX (vbox), priv->calendar, FALSE, FALSE, 0);
-        gtk_widget_show (priv->calendar);
-
-	bbox = gtk_hbutton_box_new ();
-	gtk_container_set_border_width (GTK_CONTAINER (bbox), 4);
-	gtk_button_box_set_spacing (GTK_BUTTON_BOX (bbox), 2);
-	gtk_button_box_set_child_ipadding (GTK_BUTTON_BOX (bbox), 2, 0);
-	gtk_button_box_set_child_size (GTK_BUTTON_BOX (bbox), 0, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
-        gtk_widget_show (bbox);
-
-	priv->now_button = gtk_button_new_with_label (_("Now"));
-	gtk_container_add (GTK_CONTAINER (bbox), priv->now_button);
-        gtk_widget_show (priv->now_button);
-	gtk_signal_connect (GTK_OBJECT (priv->now_button), "clicked",
-			    GTK_SIGNAL_FUNC (on_date_popup_now_button_clicked), dedit);
-
-	priv->today_button = gtk_button_new_with_label (_("Today"));
-	gtk_container_add (GTK_CONTAINER (bbox), priv->today_button);
-        gtk_widget_show (priv->today_button);
-	gtk_signal_connect (GTK_OBJECT (priv->today_button), "clicked",
-			    GTK_SIGNAL_FUNC (on_date_popup_today_button_clicked), dedit);
-
-	/* Note that we don't show this here, since by default a 'None' date
-	   is not permitted. */
-	priv->none_button = gtk_button_new_with_label (_("None"));
-	gtk_container_add (GTK_CONTAINER (bbox), priv->none_button);
-	gtk_signal_connect (GTK_OBJECT (priv->none_button), "clicked",
-			    GTK_SIGNAL_FUNC (on_date_popup_none_button_clicked), dedit);
-}
-
-
-static void
-e_date_edit_destroy		(GtkObject	*object)
-{
-	EDateEdit *dedit;
-
-	g_return_if_fail (E_IS_DATE_EDIT (object));
-
-	dedit = E_DATE_EDIT (object);
-
-	e_date_edit_set_get_time_callback (dedit, NULL, NULL, NULL);
-
-	gtk_widget_destroy (dedit->priv->cal_popup);
-	dedit->priv->cal_popup = NULL;
-
-	g_free (dedit->priv);
-	dedit->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-static void
-e_date_edit_forall		(GtkContainer	*container,
-				 gboolean	 include_internals,
-				 GtkCallback	 callback,
-				 gpointer	 callback_data)
-{
-	g_return_if_fail (E_IS_DATE_EDIT (container));
-	g_return_if_fail (callback != NULL);
-
-	/* Let GtkBox handle the internal widgets if needed. */
-	if (include_internals) {
-		if (GTK_CONTAINER_CLASS (parent_class)->forall)
-			(* GTK_CONTAINER_CLASS (parent_class)->forall)
-				(container, include_internals,
-				 callback, callback_data);
-	}
-}
-
-
-/**
- * e_date_edit_get_time:
- * @dedit: an #EDateEdit widget.
- * @the_time: returns the last valid time entered.
- * @Returns: the last valid time entered, or -1 if the time is not set.
- *
- * Returns the last valid time entered. If empty times are valid, by calling
- * e_date_edit_set_allow_no_date_set(), then it may return -1.
- *
- * Note that the last time entered may actually have been invalid. You can
- * check this with e_date_edit_time_is_valid().
- */
-time_t
-e_date_edit_get_time		(EDateEdit	*dedit)
-{
-	EDateEditPrivate *priv;
-	struct tm tmp_tm = { 0 };
-
-	g_return_val_if_fail (E_IS_DATE_EDIT (dedit), -1);
-	
-	priv = dedit->priv;
-
-	/* Try to parse any new value now. */
-	e_date_edit_check_date_changed (dedit);
-	e_date_edit_check_time_changed (dedit);
-
-	if (priv->date_set_to_none)
-		return -1;
-
-	tmp_tm.tm_year = priv->year;
-	tmp_tm.tm_mon = priv->month;
-	tmp_tm.tm_mday = priv->day;
-
-	if (!priv->show_time || priv->time_set_to_none) {
-		tmp_tm.tm_hour = 0;
-		tmp_tm.tm_min = 0;
-	} else {
-		tmp_tm.tm_hour = priv->hour;
-		tmp_tm.tm_min = priv->minute;
-	}
-	tmp_tm.tm_sec = 0;
-	tmp_tm.tm_isdst = -1;
-
-	return mktime (&tmp_tm);
-}
-
-
-/**
- * e_date_edit_set_time:
- * @dedit: the EDateEdit widget
- * @the_time: The time and date that should be set on the widget
- *
- * Description:  Changes the displayed date and time in the EDateEdit
- * widget to be the one represented by @the_time.  If @the_time is 0
- * then current time is used. If it is -1, then the date is set to None.
- *
- * Note that the time is converted to local time using the Unix timezone,
- * so if you are using your own timezones then you should use
- * e_date_edit_set_date() and e_date_edit_set_time_of_day() instead.
- */
-void
-e_date_edit_set_time		(EDateEdit	*dedit,
-				 time_t		 the_time)
-{
-	EDateEditPrivate *priv;
-	struct tm tmp_tm;
-	gboolean date_changed = FALSE, time_changed = FALSE;
-
-	g_return_if_fail (E_IS_DATE_EDIT (dedit));
-
-	priv = dedit->priv;
-
-	if (the_time == -1) {
-		date_changed = e_date_edit_set_date_internal (dedit, TRUE,
-							      TRUE, 0, 0, 0);
-		time_changed = e_date_edit_set_time_internal (dedit, TRUE,
-							      TRUE, 0, 0);
-	} else {
-		if (the_time == 0) {
-			if (priv->time_callback) {
-				tmp_tm = (*priv->time_callback) (dedit, priv->time_callback_data);
-			} else {
-				the_time = time (NULL);
-				tmp_tm = *localtime (&the_time);
-			}
-		} else {
-			tmp_tm = *localtime (&the_time);
-		}
-
-		date_changed = e_date_edit_set_date_internal (dedit, TRUE,
-							      FALSE,
-							      tmp_tm.tm_year,
-							      tmp_tm.tm_mon,
-							      tmp_tm.tm_mday);
-		time_changed = e_date_edit_set_time_internal (dedit, TRUE,
-							      FALSE,
-							      tmp_tm.tm_hour,
-							      tmp_tm.tm_min);
-	}
-
-	e_date_edit_update_date_entry (dedit);
-	e_date_edit_update_time_entry (dedit);
-	e_date_edit_update_time_combo_state (dedit);
-
-	/* Emit the signals if the date and/or time has actually changed. */
-	if (date_changed || time_changed)
-		gtk_signal_emit (GTK_OBJECT (dedit),
-				 date_edit_signals [CHANGED]);
-}
-
-
-/**
- * e_date_edit_get_date:
- * @dedit: an #EDateEdit widget.
- * @year: returns the year set.
- * @month: returns the month set (1 - 12).
- * @day: returns the day set (1 - 31).
- * @Returns: TRUE if a time was set, or FALSE if the field is empty or 'None'.
- *
- * Returns the last valid date entered into the date field.
- */
-gboolean
-e_date_edit_get_date		(EDateEdit	*dedit,
-				 gint		*year,
-				 gint		*month,
-				 gint		*day)
-{
-	EDateEditPrivate *priv;
-
-	g_return_val_if_fail (E_IS_DATE_EDIT (dedit), FALSE);
-
-	priv = dedit->priv;
-
-	/* Try to parse any new value now. */
-	e_date_edit_check_date_changed (dedit);
-
-	if (priv->date_set_to_none)
-		return FALSE;
-
-	*year = priv->year + 1900;
-	*month = priv->month + 1;
-	*day = priv->day;
-
-	return TRUE;
-}
-
-
-/**
- * e_date_edit_set_date:
- * @dedit: an #EDateEdit widget.
- * @year: the year to set.
- * @month: the month to set (1 - 12).
- * @day: the day to set (1 - 31).
- *
- * Sets the date in the date field.
- */
-void
-e_date_edit_set_date		(EDateEdit	*dedit,
-				 gint		 year,
-				 gint		 month,
-				 gint		 day)
-{
-	EDateEditPrivate *priv;
-	gboolean date_changed = FALSE;
-
-	g_return_if_fail (E_IS_DATE_EDIT (dedit));
-
-	priv = dedit->priv;
-
-	date_changed = e_date_edit_set_date_internal (dedit, TRUE, FALSE,
-						      year - 1900, month - 1,
-						      day);
-
-	e_date_edit_update_date_entry (dedit);
-	e_date_edit_update_time_combo_state (dedit);
-
-	/* Emit the signals if the date has actually changed. */
-	if (date_changed)
-		gtk_signal_emit (GTK_OBJECT (dedit),
-				 date_edit_signals [CHANGED]);
-}
-
-
-/**
- * e_date_edit_get_time_of_day:
- * @dedit: an #EDateEdit widget.
- * @hour: returns the hour set, or 0 if the time isn't set.
- * @minute: returns the minute set, or 0 if the time isn't set.
- * @Returns: TRUE if a time was set, or FALSE if the field is empty or 'None'.
- *
- * Returns the last valid time entered into the time field.
- */
-gboolean
-e_date_edit_get_time_of_day		(EDateEdit	*dedit,
-					 gint		*hour,
-					 gint		*minute)
-{
-	EDateEditPrivate *priv;
-
-	g_return_val_if_fail (E_IS_DATE_EDIT (dedit), FALSE);
-
-	priv = dedit->priv;
-
-	/* Try to parse any new value now. */
-	e_date_edit_check_time_changed (dedit);
-
-	if (priv->time_set_to_none) {
-		*hour = 0;
-		*minute = 0;
-		return FALSE;
-	} else {
-		*hour = priv->hour;
-		*minute = priv->minute;
-		return TRUE;
-	}
-}
-
-
-/**
- * e_date_edit_set_time_of_day:
- * @dedit: an #EDateEdit widget.
- * @hour: the hour to set.
- * @minute: the minute to set.
- *
- * Description: Sets the time in the time field.
- */
-void
-e_date_edit_set_time_of_day		(EDateEdit	*dedit,
-					 gint		 hour,
-					 gint		 minute)
-{
-	EDateEditPrivate *priv;
-	gboolean time_changed = FALSE;
-
-	g_return_if_fail (E_IS_DATE_EDIT (dedit));
-
-	priv = dedit->priv;
-
-	if (priv->time_set_to_none
-	    || priv->hour != hour
-	    || priv->minute != minute) {
-		priv->time_set_to_none = FALSE;
-		priv->hour = hour;
-		priv->minute = minute;
-		time_changed = TRUE;
-	}
-
-	e_date_edit_update_time_entry (dedit);
-
-	if (time_changed)
-		gtk_signal_emit (GTK_OBJECT (dedit),
-				 date_edit_signals [CHANGED]);
-}
-
-
-/**
- * e_date_edit_get_show_date:
- * @dedit: an #EDateEdit widget.
- * @Returns: Whether the date field is shown.
- *
- * Description: Returns TRUE if the date field is currently shown.
- */
-gboolean
-e_date_edit_get_show_date		(EDateEdit	*dedit)
-{
-	g_return_val_if_fail (E_IS_DATE_EDIT (dedit), TRUE);
-
-	return dedit->priv->show_date;
-}
-
-
-/**
- * e_date_edit_set_show_date:
- * @dedit: an #EDateEdit widget.
- * @show_time: TRUE if the date field should be shown.
- *
- * Description: Specifies whether the date field should be shown. The date
- * field would be hidden if only a time needed to be entered.
- */
-void
-e_date_edit_set_show_date		(EDateEdit	*dedit,
-					 gboolean	 show_date)
-{
-	EDateEditPrivate *priv;
-
-	g_return_if_fail (E_IS_DATE_EDIT (dedit));
-
-	priv = dedit->priv;
-
-	if (priv->show_date == show_date)
-		return;
-
-	priv->show_date = show_date;
-
-	if (show_date) {
-		gtk_widget_show (priv->date_entry);
-		gtk_widget_show (priv->date_button);
-	} else {
-		gtk_widget_hide (priv->date_entry);
-		gtk_widget_hide (priv->date_button);
-	}
-
-	e_date_edit_update_time_combo_state (dedit);
-
-	if (priv->show_date && priv->show_time)
-		gtk_widget_show (priv->space);
-	else
-		gtk_widget_hide (priv->space);
-}
-
-
-/**
- * e_date_edit_get_show_time:
- * @dedit: an #EDateEdit widget
- * @Returns: Whether the time field is shown.
- *
- * Description: Returns TRUE if the time field is currently shown.
- */
-gboolean
-e_date_edit_get_show_time		(EDateEdit	*dedit)
-{
-	g_return_val_if_fail (E_IS_DATE_EDIT (dedit), TRUE);
-
-	return dedit->priv->show_time;
-}
-
-
-/**
- * e_date_edit_set_show_time:
- * @dedit: an #EDateEdit widget
- * @show_time: TRUE if the time field should be shown.
- *
- * Description: Specifies whether the time field should be shown. The time
- * field would be hidden if only a date needed to be entered.
- */
-void
-e_date_edit_set_show_time		(EDateEdit	*dedit,
-					 gboolean	 show_time)
-{
-	EDateEditPrivate *priv;
-
-	g_return_if_fail (E_IS_DATE_EDIT (dedit));
-
-	priv = dedit->priv;
-
-	if (priv->show_time == show_time)
-		return;
-
-	priv->show_time = show_time;
-
-	if (show_time) {
-		gtk_widget_show (priv->time_combo);
-	} else {
-		gtk_widget_hide (priv->time_combo);
-		gtk_widget_hide (priv->now_button);
-	}
-
-	if (priv->show_date && priv->show_time)
-		gtk_widget_show (priv->space);
-	else
-		gtk_widget_hide (priv->space);
-}
-
-
-/**
- * e_date_edit_get_week_start_day:
- * @dedit: an #EDateEdit widget
- * @Returns: the week start day, from 0 (Sunday) to 6 (Saturday).
- *
- * Description: Returns the week start day currently used in the calendar
- * popup.
- */
-gint
-e_date_edit_get_week_start_day		(EDateEdit	*dedit)
-{
-	gint week_start_day;
-
-	g_return_val_if_fail (E_IS_DATE_EDIT (dedit), 1);
-
-	gtk_object_get (GTK_OBJECT (E_CALENDAR (dedit->priv->calendar)->calitem),
-			"week_start_day", &week_start_day,
-			NULL);
-
-	return week_start_day;
-}
-
-
-/**
- * e_date_edit_set_week_start_day:
- * @dedit: an #EDateEdit widget
- * @week_start_day: the week start day, from 0 (Sunday) to 6 (Saturday).
- *
- * Description: Sets the week start day to use in the calendar popup.
- */
-void
-e_date_edit_set_week_start_day		(EDateEdit	*dedit,
-					 gint		 week_start_day)
-{
-	g_return_if_fail (E_IS_DATE_EDIT (dedit));
-
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (E_CALENDAR (dedit->priv->calendar)->calitem),
-			"week_start_day", week_start_day,
-			NULL);
-}
-
-
-/* Whether we show week numbers in the date popup. */
-gboolean
-e_date_edit_get_show_week_numbers	(EDateEdit	*dedit)
-{
-	gboolean show_week_numbers;
-
-	g_return_val_if_fail (E_IS_DATE_EDIT (dedit), FALSE);
-
-	gtk_object_get (GTK_OBJECT (E_CALENDAR (dedit->priv->calendar)->calitem),
-			"show_week_numbers", &show_week_numbers,
-			NULL);
-
-	return show_week_numbers;
-}
-
-
-void
-e_date_edit_set_show_week_numbers	(EDateEdit	*dedit,
-					 gboolean	 show_week_numbers)
-{
-	g_return_if_fail (E_IS_DATE_EDIT (dedit));
-
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (E_CALENDAR (dedit->priv->calendar)->calitem),
-			"show_week_numbers", show_week_numbers,
-			NULL);
-}
-
-
-/* Whether we use 24 hour format in the time field & popup. */
-gboolean
-e_date_edit_get_use_24_hour_format	(EDateEdit	*dedit)
-{
-	g_return_val_if_fail (E_IS_DATE_EDIT (dedit), TRUE);
-
-	return dedit->priv->use_24_hour_format;
-}
-
-
-void
-e_date_edit_set_use_24_hour_format	(EDateEdit	*dedit,
-					 gboolean	 use_24_hour_format)
-{
-	g_return_if_fail (E_IS_DATE_EDIT (dedit));
-
-	if (dedit->priv->use_24_hour_format == use_24_hour_format)
-		return;
-
-	dedit->priv->use_24_hour_format = use_24_hour_format;
-
-	rebuild_time_popup (dedit);
-
-	e_date_edit_update_time_entry (dedit);
-}
-
-
-/* Whether we allow the date to be set to 'None'. e_date_edit_get_time() will
-   return (time_t) -1 in this case. */
-gboolean
-e_date_edit_get_allow_no_date_set	(EDateEdit	*dedit)
-{
-	g_return_val_if_fail (E_IS_DATE_EDIT (dedit), FALSE);
-
-	return GTK_WIDGET_VISIBLE (dedit->priv->none_button);
-}
-
-
-void
-e_date_edit_set_allow_no_date_set	(EDateEdit	*dedit,
-					 gboolean	 allow_no_date_set)
-{
-	g_return_if_fail (E_IS_DATE_EDIT (dedit));
-
-	if (allow_no_date_set) {
-		gtk_widget_show (dedit->priv->none_button);
-	} else {
-		gtk_widget_hide (dedit->priv->none_button);
-
-		/* If the date is showing, we make sure it isn't 'None' (we
-		   don't really mind if the time is empty), else if just the
-		   time is showing we make sure it isn't 'None'. */
-		if (dedit->priv->show_date) {
-			if (dedit->priv->date_set_to_none)
-				e_date_edit_set_time (dedit, 0);
-		} else {
-			if (dedit->priv->time_set_to_none)
-				e_date_edit_set_time (dedit, 0);
-		}
-	}
-}
-
-
-/* The range of time to show in the time combo popup. */
-void
-e_date_edit_get_time_popup_range	(EDateEdit	*dedit,
-					 gint		*lower_hour,
-					 gint		*upper_hour)
-{
-	g_return_if_fail (E_IS_DATE_EDIT (dedit));
-
-	*lower_hour = dedit->priv->lower_hour;
-	*upper_hour = dedit->priv->upper_hour;
-}
-
-
-void
-e_date_edit_set_time_popup_range	(EDateEdit	*dedit,
-					 gint		 lower_hour,
-					 gint		 upper_hour)
-{
-	EDateEditPrivate *priv;
-
-	g_return_if_fail (E_IS_DATE_EDIT (dedit));
-
-	priv = dedit->priv;
-
-	if (priv->lower_hour == lower_hour
-	    && priv->upper_hour == upper_hour)
-		return;
-
-	priv->lower_hour = lower_hour;
-	priv->upper_hour = upper_hour;
-
-	rebuild_time_popup (dedit);
-
-	/* Setting the combo list items seems to mess up the time entry, so
-	   we set it again. We have to reset it to its last valid time. */
-	priv->time_is_valid = TRUE;
-	e_date_edit_update_time_entry (dedit);
-}
-
-
-/* The arrow button beside the date field has been clicked, so we show the
-   popup with the ECalendar in. */
-static void
-on_date_button_clicked		(GtkWidget	*widget,
-				 EDateEdit	*dedit)
-{
-	e_date_edit_show_date_popup (dedit);
-}
-
-
-static void
-e_date_edit_show_date_popup	(EDateEdit	*dedit)
-{
-	EDateEditPrivate *priv;
-	ECalendar *calendar;
-	struct tm mtm;
-	gchar *date_text;
-	GDate selected_day;
-	gboolean clear_selection = FALSE;
-
-	priv = dedit->priv;
-	calendar = E_CALENDAR (priv->calendar);
-
-	date_text = gtk_entry_get_text (GTK_ENTRY (priv->date_entry));
-	if (field_set_to_none (date_text)
-	    || !e_date_edit_parse_date (dedit, date_text, &mtm))
-		clear_selection = TRUE;
-
-	if (clear_selection) {
-		e_calendar_item_set_selection (calendar->calitem, NULL, NULL);
-	} else {
-		g_date_clear (&selected_day, 1);
-		g_date_set_dmy (&selected_day, mtm.tm_mday, mtm.tm_mon + 1,
-				mtm.tm_year + 1900);
-		e_calendar_item_set_selection (calendar->calitem,
-					       &selected_day, NULL);
-	}
-
-	/* FIXME: Hack. Change ECalendarItem so it doesn't queue signal
-	   emissions. */
-	calendar->calitem->selection_changed = FALSE;
-
-        position_date_popup (dedit);
-	gtk_widget_show (priv->cal_popup);
-	gtk_widget_grab_focus (priv->cal_popup);
-	gtk_grab_add (priv->cal_popup);
-	gdk_pointer_grab (priv->cal_popup->window, TRUE,
-			  (GDK_BUTTON_PRESS_MASK
-			   | GDK_BUTTON_RELEASE_MASK
-			   | GDK_POINTER_MOTION_MASK),
-			  NULL, NULL, GDK_CURRENT_TIME);
-}
-
-
-/* This positions the date popup below and to the left of the arrow button,
-   just before it is shown. */
-static void
-position_date_popup		(EDateEdit	*dedit)
-{
-	gint x, y;
-	gint bwidth, bheight;
-	GtkRequisition req;
-	gint screen_width, screen_height;
-
-	gtk_widget_size_request (dedit->priv->cal_popup, &req);
-
-	gdk_window_get_origin (dedit->priv->date_button->window, &x, &y);
-	gdk_window_get_size (dedit->priv->date_button->window,
-			     &bwidth, &bheight);
-
-      	screen_width = gdk_screen_width ();
-	screen_height = gdk_screen_height ();
-
-	x += bwidth - req.width;
-	y += bheight;
-
-	x = CLAMP (x, 0, MAX (0, screen_width - req.width));
-	y = CLAMP (y, 0, MAX (0, screen_height - req.height));
-
-	gtk_widget_set_uposition (dedit->priv->cal_popup, x, y);
-}
-
-
-/* A date has been selected in the date popup, so we set the date field
-   and hide the popup. */
-static void
-on_date_popup_date_selected	(ECalendarItem	*calitem,
-				 EDateEdit	*dedit)
-{
-	EDateEditPrivate *priv;
-	GDate start_date, end_date;
-
-	priv = dedit->priv;
-
-	hide_date_popup (dedit);
-
-	if (!e_calendar_item_get_selection (calitem, &start_date, &end_date))
-		return;
-
-	e_date_edit_set_date (dedit, g_date_year (&start_date),
-			      g_date_month (&start_date),
-			      g_date_day (&start_date));
-}
-
-
-static void
-on_date_popup_now_button_clicked	(GtkWidget	*button,
-					 EDateEdit	*dedit)
-{
-	hide_date_popup (dedit);
-	e_date_edit_set_time (dedit, 0);
-}
-
-
-static void
-on_date_popup_today_button_clicked	(GtkWidget	*button,
-					 EDateEdit	*dedit)
-{
-	EDateEditPrivate *priv;
-	struct tm tmp_tm;
-	time_t t;
-
-	priv = dedit->priv;
-
-	hide_date_popup (dedit);
-
-	if (priv->time_callback) {
-		tmp_tm = (*priv->time_callback) (dedit, priv->time_callback_data);
-	} else {
-		t = time (NULL);
-		tmp_tm = *localtime (&t);
-	}
-
-	e_date_edit_set_date (dedit, tmp_tm.tm_year + 1900,
-			      tmp_tm.tm_mon + 1, tmp_tm.tm_mday);
-}
-
-
-static void
-on_date_popup_none_button_clicked	(GtkWidget	*button,
-					 EDateEdit	*dedit)
-{
-	hide_date_popup (dedit);
-	e_date_edit_set_time (dedit, -1);
-}
-
-
-/* A key has been pressed while the date popup is showing. If it is the Escape
-   key we hide the popup. */
-static gint
-on_date_popup_key_press			(GtkWidget	*widget,
-					 GdkEventKey	*event,
-					 EDateEdit	*dedit)
-{
-	if (event->keyval != GDK_Escape)
-		return FALSE;
-
-	gtk_signal_emit_stop_by_name (GTK_OBJECT (widget), "key_press_event");
-	hide_date_popup (dedit);
-
-	return TRUE;
-}
-
-
-/* A mouse button has been pressed while the date popup is showing.
-   Any button press events used to select days etc. in the popup will have
-   have been handled elsewhere, so here we just hide the popup.
-   (This function is yanked from gtkcombo.c) */
-static gint
-on_date_popup_button_press	(GtkWidget	*widget,
-				 GdkEventButton *event,
-				 gpointer	 data)
-{
-	EDateEdit *dedit;
-	GtkWidget *child;
-
-	dedit = data;
-
-	child = gtk_get_event_widget ((GdkEvent *) event);
-
-	/* We don't ask for button press events on the grab widget, so
-	 *  if an event is reported directly to the grab widget, it must
-	 *  be on a window outside the application (and thus we remove
-	 *  the popup window). Otherwise, we check if the widget is a child
-	 *  of the grab widget, and only remove the popup window if it
-	 *  is not.
-	 */
-	if (child != widget) {
-		while (child) {
-			if (child == widget)
-				return FALSE;
-			child = child->parent;
-		}
-	}
-
-	hide_date_popup (dedit);
-
-	return TRUE;
-}
-
-
-/* A delete event has been received for the date popup, so we hide it and
-   return TRUE so it doesn't get destroyed. */
-static gint
-on_date_popup_delete_event	(GtkWidget	*widget,
-				 EDateEdit	*dedit)
-{
-	hide_date_popup (dedit);
-	return TRUE;
-}
-
-
-/* Hides the date popup, removing any grabs. */
-static void
-hide_date_popup			(EDateEdit	*dedit)
-{
-	gtk_widget_hide (dedit->priv->cal_popup);
-	gtk_grab_remove (dedit->priv->cal_popup);
-	gdk_pointer_ungrab (GDK_CURRENT_TIME);
-}
-
-
-/* Clears the time popup and rebuilds it using the lower_hour, upper_hour
-   and use_24_hour_format settings. */
-static void
-rebuild_time_popup			(EDateEdit	*dedit)
-{
-	EDateEditPrivate *priv;
-	GtkList *list;
-	GtkWidget *listitem;
-	char buffer[40], *format;
-	struct tm tmp_tm;
-	gint hour, min;
-
-	priv = dedit->priv;
-
-	list = GTK_LIST (GTK_COMBO (priv->time_combo)->list);
-
-	gtk_list_clear_items (list, 0, -1);
-
-	/* Fill the struct tm with some sane values. */
-	tmp_tm.tm_year = 2000;
-	tmp_tm.tm_mon = 0;
-	tmp_tm.tm_mday = 1;
-	tmp_tm.tm_sec  = 0;
-	tmp_tm.tm_isdst = 0;
-
-	for (hour = priv->lower_hour; hour <= priv->upper_hour; hour++) {
-
-		/* We don't want to display midnight at the end, since that is
-		   really in the next day. */
-		if (hour == 24)
-			break;
-
-		/* We want to finish on upper_hour, with min == 0. */
-		for (min = 0;
-		     min == 0 || (min < 60 && hour != priv->upper_hour);
-		     min += 30) {
-			tmp_tm.tm_hour = hour;
-			tmp_tm.tm_min  = min;
-
-			if (priv->use_24_hour_format)
-				/* This is a strftime() format. %H = hour (0-23), %M = minute. */
-				format = _("%H:%M");
-			else
-				/* This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string. */
-				format = _("%I:%M %p");
-
-			strftime (buffer, sizeof (buffer), format, &tmp_tm);
-
-			listitem = gtk_list_item_new_with_label (buffer);
-			gtk_widget_show (listitem);
-			gtk_container_add (GTK_CONTAINER (list), listitem);
-		}
-	}
-}
-
-
-static gboolean
-e_date_edit_parse_date (EDateEdit *dedit,
-			gchar	  *date_text,
-			struct tm *date_tm)
-{
-	struct tm *tmp_tm;
-	time_t t;
-
-	if (e_time_parse_date (date_text, date_tm) != E_TIME_PARSE_OK)
-		return FALSE;
-
-	/* If the user entered a 2-digit year we use the current century. */
-	if (date_tm->tm_year < 0) {
-		t = time (NULL);
-		tmp_tm = localtime (&t);
-
-		/* This should convert it into a value from 0 to 99. */
-		date_tm->tm_year += 1900;
-
-		/* Now add on the century. */
-		date_tm->tm_year += tmp_tm->tm_year - (tmp_tm->tm_year % 100);
-	}
-
-	return TRUE;
-}
-
-
-static gboolean
-e_date_edit_parse_time	(EDateEdit	*dedit,
-			 gchar		*time_text,
-			 struct tm	*time_tm)
-{
-	if (field_set_to_none (time_text)) {
-		time_tm->tm_hour = 0;
-		time_tm->tm_min = 0;
-		return TRUE;
-	}
-
-	if (e_time_parse_time (time_text, time_tm) != E_TIME_PARSE_OK)
-		return FALSE;
-
-	return TRUE;
-}
-
-
-/* Returns TRUE if the string is empty or is "None" in the current locale.
-   It ignores whitespace. */
-static gboolean
-field_set_to_none		(char		*text)
-{
-	char *pos, *none_string;
-
-	pos = text;
-	while (isspace (*pos))
-		pos++;
-
-	none_string = _("None");
-
-	if (*pos == '\0' || !strncmp (pos, none_string, strlen (none_string)))
-		return TRUE;
-	return FALSE;
-}
-
-
-static void
-on_date_edit_time_selected	(GtkList	*list,
-				 EDateEdit	*dedit)
-{
-	GtkWidget *toplevel;
-
-	/* We only want to emit signals when an item is selected explicitly,
-	   not when it is selected by the silly combo update thing. */
-	if (!list->selection)
-		return;
-
-	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (list));
-	if (!GTK_WIDGET_MAPPED (toplevel))
-		return;
-
-	e_date_edit_check_time_changed (dedit);
-}
-
-
-static gint
-on_date_entry_key_press			(GtkWidget	*widget,
-					 GdkEventKey	*event,
-					 EDateEdit	*dedit)
-{
-	if (event->state & GDK_MOD1_MASK
-	    && (event->keyval == GDK_Up || event->keyval == GDK_Down
-		|| event->keyval == GDK_Return)) {
-		gtk_signal_emit_stop_by_name (GTK_OBJECT (widget),
-					      "key_press_event");
-		e_date_edit_show_date_popup (dedit);
-		return TRUE;
-	}
-
-	/* If the user hits the return key emit a "date_changed" signal if
-	   needed. But let the signal carry on. */
-	if (event->keyval == GDK_Return) {
-		e_date_edit_check_date_changed (dedit);
-		return FALSE;
-	}
-
-	return FALSE;
-}
-
-
-static gint
-on_time_entry_key_press			(GtkWidget	*widget,
-					 GdkEventKey	*event,
-					 EDateEdit	*dedit)
-{
-	/* I'd like to use Alt+Up/Down for popping up the list, like Win32,
-	   but the combo steals any Up/Down keys, so we use Alt+Return. */
-#if 0	   
-	if (event->state & GDK_MOD1_MASK
-	    && (event->keyval == GDK_Up || event->keyval == GDK_Down)) {
-#else
-	if (event->state & GDK_MOD1_MASK && event->keyval == GDK_Return) {
-#endif
-		gtk_signal_emit_stop_by_name (GTK_OBJECT (widget),
-					      "key_press_event");
-		gtk_signal_emit_by_name (GTK_OBJECT (GTK_COMBO (dedit->priv->time_combo)->entry), "activate");
-		return TRUE;
-	}
-
-	/* Stop the return key from emitting the activate signal, and check
-	   if we need to emit a "time_changed" signal. */
-	if (event->keyval == GDK_Return) {
-		gtk_signal_emit_stop_by_name (GTK_OBJECT (widget),
-					      "key_press_event");
-		e_date_edit_check_time_changed (dedit);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-
-static gint
-on_date_entry_focus_out			(GtkEntry	*entry,
-					 GdkEventFocus  *event,
-					 EDateEdit	*dedit)
-{
-	e_date_edit_check_date_changed (dedit);
-	return FALSE;
-}
-
-
-static gint
-on_time_entry_focus_out			(GtkEntry	*entry,
-					 GdkEventFocus  *event,
-					 EDateEdit	*dedit)
-{
-	e_date_edit_check_time_changed (dedit);
-	return FALSE;
-}
-
-
-/* This sets the text in the date entry according to the current settings. */
-static void
-e_date_edit_update_date_entry		(EDateEdit	*dedit)
-{
-	EDateEditPrivate *priv;
-	char buffer[40];
-	struct tm tmp_tm = { 0 };
-
-	priv = dedit->priv;
-
-	if (priv->date_set_to_none || !priv->date_is_valid) {
-		gtk_entry_set_text (GTK_ENTRY (priv->date_entry), _("None"));
-	} else {
-		tmp_tm.tm_year = priv->year;
-		tmp_tm.tm_mon = priv->month;
-		tmp_tm.tm_mday = priv->day;
-		tmp_tm.tm_isdst = -1;
-
-		/* This is a strftime() format for a short date. %m = month,
-		   %d = day of month, %Y = year (all digits). */
-		strftime (buffer, sizeof (buffer), _("%m/%d/%Y"), &tmp_tm);
-		gtk_entry_set_text (GTK_ENTRY (priv->date_entry), buffer);
-	}
-}
-
-
-/* This sets the text in the time entry according to the current settings. */
-static void
-e_date_edit_update_time_entry		(EDateEdit	*dedit)
-{
-	EDateEditPrivate *priv;
-	char buffer[40], *format;
-	struct tm tmp_tm = { 0 };
-
-	priv = dedit->priv;
-
-	if (priv->time_set_to_none || !priv->time_is_valid) {
-		gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (priv->time_combo)->entry), "");
-	} else {
-		/* Set these to reasonable values just in case. */
-		tmp_tm.tm_year = 2000;
-		tmp_tm.tm_mon = 0;
-		tmp_tm.tm_mday = 1;
-
-		tmp_tm.tm_hour = priv->hour;
-		tmp_tm.tm_min = priv->minute;
-
-		tmp_tm.tm_sec = 0;
-		tmp_tm.tm_isdst = -1;
-
-		if (priv->use_24_hour_format)
-			/* This is a strftime() format. %H = hour (0-23), %M = minute. */
-			format = _("%H:%M");
-		else
-			/* This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string. */
-			format = _("%I:%M %p");
-
-		strftime (buffer, sizeof (buffer), format, &tmp_tm);
-		gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (priv->time_combo)->entry),
-				    buffer);
-	}
-}
-
-
-static void
-e_date_edit_update_time_combo_state	(EDateEdit	*dedit)
-{
-	EDateEditPrivate *priv;
-	gchar *text;
-
-	priv = dedit->priv;
-
-	/* If the date entry is currently shown, and it is set to None,
-	   clear the time entry and disable the time combo, else enable it. */
-	if (priv->show_date && priv->date_set_to_none) {
-		text = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (priv->time_combo)->entry));
-		if (text[0])
-			gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (priv->time_combo)->entry), "");
-		gtk_widget_set_sensitive (priv->time_combo, FALSE);
-	} else {
-		gtk_widget_set_sensitive (priv->time_combo, TRUE);
-	}
-}
-
-
-/* Parses the date, and if it is different from the current settings it
-   updates the settings and emits a "date_changed" signal. */
-static void
-e_date_edit_check_date_changed		(EDateEdit	*dedit)
-{
-	EDateEditPrivate *priv;
-	gchar *date_text;
-	struct tm tmp_tm;
-	gboolean none = FALSE, valid = TRUE, date_changed;
-
-	priv = dedit->priv;
-
-	date_text = gtk_entry_get_text (GTK_ENTRY (priv->date_entry));
-	if (field_set_to_none (date_text))
-		none = TRUE;
-	else if (!e_date_edit_parse_date (dedit, date_text, &tmp_tm))
-		valid = FALSE;
-
-	date_changed = e_date_edit_set_date_internal (dedit, valid, none,
-						      tmp_tm.tm_year,
-						      tmp_tm.tm_mon,
-						      tmp_tm.tm_mday);
-
-	if (date_changed)
-		gtk_signal_emit (GTK_OBJECT (dedit),
-				 date_edit_signals [CHANGED]);
-}
-
-
-/* Parses the time, and if it is different from the current settings it
-   updates the settings and emits a "time_changed" signal. */
-static void
-e_date_edit_check_time_changed		(EDateEdit	*dedit)
-{
-	EDateEditPrivate *priv;
-	gchar *time_text;
-	struct tm tmp_tm;
-	gboolean none = FALSE, valid = TRUE, time_changed;
-
-	priv = dedit->priv;
-
-	time_text = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (priv->time_combo)->entry));
-	if (field_set_to_none (time_text))
-		none = TRUE;
-	else if (!e_date_edit_parse_time (dedit, time_text, &tmp_tm))
-		valid = FALSE;
-
-	time_changed = e_date_edit_set_time_internal (dedit, valid, none,
-						      tmp_tm.tm_hour,
-						      tmp_tm.tm_min);
-
-	if (time_changed)
-		gtk_signal_emit (GTK_OBJECT (dedit),
-				 date_edit_signals [CHANGED]);
-}
-
-
-/**
- * e_date_edit_date_is_valid:
- * @dedit: an #EDateEdit widget.
- * @Returns: TRUE if the last date entered was valid.
- *
- * Returns TRUE if the last date entered was valid.
- *
- * Note that if this returns FALSE, you can still use e_date_edit_get_time()
- * or e_date_edit_get_date() to get the last time or date entered which was
- * valid.
- */
-gboolean
-e_date_edit_date_is_valid	(EDateEdit	*dedit)
-{
-	g_return_val_if_fail (E_IS_DATE_EDIT (dedit), FALSE);
-
-	if (!dedit->priv->date_is_valid)
-		return FALSE;
-
-	/* If the date is empty/None and that isn't permitted, return FALSE. */
-	if (dedit->priv->date_set_to_none
-	    && !e_date_edit_get_allow_no_date_set (dedit))
-		return FALSE;
-
-	return TRUE;
-}
-
-
-/**
- * e_date_edit_time_is_valid:
- * @dedit: an #EDateEdit widget.
- * @Returns: TRUE if the last time entered was valid.
- *
- * Returns TRUE if the last time entered was valid.
- *
- * Note that if this returns FALSE, you can still use e_date_edit_get_time()
- * or e_date_edit_get_time_of_day() to get the last time or time of the day
- * entered which was valid.
- */
-gboolean
-e_date_edit_time_is_valid	(EDateEdit	*dedit)
-{
-	g_return_val_if_fail (E_IS_DATE_EDIT (dedit), FALSE);
-
-	if (!dedit->priv->time_is_valid)
-		return FALSE;
-
-	/* If the time is empty and that isn't permitted, return FALSE.
-	   Note that we don't mind an empty time if the date field is shown
-	   - in that case we just assume 0:00. */
-	if (dedit->priv->time_set_to_none && !dedit->priv->show_date
-	    && !e_date_edit_get_allow_no_date_set (dedit))
-		return FALSE;
-
-	return TRUE;
-}
-
-
-static gboolean
-e_date_edit_set_date_internal	(EDateEdit	*dedit,
-				 gboolean	 valid,
-				 gboolean	 none,
-				 gint		 year,
-				 gint		 month,
-				 gint		 day)
-{
-	EDateEditPrivate *priv;
-	gboolean date_changed = FALSE;
-
-	priv = dedit->priv;
-
-	if (!valid) {
-		/* Date is invalid. */
-		if (priv->date_is_valid) {
-			priv->date_is_valid = FALSE;
-			date_changed = TRUE;
-		}
-	} else if (none) {
-		/* Date has been set to 'None'. */
-		if (!priv->date_is_valid
-		    || !priv->date_set_to_none) {
-			priv->date_is_valid = TRUE;
-			priv->date_set_to_none = TRUE;
-			date_changed = TRUE;
-		}
-	} else {
-		/* Date has been set to a specific date. */
-		if (!priv->date_is_valid
-		    || priv->date_set_to_none
-		    || priv->year != year
-		    || priv->month != month
-		    || priv->day != day) {
-			priv->date_is_valid = TRUE;
-			priv->date_set_to_none = FALSE;
-			priv->year = year;
-			priv->month = month;
-			priv->day = day;
-			date_changed = TRUE;
-		}
-	}
-
-	return date_changed;
-}
-
-
-static gboolean
-e_date_edit_set_time_internal	(EDateEdit	*dedit,
-				 gboolean	 valid,
-				 gboolean	 none,
-				 gint		 hour,
-				 gint		 minute)
-{
-	EDateEditPrivate *priv;
-	gboolean time_changed = FALSE;
-
-	priv = dedit->priv;
-
-	if (!valid) {
-		/* Time is invalid. */
-		if (priv->time_is_valid) {
-			priv->time_is_valid = FALSE;
-			time_changed = TRUE;
-		}
-	} else if (none) {
-		/* Time has been set to empty/'None'. */
-		if (!priv->time_is_valid
-		    || !priv->time_set_to_none) {
-			priv->time_is_valid = TRUE;
-			priv->time_set_to_none = TRUE;
-			time_changed = TRUE;
-		}
-	} else {
-		/* Time has been set to a specific time. */
-		if (!priv->time_is_valid
-		    || priv->time_set_to_none
-		    || priv->hour != hour
-		    || priv->minute != minute) {
-			priv->time_is_valid = TRUE;
-			priv->time_set_to_none = FALSE;
-			priv->hour = hour;
-			priv->minute = minute;
-			time_changed = TRUE;
-		}
-	}
-
-	return time_changed;
-}
-
-
-/* Sets a callback to use to get the current time. This is useful if the
-   application needs to use its own timezone data rather than rely on the
-   Unix timezone. */
-void
-e_date_edit_set_get_time_callback	(EDateEdit	*dedit,
-					 EDateEditGetTimeCallback cb,
-					 gpointer	 data,
-					 GtkDestroyNotify destroy)
-{
-	EDateEditPrivate *priv;
-
-	g_return_if_fail (E_IS_DATE_EDIT (dedit));
-
-	priv = dedit->priv;
-
-	if (priv->time_callback_data && priv->time_callback_destroy)
-		(*priv->time_callback_destroy) (priv->time_callback_data);
-
-	priv->time_callback = cb;
-	priv->time_callback_data = data;
-	priv->time_callback_destroy = destroy;
-
-}
-
diff --git a/widgets/misc/e-dateedit.h b/widgets/misc/e-dateedit.h
deleted file mode 100644
index 022cf1fd5f..0000000000
--- a/widgets/misc/e-dateedit.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2000, Ximian, Inc.
- *
- * Based on the GnomeDateEdit, part of the Gnome Library.
- * Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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
- */
-
-/*
- * EDateEdit - a widget based on GnomeDateEdit to provide a date & optional
- * time field with popups for entering a date.
- *
- * It emits a "changed" signal when the date and/or time has changed.
- * You can check if the last date or time entered was invalid by
- * calling e_date_edit_date_is_valid() and e_date_edit_time_is_valid().
- *
- * Note that when the user types in a date or time, it will only emit the
- * signals when the user presses the return key or switches the keyboard
- * focus to another widget, or you call one of the _get_time/date functions.
- */
-
-#ifndef __E_DATE_EDIT_H_
-#define __E_DATE_EDIT_H_ 
-
-#include <time.h>
-#include <glib.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkwidget.h>
-#include <libgnome/gnome-defs.h>
- 
-BEGIN_GNOME_DECLS
-
-
-#define E_TYPE_DATE_EDIT            (e_date_edit_get_type ())
-#define E_DATE_EDIT(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_DATE_EDIT, EDateEdit))
-#define E_DATE_EDIT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_DATE_EDIT, EDateEditClass))
-#define E_IS_DATE_EDIT(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_DATE_EDIT))
-#define E_IS_DATE_EDIT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_DATE_EDIT))
-
-typedef struct _EDateEdit        EDateEdit;
-typedef struct _EDateEditPrivate EDateEditPrivate;
-typedef struct _EDateEditClass   EDateEditClass;
-
-/* The type of the callback function optionally used to get the current time.
- */
-typedef struct tm (*EDateEditGetTimeCallback) (EDateEdit *dedit,
-					       gpointer	  data);
-
-struct _EDateEdit {
-	GtkHBox hbox;
-
-	/*< private >*/
-	EDateEditPrivate *priv;
-};
-
-struct _EDateEditClass {
-	GtkHBoxClass parent_class;
-
-	void (* changed) (EDateEdit *dedit);
-};
-
-guint      e_date_edit_get_type			(void);
-GtkWidget* e_date_edit_new			(void);
-
-/* Returns TRUE if the last date and time set were valid. The date and time
-   are only set when the user hits Return or switches keyboard focus, or
-   selects a date or time from the popup. */
-gboolean   e_date_edit_date_is_valid		(EDateEdit	*dedit);
-gboolean   e_date_edit_time_is_valid		(EDateEdit	*dedit);
-
-/* Returns the last valid date & time set, or -1 if the date & time was set to
-   'None' and this is permitted via e_date_edit_set_allow_no_date_set. */
-time_t	   e_date_edit_get_time			(EDateEdit	*dedit);
-void       e_date_edit_set_time			(EDateEdit	*dedit,
-						 time_t		 the_time);
-
-/* This returns the last valid date set, without the time. It returns TRUE
-   if a date is set, or FALSE if the date is set to 'None' and this is
-   permitted via e_date_edit_set_allow_no_date_set. (Month is 1 - 12). */
-gboolean   e_date_edit_get_date			(EDateEdit	*dedit,
-						 gint		*year,
-						 gint		*month,
-						 gint		*day);
-void	   e_date_edit_set_date			(EDateEdit	*dedit,
-						 gint		 year,
-						 gint		 month,
-						 gint		 day);
-
-/* This returns the last valid time set, without the date. It returns TRUE
-   if a time is set, or FALSE if the time is set to 'None' and this is
-   permitted via e_date_edit_set_allow_no_date_set. */
-gboolean   e_date_edit_get_time_of_day		(EDateEdit	*dedit,
-						 gint		*hour,
-						 gint		*minute);
-void       e_date_edit_set_time_of_day		(EDateEdit	*dedit,
-						 gint		 hour,
-						 gint		 minute);
-
-/* Whether we show the date field. */
-gboolean   e_date_edit_get_show_date		(EDateEdit	*dedit);
-void       e_date_edit_set_show_date		(EDateEdit	*dedit,
-						 gboolean	 show_date);
-
-/* Whether we show the time field. */
-gboolean   e_date_edit_get_show_time		(EDateEdit	*dedit);
-void       e_date_edit_set_show_time		(EDateEdit	*dedit,
-						 gboolean	 show_time);
-
-/* The week start day, used in the date popup. 0 (Mon) to 6 (Sun). */
-gint	   e_date_edit_get_week_start_day	(EDateEdit	*dedit);
-void       e_date_edit_set_week_start_day	(EDateEdit	*dedit,
-						 gint		 week_start_day);
-
-/* Whether we show week numbers in the date popup. */
-gboolean   e_date_edit_get_show_week_numbers	(EDateEdit	*dedit);
-void       e_date_edit_set_show_week_numbers	(EDateEdit	*dedit,
-						 gboolean	 show_week_numbers);
-
-/* Whether we use 24 hour format in the time field & popup. */
-gboolean   e_date_edit_get_use_24_hour_format	(EDateEdit	*dedit);
-void       e_date_edit_set_use_24_hour_format	(EDateEdit	*dedit,
-						 gboolean	 use_24_hour_format);
-
-/* Whether we allow the date to be set to 'None'. e_date_edit_get_time() will
-   return (time_t) -1 in this case. */
-gboolean   e_date_edit_get_allow_no_date_set	(EDateEdit	*dedit);
-void       e_date_edit_set_allow_no_date_set	(EDateEdit	*dedit,
-						 gboolean	 allow_no_date_set);
-
-/* The range of time to show in the time combo popup. */
-void	   e_date_edit_get_time_popup_range	(EDateEdit	*dedit,
-						 gint		*lower_hour,
-						 gint		*upper_hour);
-void       e_date_edit_set_time_popup_range	(EDateEdit	*dedit,
-						 gint		 lower_hour,
-						 gint		 upper_hour);
-
-/* Sets a callback to use to get the current time. This is useful if the
-   application needs to use its own timezone data rather than rely on the
-   Unix timezone. */
-void	   e_date_edit_set_get_time_callback	(EDateEdit	*dedit,
-						 EDateEditGetTimeCallback cb,
-						 gpointer	 data,
-						 GtkDestroyNotify destroy);
-
-END_GNOME_DECLS
-
-#endif
diff --git a/widgets/misc/e-dropdown-button.c b/widgets/misc/e-dropdown-button.c
deleted file mode 100644
index 6beab161fa..0000000000
--- a/widgets/misc/e-dropdown-button.c
+++ /dev/null
@@ -1,248 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-dropdown-menu.c
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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.
- *
- * Authors:
- *   Ettore Perazzoli <ettore@ximian.com>
- *   Damon Chaplin <damon@ximian.com> 
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-dropdown-button.h"
-
-
-#include <stdio.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkwidget.h>
-#include <libgnomeui/gnome-popup-menu.h>
-#include <gal/util/e-util.h>
-
-
-struct _EDropdownButtonPrivate {
-	GtkAccelGroup *accel_group;
-	GtkWidget *menu;
-};
-
-#define PARENT_TYPE gtk_toggle_button_get_type ()
-static GtkToggleButtonClass *parent_class = NULL;
-
-
-/* Callback to position the pop-up menu.  */
-
-static void
-menu_position_cb (GtkMenu *menu,
-		  int *x,
-		  int *y,
-		  void *data)
-{
-	EDropdownButton *dropdown_button;
-	EDropdownButtonPrivate *priv;
-	GtkRequisition menu_requisition;
-	int max_x, max_y;
-
-	dropdown_button = E_DROPDOWN_BUTTON (data);
-	priv = dropdown_button->priv;
-
-	/* Calculate our preferred position.  */
-	gdk_window_get_origin (GTK_WIDGET (dropdown_button)->window, x, y);
-	*y += GTK_WIDGET (dropdown_button)->allocation.height;
-
-	/* Now make sure we are on the screen.  */
-	gtk_widget_size_request (GTK_WIDGET (priv->menu), &menu_requisition);
-	max_x = MAX (0, gdk_screen_width () - menu_requisition.width);
-	max_y = MAX (0, gdk_screen_height () - menu_requisition.height);
-
-	*x = CLAMP (*x, 0, max_x);
-	*y = CLAMP (*y, 0, max_y);
-}
-
-/* Callback for the "deactivate" signal on the pop-up menu.  This is used so
-   that we unset the state of the toggle button when the pop-up menu
-   disappears.  */
-
-static int
-menu_deactivate_cb (GtkMenuShell *menu_shell,
-		    void *data)
-{
-	EDropdownButton *dropdown_button;
-
-	puts (__FUNCTION__);
-
-	dropdown_button = E_DROPDOWN_BUTTON (data);
-
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dropdown_button), FALSE);
-	return TRUE;
-}
-
-
-/* GtkObject methods.  */
-
-static void
-impl_destroy (GtkObject *object)
-{
-	EDropdownButton *dropdown_button;
-	EDropdownButtonPrivate *priv;
-
-	dropdown_button = E_DROPDOWN_BUTTON (object);
-	priv = dropdown_button->priv;
-
-	gtk_accel_group_unref (priv->accel_group);
-	gtk_widget_destroy (priv->menu);
-
-	g_free (priv);
-}
-
-
-/* GtkWidget methods.  */
-
-static void
-impl_toggled (GtkToggleButton *toggle_button)
-{
-	EDropdownButton *dropdown_button;
-	EDropdownButtonPrivate *priv;
-
-	if (parent_class->toggled)
-		parent_class->toggled (toggle_button);
-
-	dropdown_button = E_DROPDOWN_BUTTON (toggle_button);
-	priv = dropdown_button->priv;
-
-	if (toggle_button->active) {
-		gtk_menu_popup (GTK_MENU (priv->menu), NULL, NULL,
-				menu_position_cb, dropdown_button,
-				1, GDK_CURRENT_TIME);
-	} else {
-		gtk_menu_popdown (GTK_MENU (priv->menu));
-	}
-}
-
-
-static void
-class_init (EDropdownButtonClass *klass)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	GtkToggleButtonClass *toggle_class;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	widget_class = GTK_WIDGET_CLASS (klass);
-	toggle_class = GTK_TOGGLE_BUTTON_CLASS (klass);
-
-	object_class->destroy = impl_destroy;
-	toggle_class->toggled = impl_toggled;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-}
-
-
-static void
-init (EDropdownButton *dropdown_button)
-{
-	EDropdownButtonPrivate *priv;
-
-	priv = g_new (EDropdownButtonPrivate, 1);
-	priv->accel_group = gtk_accel_group_new ();
-	priv->menu        = NULL;
-
-	dropdown_button->priv = priv;
-}
-
-
-/**
- * e_dropdown_button_construct:
- * @dropdown_button: A pointer to an %EDropdownButton object
- * @label_text: Text to display in the button
- * @menu: The menu to pop up when the button is pressed
- * 
- * Construct the @dropdown_button with the specified @label_text and the
- * associated @menu.
- **/
-void
-e_dropdown_button_construct (EDropdownButton *dropdown_button,
-			     const char *label_text,
-			     GtkMenu *menu)
-{
-	EDropdownButtonPrivate *priv;
-	GtkWidget *hbox;
-	GtkWidget *arrow;
-	GtkWidget *label;
-	unsigned int accel_key;
-
-	g_return_if_fail (dropdown_button != NULL);
-	g_return_if_fail (E_IS_DROPDOWN_BUTTON (dropdown_button));
-	g_return_if_fail (label_text != NULL);
-	g_return_if_fail (menu != NULL);
-	g_return_if_fail (GTK_IS_MENU (menu));
-
-	priv = dropdown_button->priv;
-
-	hbox = gtk_hbox_new (FALSE, 2);
-	gtk_container_add (GTK_CONTAINER (dropdown_button), hbox);
-	gtk_widget_show (hbox);
-
-	label = gtk_label_new ("");
-	accel_key = gtk_label_parse_uline (GTK_LABEL (label), label_text);
-	gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
-	gtk_widget_show (label);
-	gtk_widget_add_accelerator (GTK_WIDGET (dropdown_button), "clicked",
-				    priv->accel_group, accel_key, GDK_MOD1_MASK, 0);
-
-	arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_OUT);
-	gtk_box_pack_start (GTK_BOX (hbox), arrow, FALSE, FALSE, 2);
-	gtk_widget_show (arrow);
-
-	priv->menu = GTK_WIDGET (menu);
-
-	gtk_signal_connect_while_alive (GTK_OBJECT (priv->menu), "deactivate",
-					GTK_SIGNAL_FUNC (menu_deactivate_cb),
-					dropdown_button, GTK_OBJECT (dropdown_button));
-}
-
-/**
- * e_dropdown_button_new:
- * @label_text: Text to display in the button
- * @menu: The menu to pop up when the button is pressed
- * 
- * Create a new dropdown button.  When the button is clicked, the specified
- * @menu will be popped up.
- * 
- * Return value: A pointer to the newly created %EDropdownButton.
- **/
-GtkWidget *
-e_dropdown_button_new (const char *label_text,
-		       GtkMenu *menu)
-{
-	GtkWidget *widget;
-
-	g_return_val_if_fail (label_text != NULL, NULL);
-	g_return_val_if_fail (menu != NULL, NULL);
-	g_return_val_if_fail (GTK_IS_MENU (menu), NULL);
-
-	widget = gtk_type_new (e_dropdown_button_get_type ());
-
-	e_dropdown_button_construct (E_DROPDOWN_BUTTON (widget), label_text, menu);
-	return widget;
-}
-
-
-E_MAKE_TYPE (e_dropdown_button, "EDropdownButton", EDropdownButton, class_init, init, PARENT_TYPE)
diff --git a/widgets/misc/e-dropdown-button.h b/widgets/misc/e-dropdown-button.h
deleted file mode 100644
index 6aa92d0bd8..0000000000
--- a/widgets/misc/e-dropdown-button.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-dropdown-menu.h
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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: Ettore Perazzoli
- */
-
-#ifndef _E_DROPDOWN_BUTTON_H_
-#define _E_DROPDOWN_BUTTON_H_
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkmenu.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_DROPDOWN_BUTTON		  (e_dropdown_button_get_type ())
-#define E_DROPDOWN_BUTTON(obj)		  (GTK_CHECK_CAST ((obj), E_TYPE_DROPDOWN_BUTTON, EDropdownButton))
-#define E_DROPDOWN_BUTTON_CLASS(klass)	  (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_DROPDOWN_BUTTON, EDropdownButtonClass))
-#define E_IS_DROPDOWN_BUTTON(obj)	  (GTK_CHECK_TYPE ((obj), E_TYPE_DROPDOWN_BUTTON))
-#define E_IS_DROPDOWN_BUTTON_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_DROPDOWN_BUTTON))
-
-
-typedef struct _EDropdownButton        EDropdownButton;
-typedef struct _EDropdownButtonPrivate EDropdownButtonPrivate;
-typedef struct _EDropdownButtonClass   EDropdownButtonClass;
-
-struct _EDropdownButton {
-	GtkToggleButton parent;
-
-	EDropdownButtonPrivate *priv;
-};
-
-struct _EDropdownButtonClass {
-	GtkToggleButtonClass parent_class;
-};
-
-
-GtkType    e_dropdown_button_get_type   (void);
-void       e_dropdown_button_construct  (EDropdownButton *dropdown_button,
-					 const char      *label_text,
-					 GtkMenu         *menu);
-GtkWidget *e_dropdown_button_new        (const char      *label_text,
-					 GtkMenu         *menu);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_DROPDOWN_BUTTON_H_ */
diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c
deleted file mode 100644
index 4bdcb69615..0000000000
--- a/widgets/misc/e-filter-bar.c
+++ /dev/null
@@ -1,476 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-search-bar.c
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Authors:
- *  Michael Zucchi <notzed@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-stock.h>
-
-#include "e-dropdown-button.h"
-#include "e-filter-bar.h"
-#include "filter/rule-editor.h"
-
-#include <gal/widgets/e-unicode.h>
-#include <gal/widgets/e-gui-utils.h>
-
-#define d(x)
-
-enum {
-	LAST_SIGNAL
-};
-
-/*static gint esb_signals [LAST_SIGNAL] = { 0, };*/
-
-static ESearchBarClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_QUERY,
-};
-
-
-/* Callbacks.  */
-
-/* rule editor thingy */
-static void
-rule_editor_destroyed (GtkWidget *w, EFilterBar *efb)
-{
-	efb->save_dialogue = NULL;
-	e_search_bar_set_menu_sensitive (E_SEARCH_BAR (efb), E_FILTERBAR_SAVE_ID, TRUE);
-	gtk_widget_set_sensitive (E_SEARCH_BAR (efb)->entry, TRUE);
-}
-
-/* FIXME: need to update the popup menu to match any edited rules, sigh */
-static void
-full_rule_editor_clicked (GtkWidget *dialog, int button, void *data)
-{
-	EFilterBar *efb = data;
-	
-	switch (button) {
-	case 0:
-		rule_context_save (efb->context, efb->userrules);
-	case 1:
-	default:
-		gnome_dialog_close (GNOME_DIALOG (dialog));
-	case -1:
-	}
-}
-
-static void
-rule_editor_clicked (GtkWidget *dialog, int button, void *data)
-{
-	EFilterBar *efb = data;
-	ESearchBarItem item;
-	FilterRule *rule;
-	
-	switch (button) {
-	case 0:
-		rule = gtk_object_get_data (GTK_OBJECT (dialog), "rule");
-		if (rule) {
-			if (!filter_rule_validate (rule))
-				return;
-			
-			item.text = rule->name;
-			item.id = efb->menu_base + efb->menu_rules->len;
-			
-			g_ptr_array_add (efb->menu_rules, rule);
-			
-			rule_context_add_rule (efb->context, rule);
-			/* FIXME: check return */
-			rule_context_save (efb->context, efb->userrules);
-			e_search_bar_add_menu ((ESearchBar *)efb, &item);
-		}
-	case 1:
-		gnome_dialog_close (GNOME_DIALOG (dialog));
-		break;
-	case -1:
-	}
-}
-
-static void
-rule_advanced_clicked (GtkWidget *dialog, int button, void *data)
-{
-	EFilterBar *efb = data;
-	FilterRule *rule;
-
-	switch (button) {
-	case 0:			/* 'ok' */
-	case 1:
-		rule = gtk_object_get_data (GTK_OBJECT (dialog), "rule");
-		if (rule) {
-			efb->current_query = rule;
-			gtk_object_ref (GTK_OBJECT (rule));
-			gtk_signal_emit_by_name (GTK_OBJECT (efb), "query_changed");
-		}
-		if (button == 1)
-			rule_editor_clicked (dialog, 0, data);
-	case 2:
-		gnome_dialog_close (GNOME_DIALOG (dialog));
-		break;
-	case -1:
-	}
-}
-
-static void
-menubar_activated (ESearchBar *esb, int id, void *data)
-{
-	EFilterBar *efb = (EFilterBar *)esb;
-	
-	switch (id) {
-	case E_FILTERBAR_RESET_ID:
-		d(printf("Reset menu\n"));
-		efb->current_query = NULL;
-		gtk_object_set (GTK_OBJECT (esb), "option_choice", efb->option_base, NULL);
-		gtk_object_set (GTK_OBJECT (esb), "text", NULL, NULL);
-		gtk_widget_set_sensitive (esb->entry, TRUE);
-		break;
-	case E_FILTERBAR_EDIT_ID:
-		if (!efb->save_dialogue) {
-			GnomeDialog *gd;
-			
-			gd = (GnomeDialog *) rule_editor_new (efb->context, NULL);
-			gtk_window_set_title (GTK_WINDOW (gd), _("Search Editor"));
-			gtk_signal_connect (GTK_OBJECT (gd), "clicked", full_rule_editor_clicked, efb);
-			gtk_signal_connect (GTK_OBJECT (gd), "destroy", rule_editor_destroyed, efb);
-			gtk_widget_show (GTK_WIDGET (gd));
-		}
-		break;
-	case E_FILTERBAR_SAVE_ID:
-		if (efb->current_query && !efb->save_dialogue) {
-			GtkWidget *w;
-			GtkWidget *gd;
-			FilterRule *rule;
-			
-			rule = filter_rule_clone (efb->current_query, efb->context);
-			
-			w = filter_rule_get_widget (rule, efb->context);
-			filter_rule_set_source (rule, FILTER_SOURCE_INCOMING);
-			gd = gnome_dialog_new (_("Save Search"), GNOME_STOCK_BUTTON_OK,
-					       GNOME_STOCK_BUTTON_CANCEL, NULL);
-			efb->save_dialogue = gd;
-			gnome_dialog_set_default (GNOME_DIALOG (gd), 0);
-			
-			gtk_window_set_policy (GTK_WINDOW (gd), FALSE, TRUE, FALSE);
-			
-			gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (gd)->vbox), w, TRUE, TRUE, 0);
-			gtk_widget_show (gd);
-			gtk_object_ref (GTK_OBJECT (rule));
-			gtk_object_set_data_full (GTK_OBJECT (gd), "rule", rule, (GtkDestroyNotify)gtk_object_unref);
-			gtk_signal_connect (GTK_OBJECT (gd), "clicked", rule_editor_clicked, efb);
-			gtk_signal_connect (GTK_OBJECT (gd), "destroy", rule_editor_destroyed, efb);
-			
-			e_search_bar_set_menu_sensitive (esb, E_FILTERBAR_SAVE_ID, FALSE);
-			gtk_widget_set_sensitive (esb->entry, FALSE);
-			
-			gtk_widget_show (gd);
-		}
-
-		d(printf("Save menu\n"));
-		break;
-	default:
-		if (id >= efb->menu_base && id < efb->menu_base + efb->menu_rules->len) {
-			GString *out = g_string_new ("");
-			d(printf("Selected rule: %s\n", ((FilterRule *)efb->menu_rules->pdata[id - efb->menu_base])->name));
-			filter_rule_build_code (efb->menu_rules->pdata[id - efb->menu_base], out);
-			d(printf("query: '%s'\n", out->str));
-			g_string_free (out, TRUE);
-			
-			efb->current_query = (FilterRule *)efb->menu_rules->pdata[id - efb->menu_base];
-			efb->setquery = TRUE;
-			gtk_object_set (GTK_OBJECT (esb), "option_choice", E_FILTERBAR_ADVANCED_ID, NULL);
-			
-			gtk_widget_set_sensitive (esb->entry, FALSE);
-		} else {
-			gtk_widget_set_sensitive (esb->entry, TRUE);
-			return;
-		}
-	}
-
-	gtk_signal_emit_stop_by_name (GTK_OBJECT (esb), "menu_activated");
-}
-
-static void
-option_changed (ESearchBar *esb, void *data)
-{
-	EFilterBar *efb = (EFilterBar *)esb;
-	int id = esb->option_choice;
-	char *query;
-	
-	d(printf("option changed, id = %d\n", id));
-	
-	switch (id) {
-	case E_FILTERBAR_ADVANCED_ID: {
-		d(printf("Advanced search!\n"));
-		
-		if (!efb->save_dialogue && !efb->setquery) {
-			GtkWidget *w, *gd;
-			FilterRule *rule;
-			
-			if (efb->current_query)
-				rule = filter_rule_clone (efb->current_query, efb->context);
-			else
-				rule = filter_rule_new ();
-			
-			w = filter_rule_get_widget (rule, efb->context);
-			filter_rule_set_source (rule, FILTER_SOURCE_INCOMING);
-			gd = gnome_dialog_new (_("Advanced Search"),
-					       GNOME_STOCK_BUTTON_OK,
-					       _("Save"),
-					       GNOME_STOCK_BUTTON_CANCEL,
-					       NULL);
-			efb->save_dialogue = gd;
-			gnome_dialog_set_default (GNOME_DIALOG (gd), 0);
-			
-			gtk_window_set_policy (GTK_WINDOW (gd), FALSE, TRUE, FALSE);
-			gtk_window_set_default_size (GTK_WINDOW (gd), 600, 300);
-			gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (gd)->vbox), w, TRUE, TRUE, 0);
-			gtk_widget_show (gd);
-			gtk_object_ref (GTK_OBJECT (rule));
-			gtk_object_set_data_full (GTK_OBJECT (gd), "rule", rule, (GtkDestroyNotify)gtk_object_unref);
-			gtk_signal_connect (GTK_OBJECT (gd), "clicked", rule_advanced_clicked, efb);
-			gtk_signal_connect (GTK_OBJECT (gd), "destroy", rule_editor_destroyed, efb);
-			
-			e_search_bar_set_menu_sensitive (esb, E_FILTERBAR_SAVE_ID, FALSE);
-			gtk_widget_set_sensitive (esb->entry, FALSE);
-			
-			gtk_widget_show (gd);
-		}
-	}	break;
-	default:
-		if (id >= efb->option_base && id < efb->option_base + efb->option_rules->len) {
-			efb->current_query = (FilterRule *)efb->option_rules->pdata[id - efb->option_base];
-			if (efb->config) {
-				gtk_object_get (GTK_OBJECT (esb), "text", &query, NULL);
-				efb->config (efb, efb->current_query, id, query, efb->config_data);
-				g_free (query);
-			}
-			gtk_widget_set_sensitive (esb->entry, TRUE);
-		} else {
-			gtk_widget_set_sensitive (esb->entry, FALSE);
-			efb->current_query = NULL;
-		}
-	}
-	efb->setquery = FALSE;
-}
-
-static GArray *
-build_items (ESearchBar *esb, ESearchBarItem *items, int type, int *start, GPtrArray *rules)
-{
-	FilterRule *rule = NULL;
-	EFilterBar *efb = (EFilterBar *)esb;
-	int id = 0, i;
-	GArray *menu = g_array_new (FALSE, FALSE, sizeof (ESearchBarItem));
-	ESearchBarItem item;
-	char *source;
-	
-	/* find a unique starting point for the id's of our items */
-	for (i = 0; items[i].id != -1; i++) {
-		if (items[i].id >= id)
-			id = items[i].id + 1;
-	}
-	
-	/* add the user menus */
-	g_array_append_vals (menu, items, i);
-	
-	*start = id;
-	
-	if (type == 0) {
-		/* and add ours */
-		item.id = 0;
-		item.text = NULL;
-		g_array_append_vals (menu, &item, 1);
-		source = FILTER_SOURCE_INCOMING;
-	} else {
-		source = FILTER_SOURCE_DEMAND;
-	}
-	
-	while ((rule = rule_context_next_rule (efb->context, rule, source))) {
-		item.id = id++;
-		item.text = rule->name;
-		g_array_append_vals (menu, &item, 1);
-		g_ptr_array_add (rules, rule);
-	}
-	
-	/* always add on the advanced menu */
-	if (type == 1) {
-		ESearchBarItem advanced_item = E_FILTERBAR_ADVANCED;
-		g_array_append_vals (menu, &advanced_item, 1);
-	}
-	
-	item.id = -1;
-	item.text = NULL;
-	g_array_append_vals (menu, &item, 1);
-	
-	return menu;
-}
-
-/* Virtual methods */
-static void
-set_menu (ESearchBar *esb, ESearchBarItem *items)
-{
-	GArray *menu;
-	EFilterBar *efb = (EFilterBar *)esb;
-	
-	g_ptr_array_set_size (efb->menu_rules, 0);
-	menu = build_items (esb, items, 0, &efb->menu_base, efb->menu_rules);
-	((ESearchBarClass *)parent_class)->set_menu (esb, (ESearchBarItem *)menu->data);
-	g_array_free (menu, TRUE);
-}
-
-static void
-set_option(ESearchBar *esb, ESearchBarItem *items)
-{
-	GArray *menu;
-	EFilterBar *efb = (EFilterBar *)esb;
-	
-	g_ptr_array_set_size (efb->option_rules, 0);
-	menu = build_items (esb, items, 1, &efb->option_base, efb->option_rules);
-	((ESearchBarClass *)parent_class)->set_option (esb, (ESearchBarItem *)menu->data);
-	g_array_free (menu, TRUE);
-}
-
-
-/* GtkObject methods.  */
-
-static void
-impl_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EFilterBar *efb = E_FILTER_BAR(object);
-	
-	switch (arg_id) {
-	case ARG_QUERY:
-		if (efb->current_query) {
-			GString *out = g_string_new ("");
-			
-			filter_rule_build_code (efb->current_query, out);
-			GTK_VALUE_STRING (*arg) = out->str;
-			g_string_free (out, FALSE);
-		} else {
-			GTK_VALUE_STRING (*arg) = NULL;
-		}
-		break;
-	}
-}
-
-
-static void
-class_init (EFilterBarClass *klass)
-{
-	GtkObjectClass *object_class;
-	ESearchBarClass *esb_class = (ESearchBarClass *)klass;
-	
-	object_class = GTK_OBJECT_CLASS(klass);
-	
-	parent_class = gtk_type_class(e_search_bar_get_type());
-	
-	object_class->get_arg = impl_get_arg;
-	
-	esb_class->set_menu = set_menu;
-	esb_class->set_option = set_option;
-	
-	gtk_object_add_arg_type ("EFilterBar::query", GTK_TYPE_STRING, GTK_ARG_READABLE, ARG_QUERY);
-	
-#if 0
-	esb_signals [QUERY_CHANGED] =
-		gtk_signal_new ("query_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EFilterBarClass, query_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-	
-	esb_signals [MENU_ACTIVATED] =
-		gtk_signal_new ("menu_activated",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EFilterBarClass, menu_activated),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
-	
-	gtk_object_class_add_signals (object_class, esb_signals, LAST_SIGNAL);
-#endif
-}
-
-static void
-init (EFilterBar *efb)
-{
-	gtk_signal_connect (GTK_OBJECT (efb), "menu_activated", menubar_activated, NULL);
-	gtk_signal_connect (GTK_OBJECT (efb), "query_changed", option_changed, NULL);
-	
-	efb->menu_rules = g_ptr_array_new ();
-	efb->option_rules = g_ptr_array_new ();
-}
-
-
-/* Object construction.  */
-
-EFilterBar *
-e_filter_bar_new (RuleContext *context, const char *systemrules, const char *userrules,
-		  EFilterBarConfigRule config, void *data)
-{
-	EFilterBar *bar;
-	ESearchBarItem item = { NULL, -1 };
-	
-	bar = gtk_type_new (e_filter_bar_get_type ());
-	
-	bar->context = context;
-	gtk_object_ref (GTK_OBJECT (context));
-	bar->systemrules = g_strdup (systemrules);
-	bar->userrules = g_strdup (userrules);
-	rule_context_load (context, systemrules, userrules);
-	
-	bar->config = config;
-	bar->config_data = data;
-	
-	e_search_bar_construct ((ESearchBar *)bar, &item, &item);
-	
-	return bar;
-}
-
-GtkType
-e_filter_bar_get_type (void)
-{
-	static GtkType type = 0;
-	
-	if (!type) {
-		static const GtkTypeInfo info = {
-			"EFilterBar",
-			sizeof (EFilterBar),
-			sizeof (EFilterBarClass),
-			(GtkClassInitFunc) class_init,
-			(GtkObjectInitFunc) init,
-			/* reserved_1 */ NULL,
-		       	/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-		
-		type = gtk_type_unique (e_search_bar_get_type (), &info);
-	}
-	
-	return type;
-}
diff --git a/widgets/misc/e-filter-bar.h b/widgets/misc/e-filter-bar.h
deleted file mode 100644
index c6777630e8..0000000000
--- a/widgets/misc/e-filter-bar.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-filter-bar.h
- * Copyright (C) 2001 Ximian Inc.
- * Author: Michael Zucchi <notzed@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_FILTER_BAR_H__
-#define __E_FILTER_BAR_H__
-
-#include <gtk/gtkobject.h>
-#include <gtk/gtkwidget.h>
-#include "e-search-bar.h"
-
-#include "filter/rule-context.h"
-#include "filter/filter-rule.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EFilterBar - A filter rule driven search bar.
- *
- * The following arguments are available:
- *
- * name		 type		read/write	description
- * ---------------------------------------------------------------------------------
- * query         string         R               String representing query.
- */
-
-#define E_FILTER_BAR_TYPE			(e_filter_bar_get_type ())
-#define E_FILTER_BAR(obj)			(GTK_CHECK_CAST ((obj), E_FILTER_BAR_TYPE, EFilterBar))
-#define E_FILTER_BAR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_FILTER_BAR_TYPE, EFilterBarClass))
-#define E_IS_FILTER_BAR(obj)		(GTK_CHECK_TYPE ((obj), E_FILTER_BAR_TYPE))
-#define E_IS_FILTER_BAR_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_FILTER_BAR_TYPE))
-
-typedef struct _EFilterBar       EFilterBar;
-typedef struct _EFilterBarClass  EFilterBarClass;
-
-typedef void (*EFilterBarConfigRule)(EFilterBar *, FilterRule *rule, int id, const char *query, void *data);
-
-struct _EFilterBar
-{
-	ESearchBar parent;
-
-	int menu_base, option_base;
-	GPtrArray *menu_rules, *option_rules;
-
-	GtkWidget *save_dialogue; /* current save dialogue (so we dont pop up multiple ones) */
-
-	FilterRule *current_query; /* as it says */
-	int setquery;		/* true when we're setting a query directly to advanced, so dont popup the dialogue */
-
-	RuleContext *context;
-	char *systemrules;
-	char *userrules;
-
-	EFilterBarConfigRule config;
-	void *config_data;
-};
-
-struct _EFilterBarClass
-{
-	ESearchBarClass parent_class;
-};
-
-/* "preset" items */
-enum {
-	/* preset menu options */
-	E_FILTERBAR_RESET_ID = -2,
-	E_FILTERBAR_SAVE_ID = -3,
-	E_FILTERBAR_EDIT_ID = -4,
-
-	/* preset option options */
-	E_FILTERBAR_ADVANCED_ID = -5,
-
-	E_FILTERBAR_LAST_ID = -6,
-};
-
-#define E_FILTERBAR_SAVE { N_("Save As..."), E_FILTERBAR_SAVE_ID }
-#define E_FILTERBAR_RESET { N_("Show All"), E_FILTERBAR_RESET_ID }
-#define E_FILTERBAR_EDIT { N_("Edit..."), E_FILTERBAR_EDIT_ID }
-#define E_FILTERBAR_ADVANCED { N_("Advanced..."), E_FILTERBAR_ADVANCED_ID }
-
-#ifdef JUST_FOR_TRANSLATORS
-const char * strings[] = {
-	N_("Save As..."),
-	N_("Show All"),
-	N_("Edit..."),
-	N_("Advanced...")
-};
-#endif
-
-
-GtkType    e_filter_bar_get_type   (void);
-EFilterBar*e_filter_bar_new        (RuleContext *, const char *sys, const char *user, EFilterBarConfigRule config, void *data);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_FILTER_BAR_H__ */
diff --git a/widgets/misc/e-gui-utils.c b/widgets/misc/e-gui-utils.c
deleted file mode 100644
index b92c155f59..0000000000
--- a/widgets/misc/e-gui-utils.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * GUI utility functions
- *
- * Author:
- *   Miguel de Icaza <miguel@helixcode.com>
- *
- * Copyright (C) 1999 Miguel de Icaza
- * Copyright (C) 2000, 2001 Ximian, Inc.
- */
-#include <config.h>
-
-#include "e-gui-utils.h"
-
-#include <gtk/gtkentry.h>
-#include <gtk/gtksignal.h>
-#include <libgnomeui/gnome-messagebox.h>
-#include <libgnomeui/gnome-stock.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gnome-canvas-pixbuf.h>
-
-void
-e_notice (GtkWindow *window, const char *type, const char *format, ...)
-{
-	GtkWidget *dialog;
-	va_list args;
-	char *str;
-
-	va_start (args, format);
-	str = g_strdup_vprintf (format, args);
-	dialog = gnome_message_box_new (str, type, GNOME_STOCK_BUTTON_OK, NULL);
-	va_end (args);
-	g_free (str);
-	
-	if (window)
-		gnome_dialog_set_parent (GNOME_DIALOG (dialog), window);
-
-	gnome_dialog_run (GNOME_DIALOG (dialog));
-}
-
-static void
-kill_popup_menu (GtkWidget *widget, GtkMenu *menu)
-{
-	g_return_if_fail (menu != NULL);
-	g_return_if_fail (GTK_IS_MENU (menu));
-
-	gtk_object_unref (GTK_OBJECT (menu));
-}
-
-void
-e_auto_kill_popup_menu_on_hide (GtkMenu *menu)
-{
-	g_return_if_fail (menu != NULL);
-	g_return_if_fail (GTK_IS_MENU (menu));
-
-	gtk_signal_connect (GTK_OBJECT (menu), "hide",
-			    GTK_SIGNAL_FUNC (kill_popup_menu), menu);
-}
-
-void
-e_popup_menu (GtkMenu *menu, GdkEvent *event)
-{
-	g_return_if_fail (menu != NULL);
-	g_return_if_fail (GTK_IS_MENU (menu));
-
-	e_auto_kill_popup_menu_on_hide (menu);
-
-	if (event->type == GDK_KEY_PRESS)
-		gtk_menu_popup (menu, NULL, NULL, 0, NULL, 0, event->key.time);
-	else if ((event->type == GDK_BUTTON_PRESS) ||
-		 (event->type == GDK_BUTTON_RELEASE) ||
-		 (event->type == GDK_2BUTTON_PRESS) ||
-		 (event->type == GDK_3BUTTON_PRESS)){
-		gtk_menu_popup (menu, NULL, NULL, 0, NULL, event->button.button, event->button.time);
-	} else
-		gtk_menu_popup (menu, NULL, NULL, 0, NULL, 0, GDK_CURRENT_TIME);
-}
-
-typedef struct {
-	GtkCallback callback;
-	gpointer closure;
-} CallbackClosure;
-
-static void
-e_container_foreach_leaf_callback(GtkWidget *widget, CallbackClosure *callback_closure)
-{
-	if (GTK_IS_CONTAINER(widget)) {
-		e_container_foreach_leaf(GTK_CONTAINER(widget), callback_closure->callback, callback_closure->closure);
-	} else {
-		(*callback_closure->callback) (widget, callback_closure->closure);
-	}
-}
-
-void
-e_container_foreach_leaf(GtkContainer *container,
-			 GtkCallback callback,
-			 gpointer closure)
-{
-	CallbackClosure callback_closure;
-	callback_closure.callback = callback;
-	callback_closure.closure = closure;
-	gtk_container_foreach(container, (GtkCallback) e_container_foreach_leaf_callback, &callback_closure);
-}
-
-static void
-e_container_change_tab_order_destroy_notify(gpointer data)
-{
-	GList *list = data;
-	g_list_foreach(list, (GFunc) gtk_object_unref, NULL);
-	g_list_free(list);
-}
-
-
-static gint
-e_container_change_tab_order_callback(GtkContainer *container,
-				      GtkDirectionType direction,
-				      GList *children)
-{
-	GtkWidget *focus_child;
-	GtkWidget *child;
-
-	if (direction != GTK_DIR_TAB_FORWARD &&
-	    direction != GTK_DIR_TAB_BACKWARD)
-		return FALSE;
-
-	focus_child = container->focus_child;
-
-	if (direction == GTK_DIR_TAB_BACKWARD) {
-		children = g_list_last(children);
-	}
-
-	while (children) {
-		child = children->data;
-		if (direction == GTK_DIR_TAB_FORWARD)
-			children = children->next;
-		else
-			children = children->prev;
-
-		if (!child)
-			continue;
-
-		if (focus_child) {
-			if (focus_child == child) {
-				focus_child = NULL;
-
-				if (GTK_WIDGET_DRAWABLE (child) &&
-				    GTK_IS_CONTAINER (child) &&
-				    !GTK_WIDGET_HAS_FOCUS (child))
-					if (gtk_container_focus (GTK_CONTAINER (child), direction)) {
-						gtk_signal_emit_stop_by_name(GTK_OBJECT(container), "focus");
-						return TRUE;
-					}
-			}
-		}
-		else if (GTK_WIDGET_DRAWABLE (child)) {
-			if (GTK_IS_CONTAINER (child)) {
-				if (gtk_container_focus (GTK_CONTAINER (child), direction)) {
-					gtk_signal_emit_stop_by_name(GTK_OBJECT(container), "focus");
-					return TRUE;
-				}
-			}
-			else if (GTK_WIDGET_CAN_FOCUS (child)) {
-				gtk_widget_grab_focus (child);
-				gtk_signal_emit_stop_by_name(GTK_OBJECT(container), "focus");
-				return TRUE;
-			}
-		}
-	}
-
-	return FALSE;
-}
-
-gint
-e_container_change_tab_order(GtkContainer *container, GList *widgets)
-{
-	GList *list;
-	list = g_list_copy(widgets);
-	g_list_foreach(list, (GFunc) gtk_object_ref, NULL);
-	return gtk_signal_connect_full(GTK_OBJECT(container), "focus",
-				       GTK_SIGNAL_FUNC(e_container_change_tab_order_callback),
-				       NULL, list,
-				       e_container_change_tab_order_destroy_notify,
-				       FALSE, FALSE);
-}
-
-struct widgetandint {
-	GtkWidget *widget;
-	int count;
-};
-
-static void
-nth_entry_callback(GtkWidget *widget, struct widgetandint *data)
-{
-	if (GTK_IS_ENTRY(widget)) {
-		if (data->count > 1) {
-			data->count --;
-			data->widget = widget;
-		} else if (data->count == 1) {
-			data->count --;
-			data->widget = NULL;
-			gtk_widget_grab_focus(widget);
-		}
-	}
-}
-
-void
-e_container_focus_nth_entry(GtkContainer *container, int n)
-{
-	struct widgetandint data;
-	data.widget = NULL;
-	data.count = n;
-	e_container_foreach_leaf(container, (GtkCallback) nth_entry_callback, &data);
-	if (data.widget)
-		gtk_widget_grab_focus(data.widget);
-}
diff --git a/widgets/misc/e-gui-utils.h b/widgets/misc/e-gui-utils.h
deleted file mode 100644
index 8a04ee24ae..0000000000
--- a/widgets/misc/e-gui-utils.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef GAL_GUI_UTILS_H
-#define GAL_GUI_UTILS_H
-
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkwindow.h>
-
-#include <libgnomeui/gnome-messagebox.h>
-
-BEGIN_GNOME_DECLS
-
-void  e_popup_menu                    (GtkMenu      *menu,
-				       GdkEvent     *event);
-void  e_auto_kill_popup_menu_on_hide  (GtkMenu      *menu);
-void  e_notice                        (GtkWindow    *window,
-				       const char   *type,
-				       const char   *format,
-				       ...);
-void  e_container_foreach_leaf        (GtkContainer *container,
-				       GtkCallback   callback,
-				       gpointer      closure);
-void  e_container_focus_nth_entry     (GtkContainer *container,
-				       int           n);
-gint  e_container_change_tab_order    (GtkContainer *container,
-				       GList        *widgets);
-
-END_GNOME_DECLS
-
-#endif /* GAL_GUI_UTILS_H */
diff --git a/widgets/misc/e-hsv-utils.c b/widgets/misc/e-hsv-utils.c
deleted file mode 100644
index 31561436dd..0000000000
--- a/widgets/misc/e-hsv-utils.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-hsv-utils.c: utilites for manipulating colours in HSV space
- *
- * Author:
- *   Seth Nickell <seth@eazel.com>
- *
- * Copyright (C) 1995-2001 Seth Nickell, Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- */
-
-#include <config.h>
-
-#include "e-hsv-utils.h"
-
-/* tweak_hsv is a really tweaky function. it modifies its first argument, which
-   should be the colour you want tweaked. delta_h, delta_s and delta_v specify
-   how much you want their respective channels modified (and in what direction).
-   if it can't do the specified modification, it does it in the oppositon direction */
-void
-e_hsv_tweak (GdkColor *colour, gdouble delta_h, gdouble delta_s, gdouble delta_v) 
-{
-	gdouble h, s, v, r, g, b;
-
-	r = colour->red   / 65535.0f;
-	g = colour->green / 65535.0f;
-	b = colour->blue  / 65535.0f;
-	
-	e_rgb_to_hsv (r, g, b, &h, &s, &v);
-	
-	if (h + delta_h < 0) {
-		h -= delta_h;
-	} else {
-		h += delta_h;
-	}
-	
-	if (s + delta_s < 0) {
-		s -= delta_s;
-	} else {
-		s += delta_s;
-	}
-
-	if (v + delta_v < 0) {
-		v -= delta_v;
-	} else {
-		v += delta_v;
-	}
-
-	e_hsv_to_rgb (h, s, v, &r, &g, &b);
-	
-	colour->red   = r * 65535.0f;
-	colour->green = g * 65535.0f;
-	colour->blue  = b * 65535.0f;
-}
-
-/* Copy n' Paste code from the GTK+ colour selector (gtkcolorsel.c) */
-/* Originally lifted, I suspect, from "Foley, van Dam"              */
-void
-e_hsv_to_rgb (gdouble  h, gdouble  s, gdouble  v,
-	      gdouble *r, gdouble *g, gdouble *b)
-{
-  gint i;
-  gdouble f, w, q, t;
-
-  if (s == 0.0)
-    s = 0.000001;
-
-  if (h == -1.0)
-    {
-      *r = v;
-      *g = v;
-      *b = v;
-    }
-  else
-    {
-      if (h == 360.0)
-	h = 0.0;
-      h = h / 60.0;
-      i = (gint) h;
-      f = h - i;
-      w = v * (1.0 - s);
-      q = v * (1.0 - (s * f));
-      t = v * (1.0 - (s * (1.0 - f)));
-
-      switch (i)
-	{
-	case 0:
-	  *r = v;
-	  *g = t;
-	  *b = w;
-	  break;
-	case 1:
-	  *r = q;
-	  *g = v;
-	  *b = w;
-	  break;
-	case 2:
-	  *r = w;
-	  *g = v;
-	  *b = t;
-	  break;
-	case 3:
-	  *r = w;
-	  *g = q;
-	  *b = v;
-	  break;
-	case 4:
-	  *r = t;
-	  *g = w;
-	  *b = v;
-	  break;
-	case 5:
-	  *r = v;
-	  *g = w;
-	  *b = q;
-	  break;
-	}
-    }
-}
-
-void
-e_rgb_to_hsv (gdouble r, gdouble g, gdouble b,
-	      gdouble *h, gdouble *s, gdouble *v)
-{
-  double max, min, delta;
-
-  max = r;
-  if (g > max)
-    max = g;
-  if (b > max)
-    max = b;
-
-  min = r;
-  if (g < min)
-    min = g;
-  if (b < min)
-    min = b;
-
-  *v = max;
-
-  if (max != 0.0)
-    *s = (max - min) / max;
-  else
-    *s = 0.0;
-
-  if (*s == 0.0)
-    *h = -1.0;
-  else
-    {
-      delta = max - min;
-
-      if (r == max)
-	*h = (g - b) / delta;
-      else if (g == max)
-	*h = 2.0 + (b - r) / delta;
-      else if (b == max)
-	*h = 4.0 + (r - g) / delta;
-
-      *h = *h * 60.0;
-
-      if (*h < 0.0)
-	*h = *h + 360;
-    }
-}
-
-
diff --git a/widgets/misc/e-hsv-utils.h b/widgets/misc/e-hsv-utils.h
deleted file mode 100644
index 774d18585c..0000000000
--- a/widgets/misc/e-hsv-utils.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_HSV_UTILS_H_
-#define _E_HSV_UTILS_H_
-
-#include <libgnome/gnome-defs.h>
-#include <gdk/gdk.h>
-
-BEGIN_GNOME_DECLS
-
-void  e_hsv_to_rgb  (gdouble   h,
-		     gdouble   s,
-		     gdouble   v,
-		     gdouble  *r,
-		     gdouble  *g,
-		     gdouble  *b);
-
-void  e_rgb_to_hsv  (gdouble   r,
-		     gdouble   g,
-		     gdouble   b,
-		     gdouble  *h,
-		     gdouble  *s,
-		     gdouble  *v);
-
-void  e_hsv_tweak   (GdkColor *colour,
-		     gdouble   delta_h,
-		     gdouble   delta_s,
-		     gdouble   delta_v);
-
-END_GNOME_DECLS
-
-#endif /* _E_HSV_UTILS_H_ */
diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c
deleted file mode 100644
index a514f1ee9d..0000000000
--- a/widgets/misc/e-map.c
+++ /dev/null
@@ -1,1783 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Map widget.
- *
- * Copyright (C) 2000-2001 Ximian, Inc.
- *
- * Authors: Hans Petter Jansson <hpj@ximian.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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.
- */
-
-#include <config.h>
-#include <math.h>
-#include <stdlib.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtksignal.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <libart_lgpl/art_filterlevel.h>
-
-#include "e-map.h"
-
-/* Scroll step increment */
-
-#define SCROLL_STEP_SIZE 32
-
-
-/* */
-
-#define E_MAP_GET_WIDTH(map) gdk_pixbuf_get_width(((EMapPrivate *) E_MAP(map)->priv)->map_render_pixbuf)
-#define E_MAP_GET_HEIGHT(map) gdk_pixbuf_get_height(((EMapPrivate *) E_MAP(map)->priv)->map_render_pixbuf)
-
-
-/* Zoom state - keeps track of animation hacks */
-
-typedef enum
-{
-	E_MAP_ZOOMED_IN,
-	E_MAP_ZOOMED_OUT,
-	E_MAP_ZOOMING_IN,
-	E_MAP_ZOOMING_OUT
-}
-EMapZoomState;
-
-
-/* Private part of the EMap structure */
-
-typedef struct
-{
-	/* Pointer to map image */
-	GdkPixbuf *map_pixbuf, *map_render_pixbuf;
-
-	/* Settings */
-	gboolean frozen, smooth_zoom;
-
-	/* Adjustments for scrolling */
-	GtkAdjustment *hadj;
-	GtkAdjustment *vadj;
-
-	/* Current scrolling offsets */
-	int xofs, yofs;
-
-	/* Realtime zoom data */
-	EMapZoomState zoom_state;
-	double zoom_target_long, zoom_target_lat;
-
-	/* Dots */
-	GPtrArray *points;
-}
-EMapPrivate;
-
-
-/* Signal IDs */
-
-enum
-{
-	LAST_SIGNAL
-};
-
-static guint e_map_signals[LAST_SIGNAL];
-
-
-/* Internal prototypes */
-
-static void e_map_class_init (EMapClass *class);
-static void e_map_init (EMap *view);
-static void e_map_destroy (GtkObject *object);
-static void e_map_finalize (GtkObject *object);
-static void e_map_unmap (GtkWidget *widget);
-static void e_map_realize (GtkWidget *widget);
-static void e_map_unrealize (GtkWidget *widget);
-static void e_map_size_request (GtkWidget *widget, GtkRequisition *requisition);
-static void e_map_size_allocate (GtkWidget *widget, GtkAllocation *allocation);
-static void e_map_draw (GtkWidget *widget, GdkRectangle *area);
-static gint e_map_button_press (GtkWidget *widget, GdkEventButton *event);
-static gint e_map_button_release (GtkWidget *widget, GdkEventButton *event);
-static gint e_map_motion (GtkWidget *widget, GdkEventMotion *event);
-static gint e_map_expose (GtkWidget *widget, GdkEventExpose *event);
-static gint e_map_key_press (GtkWidget *widget, GdkEventKey *event);
-static void e_map_set_scroll_adjustments (GtkWidget *widget, GtkAdjustment *hadj, GtkAdjustment *vadj);
-
-static void update_render_pixbuf (EMap *map, ArtFilterLevel interp, gboolean render_overlays);
-static void set_scroll_area (EMap *view);
-static void request_paint_area (EMap *view, GdkRectangle *area);
-static void center_at (EMap *map, int x, int y, gboolean scroll);
-static void smooth_center_at (EMap *map, int x, int y);
-static void scroll_to (EMap *view, int x, int y);
-static void zoom_do (EMap *map);
-static gint load_map_background (EMap *view, gchar *name);
-static void adjustment_changed_cb (GtkAdjustment *adj, gpointer data);
-static void update_and_paint (EMap *map);
-static void update_render_point (EMap *map, EMapPoint *point);
-static void repaint_point (EMap *map, EMapPoint *point);
-
-static GtkWidgetClass *parent_class;
-
-
-/* ----------------- *
- * Widget management *
- * ----------------- */
-
-
-/**
- * e_map_get_type:
- * @void: 
- * 
- * Registers the #EMap class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the #EMap class.
- **/
-
-GtkType
-e_map_get_type (void)
-{
-	static GtkType e_map_type = 0;
-
-	if (!e_map_type)
-	{
-		static const GtkTypeInfo e_map_info =
-		{
-			"EMap",
-			sizeof (EMap),
-			sizeof (EMapClass),
-			(GtkClassInitFunc) e_map_class_init,
-			(GtkObjectInitFunc) e_map_init,
-			NULL,	/* reserved_1 */
-			NULL,	/* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		e_map_type = gtk_type_unique (GTK_TYPE_WIDGET, &e_map_info);
-	}
-
-	return e_map_type;
-}
-
-/* Class initialization function for the map view */
-
-static void
-e_map_class_init (EMapClass *class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-
-	object_class = (GtkObjectClass *) class;
-	widget_class = (GtkWidgetClass *) class;
-
-	parent_class = gtk_type_class (GTK_TYPE_WIDGET);
-
-	object_class->destroy = e_map_destroy;
-	object_class->finalize = e_map_finalize;
-
-	class->set_scroll_adjustments = e_map_set_scroll_adjustments;
-	widget_class->set_scroll_adjustments_signal = gtk_signal_new ("set_scroll_adjustments", GTK_RUN_LAST, object_class->type, GTK_SIGNAL_OFFSET (EMapClass, set_scroll_adjustments), gtk_marshal_NONE__POINTER_POINTER, GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
-
-	gtk_object_class_add_signals (object_class, e_map_signals, LAST_SIGNAL);
-
-	widget_class->unmap = e_map_unmap;
-	widget_class->realize = e_map_realize;
-	widget_class->unrealize = e_map_unrealize;
-	widget_class->size_request = e_map_size_request;
-	widget_class->size_allocate = e_map_size_allocate;
-	widget_class->draw = e_map_draw;
-	widget_class->button_press_event = e_map_button_press;
-	widget_class->button_release_event = e_map_button_release;
-	widget_class->motion_notify_event = e_map_motion;
-	widget_class->expose_event = e_map_expose;
-	widget_class->key_press_event = e_map_key_press;
-}
-
-
-/* Object initialization function for the map view */
-
-static void
-e_map_init (EMap *view)
-{
-	EMapPrivate *priv;
-
-	priv = g_new0 (EMapPrivate, 1);
-	view->priv = priv;
-
-	load_map_background (view, MAP_DIR"/world_map-960.png");
-	priv->frozen = FALSE;
-	priv->smooth_zoom = TRUE;
-	priv->zoom_state = E_MAP_ZOOMED_OUT;
-        priv->points = g_ptr_array_new ();
-
-	GTK_WIDGET_SET_FLAGS (view, GTK_CAN_FOCUS);
-	GTK_WIDGET_UNSET_FLAGS (view, GTK_NO_WINDOW);
-}
-
-
-/* Destroy handler for the map view */
-
-static void
-e_map_destroy (GtkObject *object)
-{
-	EMap *view;
-	EMapPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_E_MAP (object));
-
-	view = E_MAP (object);
-	priv = view->priv;
-
-	gtk_signal_disconnect_by_data (GTK_OBJECT (priv->hadj), view);
-	gtk_signal_disconnect_by_data (GTK_OBJECT (priv->vadj), view);
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(*GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-/* Finalize handler for the map view */
-
-static void
-e_map_finalize (GtkObject *object)
-{
-	EMap *view;
-	EMapPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_E_MAP (object));
-
-	view = E_MAP (object);
-	priv = view->priv;
-
-	gtk_object_unref (GTK_OBJECT (priv->hadj));
-	priv->hadj = NULL;
-
-	gtk_object_unref (GTK_OBJECT (priv->vadj));
-	priv->vadj = NULL;
-
-	/* TODO: Unref pixbufs here */
-
-	g_free (priv);
-	view->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->finalize)
-		(*GTK_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-
-/* Unmap handler for the map view */
-
-static void
-e_map_unmap (GtkWidget *widget)
-{
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (IS_E_MAP (widget));
-
-	if (GTK_WIDGET_CLASS (parent_class)->unmap)
-		(*GTK_WIDGET_CLASS (parent_class)->unmap) (widget);
-}
-
-
-/* Realize handler for the map view */
-
-static void
-e_map_realize (GtkWidget *widget)
-{
-	GdkWindowAttr attr;
-	int attr_mask;
-
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (IS_E_MAP (widget));
-
-	GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
-
-	attr.window_type = GDK_WINDOW_CHILD;
-	attr.x = widget->allocation.x;
-	attr.y = widget->allocation.y;
-	attr.width = widget->allocation.width;
-	attr.height = widget->allocation.height;
-	attr.wclass = GDK_INPUT_OUTPUT;
-	attr.visual = gdk_rgb_get_visual ();
-	attr.colormap = gdk_rgb_get_cmap ();
-	attr.event_mask = gtk_widget_get_events (widget) |
-	  GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_KEY_PRESS_MASK |
-	  GDK_POINTER_MOTION_MASK;
-
-	attr_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
-
-	widget->window = gdk_window_new (gtk_widget_get_parent_window (widget), &attr, attr_mask);
-	gdk_window_set_user_data (widget->window, widget);
-
-	widget->style = gtk_style_attach (widget->style, widget->window);
-
-	gdk_window_set_back_pixmap (widget->window, NULL, FALSE);
-	update_render_pixbuf (E_MAP (widget), GDK_INTERP_BILINEAR, TRUE);
-}
-
-
-/* Unrealize handler for the map view */
-
-static void
-e_map_unrealize (GtkWidget *widget)
-{
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (IS_E_MAP (widget));
-
-	if (GTK_WIDGET_CLASS (parent_class)->unrealize)
-	        (*GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
-}
-
-
-/* Size_request handler for the map view */
-
-static void
-e_map_size_request (GtkWidget *widget, GtkRequisition *requisition)
-{
-	EMap *view;
-	EMapPrivate *priv;
-
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (IS_E_MAP (widget));
-	g_return_if_fail (requisition != NULL);
-
-	view = E_MAP (widget);
-	priv = view->priv;
-
-	/* TODO: Put real sizes here. */
-
-	requisition->width = gdk_pixbuf_get_width (priv->map_pixbuf);
-	requisition->height = gdk_pixbuf_get_height (priv->map_pixbuf);
-}
-
-
-/* Size_allocate handler for the map view */
-
-static void
-e_map_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
-{
-	EMap *view;
-	EMapPrivate *priv;
-	int xofs, yofs;
-	GdkRectangle area;
-
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (IS_E_MAP (widget));
-	g_return_if_fail (allocation != NULL);
-
-	view = E_MAP (widget);
-	priv = view->priv;
-
-	xofs = priv->xofs;
-	yofs = priv->yofs;
-
-	/* Resize the window */
-
-	widget->allocation = *allocation;
-
-	if (GTK_WIDGET_REALIZED (widget))
-	{
-		gdk_window_move_resize (widget->window, allocation->x, allocation->y, allocation->width, allocation->height);
-
-		area.x = 0;
-		area.y = 0;
-		area.width = allocation->width;
-		area.height = allocation->height;
-		request_paint_area (E_MAP (widget), &area);
-	}
-
-	update_render_pixbuf (view, GDK_INTERP_BILINEAR, TRUE);
-}
-
-
-/* Draw handler for the map view */
-
-static void
-e_map_draw (GtkWidget *widget, GdkRectangle *area)
-{
-	EMap *view;
-
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (IS_E_MAP (widget));
-	g_return_if_fail (area != NULL);
-
-	view = E_MAP (widget);
-
-	request_paint_area (view, area);
-}
-
-
-/* Button press handler for the map view */
-
-static gint
-e_map_button_press (GtkWidget *widget, GdkEventButton *event)
-{
-	EMap *view;
-	EMapPrivate *priv;
-
-	view = E_MAP (widget);
-	priv = view->priv;
-
-	if (!GTK_WIDGET_HAS_FOCUS (widget)) gtk_widget_grab_focus (widget);
-	return TRUE;
-}
-
-
-/* Button release handler for the map view */
-
-static gint
-e_map_button_release (GtkWidget *widget, GdkEventButton *event)
-{
-	EMap *view;
-	EMapPrivate *priv;
-
-	view = E_MAP (widget);
-	priv = view->priv;
-
-	if (event->button != 1) return FALSE;
-
-	gdk_pointer_ungrab (event->time);
-	return TRUE;
-}
-
-
-/* Motion handler for the map view */
-
-static gint
-e_map_motion (GtkWidget *widget, GdkEventMotion *event)
-{
-	EMap *view;
-	EMapPrivate *priv;
-
-	view = E_MAP (widget);
-	priv = view->priv;
-
-	return FALSE;
-
-/*
- * if (event->is_hint)
- *   gdk_window_get_pointer(widget->window, &x, &y, &mods);
- * else
- * {
- *   x = event->x;
- *   y = event->y;
- * }
- *
- * return TRUE;
- */
-}
-
-
-/* Expose handler for the map view */
-
-static gint
-e_map_expose (GtkWidget *widget, GdkEventExpose *event)
-{
-	EMap *view;
-
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (IS_E_MAP (widget), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	view = E_MAP (widget);
-
-	request_paint_area (view, &event->area);
-	return TRUE;
-}
-
-
-/* Set_scroll_adjustments handler for the map view */
-
-static void
-e_map_set_scroll_adjustments (GtkWidget *widget, GtkAdjustment *hadj, GtkAdjustment *vadj)
-{
-	EMap *view;
-	EMapPrivate *priv;
-	gboolean need_adjust;
-
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (IS_E_MAP (widget));
-
-	view = E_MAP (widget);
-	priv = view->priv;
-
-	if (hadj) g_return_if_fail (GTK_IS_ADJUSTMENT (hadj));
-	else hadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0));
-
-	if (vadj) g_return_if_fail (GTK_IS_ADJUSTMENT (vadj));
-	else vadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0));
-
-	if (priv->hadj && priv->hadj != hadj)
-	{
-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv->hadj), view);
-		gtk_object_unref (GTK_OBJECT (priv->hadj));
-	}
-
-	if (priv->vadj && priv->vadj != vadj)
-	{
-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv->vadj), view);
-		gtk_object_unref (GTK_OBJECT (priv->vadj));
-	}
-
-	need_adjust = FALSE;
-
-	if (priv->hadj != hadj)
-	{
-		priv->hadj = hadj;
-		gtk_object_ref (GTK_OBJECT (priv->hadj));
-		gtk_object_sink (GTK_OBJECT (priv->hadj));
-
-		gtk_signal_connect (GTK_OBJECT (priv->hadj), "value_changed", GTK_SIGNAL_FUNC (adjustment_changed_cb), view);
-
-		need_adjust = TRUE;
-	}
-
-	if (priv->vadj != vadj)
-	{
-		priv->vadj = vadj;
-		gtk_object_ref (GTK_OBJECT (priv->vadj));
-		gtk_object_sink (GTK_OBJECT (priv->vadj));
-
-		gtk_signal_connect (GTK_OBJECT (priv->vadj), "value_changed", GTK_SIGNAL_FUNC (adjustment_changed_cb), view);
-
-		need_adjust = TRUE;
-	}
-
-	if (need_adjust) adjustment_changed_cb (NULL, view);
-}
-
-
-/* Key press handler for the map view */
-
-static gint
-e_map_key_press (GtkWidget *widget, GdkEventKey *event)
-{
-	EMap *view;
-	EMapPrivate *priv;
-	gboolean do_scroll;
-	int xofs, yofs;
-
-	view = E_MAP (widget);
-	priv = view->priv;
-
-	do_scroll = FALSE;
-	xofs = yofs = 0;
-
-	switch (event->keyval)
-	{
-		case GDK_Up:
-			do_scroll = TRUE;
-			xofs = 0;
-			yofs = -SCROLL_STEP_SIZE;
-			break;
-
-		case GDK_Down:
-			do_scroll = TRUE;
-			xofs = 0;
-			yofs = SCROLL_STEP_SIZE;
-			break;
-
-		case GDK_Left:
-			do_scroll = TRUE;
-			xofs = -SCROLL_STEP_SIZE;
-			yofs = 0;
-			break;
-
-		case GDK_Right:
-			do_scroll = TRUE;
-			xofs = SCROLL_STEP_SIZE;
-			yofs = 0;
-			break;
-
-		default:
-			return FALSE;
-	}
-
-	if (do_scroll)
-	{
-		int x, y;
-
-		x = CLAMP (priv->xofs + xofs, 0, priv->hadj->upper - priv->hadj->page_size);
-		y = CLAMP (priv->yofs + yofs, 0, priv->vadj->upper - priv->vadj->page_size);
-
-		scroll_to (view, x, y);
-
-		gtk_signal_handler_block_by_data (GTK_OBJECT (priv->hadj), view);
-		gtk_signal_handler_block_by_data (GTK_OBJECT (priv->vadj), view);
-
-		priv->hadj->value = x;
-		priv->vadj->value = y;
-
-		gtk_signal_emit_by_name (GTK_OBJECT (priv->hadj), "value_changed");
-		gtk_signal_emit_by_name (GTK_OBJECT (priv->vadj), "value_changed");
-
-		gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->hadj), view);
-		gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->vadj), view);
-	}
-
-	return TRUE;
-}
-
-
-/* ---------------- *
- * Widget interface *
- * ---------------- */
-
-
-/**
- * e_map_new:
- * @void: 
- * 
- * Creates a new empty map widget.
- * 
- * Return value: A newly-created map widget.
- **/
-
-EMap *
-e_map_new ()
-{
-	GtkWidget *widget;
-
-	widget = GTK_WIDGET (gtk_type_new (TYPE_E_MAP));
-	return (E_MAP (widget));
-}
-
-
-/* --- Coordinate translation --- */
-
-
-/* These functions translate coordinates between longitude/latitude and
- * the image x/y offsets, using the equidistant cylindrical projection.
- * 
- * Longitude E <-180, 180]
- * Latitude  E <-90, 90]   */
-
-void
-e_map_window_to_world (EMap *map, double win_x, double win_y, double *world_longitude, double *world_latitude)
-{
-	EMapPrivate *priv;
-	int width, height;
-
-	g_return_if_fail (map);
-
-	priv = map->priv;
-	g_return_if_fail (GTK_WIDGET_REALIZED (GTK_WIDGET (map)));
-
-	width = gdk_pixbuf_get_width (priv->map_render_pixbuf);
-	height = gdk_pixbuf_get_height (priv->map_render_pixbuf);
-
-	*world_longitude = (win_x + priv->xofs - (double) width / 2.0) /
-		((double) width / 2.0) * 180.0;
-	*world_latitude = ((double) height / 2.0 - win_y - priv->yofs) /
-		((double) height / 2.0) * 90.0;
-}
-
-
-void
-e_map_world_to_window (EMap *map, double world_longitude, double world_latitude, double *win_x, double *win_y)
-{
-	EMapPrivate *priv;
-	int width, height;
-
-	g_return_if_fail (map);
-
-	priv = map->priv;
-	g_return_if_fail (priv->map_render_pixbuf);
-	g_return_if_fail (world_longitude >= -180.0 && world_longitude <= 180.0);
-	g_return_if_fail (world_latitude >= -90.0 && world_latitude <= 90.0);
-
-	width = gdk_pixbuf_get_width (priv->map_render_pixbuf);
-	height = gdk_pixbuf_get_height (priv->map_render_pixbuf);
-
-	*win_x = (width / 2.0 + (width / 2.0) * world_longitude / 180.0) - priv->xofs;
-	*win_y = (height / 2.0 - (height / 2.0) * world_latitude / 90.0) - priv->yofs;
-
-#ifdef DEBUG
-	printf ("Map size: (%d, %d)\nCoords: (%.1f, %.1f) -> (%.1f, %.1f)\n---\n", width, height, world_longitude, world_latitude, *win_x, *win_y);
-#endif
-}
-
-
-/* --- Zoom --- */
-
-
-double
-e_map_get_magnification (EMap *map)
-{
-	EMapPrivate *priv;
-	
-	priv = map->priv;
-	if (priv->zoom_state == E_MAP_ZOOMED_IN) return 2.0;
-	else return 1.0;
-}
-
-
-void
-e_map_zoom_to_location (EMap *map, double longitude, double latitude)
-{
-	EMapPrivate *priv;
-	int width, height;
-
-	g_return_if_fail (map);
-	g_return_if_fail (GTK_WIDGET_REALIZED (GTK_WIDGET (map)));
-
-	priv = map->priv;
-
-	if (priv->zoom_state == E_MAP_ZOOMED_IN) e_map_zoom_out (map);
-	else if (priv->zoom_state != E_MAP_ZOOMED_OUT) return;
-
-	width = gdk_pixbuf_get_width (priv->map_render_pixbuf);
-	height = gdk_pixbuf_get_height (priv->map_render_pixbuf);
-
-	priv->zoom_state = E_MAP_ZOOMING_IN;
-	priv->zoom_target_long = longitude;
-	priv->zoom_target_lat = latitude;
-
-	zoom_do (map);
-}
-
-
-void
-e_map_zoom_out (EMap *map)
-{
-	EMapPrivate *priv;
-	int width, height;
-
-	g_return_if_fail (map);
-	g_return_if_fail (GTK_WIDGET_REALIZED (GTK_WIDGET (map)));
-
-	priv = map->priv;
-
-	if (priv->zoom_state != E_MAP_ZOOMED_IN) return;
-
-	width = gdk_pixbuf_get_width (priv->map_render_pixbuf);
-	height = gdk_pixbuf_get_height (priv->map_render_pixbuf);
-
-	priv->zoom_state = E_MAP_ZOOMING_OUT;
-	zoom_do (map);
-	priv->zoom_state = E_MAP_ZOOMED_OUT;
-}
-
-
-void
-e_map_set_smooth_zoom (EMap *map, gboolean state)
-{
-	((EMapPrivate *) map->priv)->smooth_zoom = state;
-}
-
-
-gboolean
-e_map_get_smooth_zoom (EMap *map)
-{
-	return (((EMapPrivate *) map->priv)->smooth_zoom);
-}
-
-
-void
-e_map_freeze (EMap *map)
-{
-	((EMapPrivate *) map->priv)->frozen = TRUE;
-}
-
-
-void
-e_map_thaw (EMap *map)
-{
-	((EMapPrivate *) map->priv)->frozen = FALSE;
-	update_and_paint (map);
-}
-
-
-/* --- Point manipulation --- */
-
-
-EMapPoint *
-e_map_add_point (EMap *map, gchar *name, double longitude, double latitude, guint32 color_rgba)
-{
-	EMapPrivate *priv;
-	EMapPoint *point;
-
-	priv = map->priv;
-	point = g_new0 (EMapPoint, 1);
-
-	point->name = name;  /* Can be NULL */
-	point->longitude = longitude;
-	point->latitude = latitude;
-	point->rgba = color_rgba;
-
-	g_ptr_array_add (priv->points, (gpointer) point);
-
-	if (!priv->frozen)
-	{
-		update_render_point (map, point);
-		repaint_point (map, point);
-	}
-
-	return point;
-}
-
-
-void
-e_map_remove_point (EMap *map, EMapPoint *point)
-{
-	EMapPrivate *priv;
-
-	priv = map->priv;
-	g_ptr_array_remove (priv->points, point);
-
-	if (!((EMapPrivate *) map->priv)->frozen)
-	{
-		/* FIXME: Re-scaling the whole pixbuf is more than a little
-		 * overkill when just one point is removed */
-
-		update_render_pixbuf (map, GDK_INTERP_BILINEAR, TRUE);
-		repaint_point (map, point);
-	}
-	
-	g_free (point);
-}
-
-
-void
-e_map_point_get_location (EMapPoint *point, double *longitude, double *latitude)
-{
-	*longitude = point->longitude;
-	*latitude = point->latitude;
-}
-
-
-gchar *
-e_map_point_get_name (EMapPoint *point)
-{
-	return point->name;
-}
-
-
-guint32
-e_map_point_get_color_rgba (EMapPoint *point)
-{
-	return point->rgba;
-}
-
-
-void
-e_map_point_set_color_rgba (EMap *map, EMapPoint *point, guint32 color_rgba)
-{
-	point->rgba = color_rgba;
-
-	if (!((EMapPrivate *) map->priv)->frozen)
-	{
-		/* TODO: Redraw area around point only */
-
-		update_render_point (map, point);
-		repaint_point (map, point);
-	}
-}
-
-
-void
-e_map_point_set_data (EMapPoint *point, gpointer data)
-{
-	point->user_data = data;
-}
-
-
-gpointer
-e_map_point_get_data (EMapPoint *point)
-{
-	return point->user_data;
-}
-
-
-gboolean
-e_map_point_is_in_view (EMap *map, EMapPoint *point)
-{
-	EMapPrivate *priv;
-	double x, y;
-
-	priv = map->priv;
-	if (!priv->map_render_pixbuf) return FALSE;
-
-	e_map_world_to_window (map, point->longitude, point->latitude, &x, &y);
-	
-	if (x >= 0 && x < GTK_WIDGET (map)->allocation.width &&
-	    y >= 0 && y < GTK_WIDGET (map)->allocation.height)
-	        return TRUE;
-	
-	return FALSE;
-}
-
-
-EMapPoint *
-e_map_get_closest_point (EMap *map, double longitude, double latitude, gboolean in_view)
-{
-	EMapPrivate *priv;
-	EMapPoint *point_chosen = NULL, *point;
-	double min_dist = 0.0, dist;
-	double dx, dy;
-	int i;
-
-	priv = map->priv;
-
-	for (i = 0; i < priv->points->len; i++)
-	{
-		point = g_ptr_array_index (priv->points, i);
-		if (in_view && !e_map_point_is_in_view (map, point)) continue;
-
-		dx = point->longitude - longitude;
-		dy = point->latitude - latitude;
-		dist = dx * dx + dy * dy;
-
-		if (!point_chosen || dist < min_dist)
-		{
-			min_dist = dist;
-			point_chosen = point;
-		}
-	}
-
-	return point_chosen;
-}
-
-
-/* ------------------ *
- * Internal functions *
- * ------------------ */
-
-
-static void
-repaint_visible (EMap *map)
-{
-	GdkRectangle area;
-
-	area.x = 0;
-	area.y = 0;
-	area.width = GTK_WIDGET (map)->allocation.width;
-	area.height = GTK_WIDGET (map)->allocation.height;
-	
-	request_paint_area (map, &area);
-}
-
-
-static void
-update_and_paint (EMap *map)
-{
-	update_render_pixbuf (map, GDK_INTERP_BILINEAR, TRUE);
-	repaint_visible (map);
-}
-
-
-static gint
-load_map_background (EMap *view, gchar *name)
-{
-	EMapPrivate *priv;
-	GdkPixbuf *pb0;
-
-	priv = view->priv;
-
-	pb0 = gdk_pixbuf_new_from_file (name);
-/*	pb0 = tool_load_image (name);*/
-	if (!pb0) return (FALSE);
-
-	if (priv->map_pixbuf) gdk_pixbuf_unref (priv->map_pixbuf);
-	priv->map_pixbuf = pb0;
-	update_render_pixbuf (view, GDK_INTERP_BILINEAR, TRUE);
-
-	return (TRUE);
-}
-
-
-#define SET_PIXEL_RGB(pixbuf, x, y, rgba) \
-  *(gdk_pixbuf_get_pixels (pixbuf) + \
-    ((gint) (y) * gdk_pixbuf_get_rowstride (pixbuf)) + \
-    ((gint) (x) * 3)) = ((rgba) >> 24) & 0xff; \
-\
-  *(gdk_pixbuf_get_pixels (pixbuf) + \
-    ((gint) (y) * gdk_pixbuf_get_rowstride (pixbuf)) + \
-    ((gint) (x) * 3) + 1) = ((rgba) >> 16) & 0xff; \
-\
-  *(gdk_pixbuf_get_pixels (pixbuf) + \
-    ((gint) (y) * gdk_pixbuf_get_rowstride (pixbuf)) + \
-    ((gint) (x) * 3) + 2) = ((rgba) >> 8) & 0xff
-
-
-static void
-update_render_pixbuf (EMap *map, ArtFilterLevel interp, gboolean render_overlays)
-{
-	EMapPrivate *priv;
-	EMapPoint *point;
-	int width, height, orig_width, orig_height;
-	double zoom;
-	int i;
-
-	if (!GTK_WIDGET_REALIZED (GTK_WIDGET (map))) return;
-
-	/* Set up value shortcuts */
-
-	priv = map->priv;
-	width = GTK_WIDGET (map)->allocation.width;
-	height = GTK_WIDGET (map)->allocation.height;
-	orig_width = gdk_pixbuf_get_width (priv->map_pixbuf);
-	orig_height = gdk_pixbuf_get_height (priv->map_pixbuf);
-
-	/* Compute scaled width and height based on the extreme dimension */
-
-	if ((double) width / orig_width > (double) height / orig_height)
-	{
-		zoom = (double) width / (double) orig_width;
-	}
-	else
-	{
-		zoom = (double) height / (double) orig_height;
-	}
-
-	if (priv->zoom_state == E_MAP_ZOOMED_IN) zoom *= 2.0;
-	height = (orig_height * zoom) + 0.5;
-	width = (orig_width * zoom) + 0.5;
-
-	/* Reallocate the pixbuf */
-
-	if (priv->map_render_pixbuf) gdk_pixbuf_unref (priv->map_render_pixbuf);
-	priv->map_render_pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE,	/* No alpha */
-						  8, width, height);
-
-	/* Scale the original map into the rendering pixbuf */
-
-	gdk_pixbuf_scale (priv->map_pixbuf, priv->map_render_pixbuf, 0, 0,	/* Dest (x, y) */
-			  width, height, 0, 0,	/* Offset (x, y) */
-			  zoom, zoom,	/* Scale (x, y) */
-			  interp);
-	
-	if (render_overlays)
-	{
-		/* Add points */
-
-		for (i = 0; i < priv->points->len; i++)
-		{
-			point = g_ptr_array_index (priv->points, i);
-			update_render_point (map, point);
-		}
-	}
-
-	/* Compute image offsets with respect to window */
-
-	set_scroll_area (map);
-}
-
-
-/* Queues a repaint of the specified area in window coordinates */
-
-static void
-request_paint_area (EMap *view, GdkRectangle *area)
-{
-	EMapPrivate *priv;
-	int width, height;
-
-	if (!GTK_WIDGET_DRAWABLE (GTK_WIDGET (view)) ||
-	    !GTK_WIDGET_REALIZED (GTK_WIDGET (view))) return;
-
-	priv = view->priv;
-	if (!priv->map_render_pixbuf) return;
-
-	width = MIN (area->width, E_MAP_GET_WIDTH (view));
-	height = MIN (area->height, E_MAP_GET_HEIGHT (view));
-
-	/* This satisfies paranoia. To be removed */
-
-	if (priv->xofs + width > gdk_pixbuf_get_width (priv->map_render_pixbuf))
-		width = gdk_pixbuf_get_width (priv->map_render_pixbuf) - priv->xofs;
-
-	if (priv->yofs + height > gdk_pixbuf_get_height (priv->map_render_pixbuf))
-		height = gdk_pixbuf_get_height (priv->map_render_pixbuf) - priv->yofs;
-  
-	/* We rely on the fast case always being the case, since we load and
-   * preprocess the source pixbuf ourselves */
-
-	if (gdk_pixbuf_get_colorspace (priv->map_render_pixbuf) == GDK_COLORSPACE_RGB && !gdk_pixbuf_get_has_alpha (priv->map_render_pixbuf) &&
-	    gdk_pixbuf_get_bits_per_sample (priv->map_render_pixbuf) == 8)
-	{
-		guchar *pixels;
-		int rowstride;
-
-		rowstride = gdk_pixbuf_get_rowstride (priv->map_render_pixbuf);
-		pixels = gdk_pixbuf_get_pixels (priv->map_render_pixbuf) + (area->y + priv->yofs) * rowstride + 3 * (area->x + priv->xofs);
-		gdk_draw_rgb_image_dithalign (GTK_WIDGET (view)->window, GTK_WIDGET (view)->style->black_gc, area->x, area->y, width, height, GDK_RGB_DITHER_NORMAL, pixels, rowstride, 0, 0);
-		return;
-	}
-
-#ifdef DEBUG
-	g_print ("Doing hard redraw.\n");
-#endif
-}
-
-
-/* Redraw point in client pixbuf */
-
-static void
-update_render_point (EMap *map, EMapPoint *point)
-{
-	EMapPrivate *priv;
-	GdkPixbuf *pb;
-	int width, height;
-	double px, py;
-
-	priv = map->priv;
-	pb = priv->map_render_pixbuf;
-	if (!pb) return;
-
-	width = gdk_pixbuf_get_width (pb);
-	height = gdk_pixbuf_get_height (pb);
-
-	e_map_world_to_window (map, point->longitude, point->latitude, &px, &py);
-	px += priv->xofs;
-	py += priv->yofs;
-
-	if (px < width && px >= 0 && py < height && py >= 0)
-	{
-		/* Area */
-		
-		SET_PIXEL_RGB (pb, px, py, point->rgba);
-		if (px > 0) SET_PIXEL_RGB (pb, px - 1, py, point->rgba);
-		if (px < width - 1) SET_PIXEL_RGB (pb, px + 1, py, point->rgba);
-		if (py > 0) SET_PIXEL_RGB (pb, px, py - 1, point->rgba);
-		if (py < height - 1) SET_PIXEL_RGB (pb, px, py + 1, point->rgba);
-
-		/* Outline */
-
-		if (px > 1) SET_PIXEL_RGB (pb, px - 2, py, 0x000000ff);
-		if (px < width - 2) SET_PIXEL_RGB (pb, px + 2, py, 0x000000ff);
-		if (py > 1) SET_PIXEL_RGB (pb, px, py - 2, 0x000000ff);
-		if (py < height - 2) SET_PIXEL_RGB (pb, px, py + 2, 0x000000ff);
-		if (px > 0 && py > 0) SET_PIXEL_RGB (pb, px - 1, py - 1, 0x000000ff);
-		if (px > 0 && py < height - 1) SET_PIXEL_RGB (pb, px - 1, py + 1, 0x000000ff);
-		if (px < width - 1 && py > 0) SET_PIXEL_RGB (pb, px + 1, py - 1, 0x000000ff);
-		if (px < width - 1 && py < height - 1) SET_PIXEL_RGB (pb, px + 1, py + 1, 0x000000ff);
-	}
-}
-
-
-/* Repaint point on X server */
-
-static void
-repaint_point (EMap *map, EMapPoint *point)
-{
-	EMapPrivate *priv;
-	GdkRectangle area;
-	double px, py;
-
-	if (!e_map_point_is_in_view (map, point)) return; 
-	priv = map->priv;
-
-	e_map_world_to_window (map, point->longitude, point->latitude, &px, &py);
-
-	area.x = (int) px - 2;
-	area.y = (int) py - 2;
-	area.width = 5;
-	area.height = 5;
-	request_paint_area (map, &area);
-}
-
-
-static void
-center_at (EMap *map, int x, int y, gboolean scroll)
-{
-	EMapPrivate *priv;
-	int pb_width, pb_height,
-	    view_width, view_height;
-
-	priv = map->priv;
-
-	pb_width = E_MAP_GET_WIDTH (map);
-	pb_height = E_MAP_GET_HEIGHT (map);
-
-	view_width = GTK_WIDGET (map)->allocation.width;
-	view_height = GTK_WIDGET (map)->allocation.height;
-
-	x = CLAMP (x - (view_width / 2), 0, pb_width - view_width);
-	y = CLAMP (y - (view_height / 2), 0, pb_height - view_height);
-
-	if (scroll) scroll_to (map, x, y);
-	else
-	{
-		priv->xofs = x;
-		priv->yofs = y;
-	}
-}
-
-
-static void
-smooth_center_at (EMap *map, int x, int y)
-{
-	EMapPrivate *priv;
-	int pb_width, pb_height,
-	    view_width, view_height;
-	int dx, dy;
-
-	priv = map->priv;
-
-	pb_width = E_MAP_GET_WIDTH (map);
-	pb_height = E_MAP_GET_HEIGHT (map);
-
-	view_width = GTK_WIDGET (map)->allocation.width;
-	view_height = GTK_WIDGET (map)->allocation.height;
-
-	x = CLAMP (x - (view_width / 2), 0, pb_width - view_width);
-	y = CLAMP (y - (view_height / 2), 0, pb_height - view_height);
-
-	for (;;)
-	{
-		if (priv->xofs == x && priv->yofs == y) break;
-
-		dx = (x < priv->xofs) ? -1 : (x > priv->xofs) ? 1 : 0;
-		dy = (y < priv->yofs) ? -1 : (y > priv->yofs) ? 1 : 0;
-    
-		scroll_to (map, priv->xofs + dx, priv->yofs + dy);
-	}
-}
-
-
-/* Scrolls the view to the specified offsets.  Does not perform range checking!  */
-
-static void
-scroll_to (EMap *view, int x, int y)
-{
-	EMapPrivate *priv;
-	int xofs, yofs;
-	GdkWindow *window;
-	GdkGC *gc;
-	int width, height;
-	int src_x, src_y;
-	int dest_x, dest_y;
-	GdkEvent *event;
-
-	priv = view->priv;
-
-	/* Compute offsets and check bounds */
-
-	xofs = x - priv->xofs;
-	yofs = y - priv->yofs;
-
-	if (xofs == 0 && yofs == 0) return;
-
-	priv->xofs = x;
-	priv->yofs = y;
-
-	if (!GTK_WIDGET_DRAWABLE (view)) return;
-
-	width = GTK_WIDGET (view)->allocation.width;
-	height = GTK_WIDGET (view)->allocation.height;
-
-	if (abs (xofs) >= width || abs (yofs) >= height)
-	{
-		GdkRectangle area;
-
-		area.x = 0;
-		area.y = 0;
-		area.width = width;
-		area.height = height;
-
-		request_paint_area (view, &area);
-		return;
-	}
-
-	window = GTK_WIDGET (view)->window;
-
-	/* Copy the window area */
-
-	src_x = xofs < 0 ? 0 : xofs;
-	src_y = yofs < 0 ? 0 : yofs;
-	dest_x = xofs < 0 ? -xofs : 0;
-	dest_y = yofs < 0 ? -yofs : 0;
-
-	gc = gdk_gc_new (window);
-	gdk_gc_set_exposures (gc, TRUE);
-
-	gdk_window_copy_area (window, gc, dest_x, dest_y, window, src_x, src_y, width - abs (xofs), height - abs (yofs));
-
-	gdk_gc_destroy (gc);
-
-	/* Add the scrolled-in region */
-
-	if (xofs)
-	{
-		GdkRectangle r;
-
-		r.x = xofs < 0 ? 0 : width - xofs;
-		r.y = 0;
-		r.width = abs (xofs);
-		r.height = height;
-
-		request_paint_area (view, &r);
-	}
-
-	if (yofs)
-	{
-		GdkRectangle r;
-
-		r.x = 0;
-		r.y = yofs < 0 ? 0 : height - yofs;
-		r.width = width;
-		r.height = abs (yofs);
-
-		request_paint_area (view, &r);
-	}
-
-	/* Process graphics exposures */
-
-	while ((event = gdk_event_get_graphics_expose (window)) != NULL)
-	{
-		gtk_widget_event (GTK_WIDGET (view), event);
-
-		if (event->expose.count == 0)
-		{
-			gdk_event_free (event);
-			break;
-		}
-
-		gdk_event_free (event);
-	}
-}
-
-
-static int divide_seq[] =
-{
-	/* Dividends for divisor of 2 */
-
-	-2,
-
-	1,
-
-	/* Dividends for divisor of 4 */
-
-	-4,
-
-	1, 3,
-
-	/* Dividends for divisor of 8 */
-
-	-8,
-
-	1, 5, 3, 7,
-
-	/* Dividends for divisor of 16 */
-
-	-16,
-
-	1, 9, 5, 13, 3, 11, 7, 15,
-
-	/* Dividends for divisor of 32 */
-
-	-32,
-
-	1, 17, 9, 25, 5, 21, 13, 29, 3, 19,
-	11, 27, 7, 23, 15, 31,
-
-	/* Dividends for divisor of 64 */
-
-	-64,
-
-	1, 33, 17, 49, 9, 41, 25, 57, 5, 37,
-	21, 53, 13, 45, 29, 61, 3, 35, 19, 51,
-	11, 43, 27, 59, 7, 39, 23, 55, 15, 47,
-	31, 63,
-
-	/* Dividends for divisor of 128 */
-
-	-128,
-
-	1, 65, 33, 97, 17, 81, 49, 113, 9, 73,
-	41, 105, 25, 89, 57, 121, 5, 69, 37, 101,
-	21, 85, 53, 117, 13, 77, 45, 109, 29, 93,
-	61, 125, 3, 67, 35, 99, 19, 83, 51, 115,
-	11, 75, 43, 107, 27, 91, 59, 123, 7, 71,
-	39, 103, 23, 87, 55, 119, 15, 79, 47, 111,
-	31, 95, 63, 127,
-
-	/* Dividends for divisor of 256 */
-
-	-256,
-
-	1, 129, 65, 193, 33, 161, 97, 225, 17, 145,
-	81, 209, 49, 177, 113, 241, 9, 137, 73, 201,
-	41, 169, 105, 233, 25, 153, 89, 217, 57, 185,
-	121, 249, 5, 133, 69, 197, 37, 165, 101, 229,
-	21, 149, 85, 213, 53, 181, 117, 245, 13, 141,
-	77, 205, 45, 173, 109, 237, 29, 157, 93, 221,
-	61, 189, 125, 253, 3, 131, 67, 195, 35, 163,
-	99, 227, 19, 147, 83, 211, 51, 179, 115, 243,
-	11, 139, 75, 203, 43, 171, 107, 235, 27, 155,
-	91, 219, 59, 187, 123, 251, 7, 135, 71, 199,
-	39, 167, 103, 231, 23, 151, 87, 215, 55, 183,
-	119, 247, 15, 143, 79, 207, 47, 175, 111, 239,
-	31, 159, 95, 223, 63, 191, 127, 255,
-
-	0
-};
-
-
-typedef enum
-{
-	AXIS_X,
-	AXIS_Y
-}
-AxisType;
-
-
-static void
-blowup_window_area (GdkWindow *window, gint area_x, gint area_y, gint target_x, gint target_y, gint total_width, gint total_height, gfloat zoom_factor)
-{
-	GdkGC *gc;
-	AxisType strong_axis;
-	gfloat axis_factor, axis_counter;
-	gint zoom_chunk;
-	gint divisor_width = 0, divisor_height = 0;
-	gint divide_width_index, divide_height_index;
-	gint area_width, area_height;
-	gint i, j;
-	int line;
-
-
-	/* Set up the GC we'll be using */
-
-	gc = gdk_gc_new (window);
-	gdk_gc_set_exposures (gc, FALSE);
-
-	/* Get area constraints */
-
-	gdk_window_get_size (window, &area_width, &area_height);
-
-	/* Initialize area division array indexes */
-
-	divide_width_index = divide_height_index = 0;
-
-	/* Initialize axis counter */
-
-	axis_counter = 0.0;
-
-	/* Find the strong axis (which is the basis for iteration) and the ratio
-	 * at which the other axis will be scaled.
-	 *
-	 * Also determine how many lines to expand in one fell swoop, and store
-	 * this figure in zoom_chunk. */
-
-	if (area_width > area_height)
-	{
-		strong_axis = AXIS_X;
-		axis_factor = (double) area_height / (double) area_width;
-		zoom_chunk = MAX (1, area_width / 250);
-		i = (area_width * (zoom_factor - 1.0)) / zoom_chunk;
-	}
-	else
-	{
-		strong_axis = AXIS_Y;
-		axis_factor = (double) area_width / (double) area_height;
-		zoom_chunk = MAX (1, area_height / 250);
-		i = (area_height * (zoom_factor - 1.0)) / zoom_chunk;
-	}
-
-	/* Go, go, devil bunnies! Gogo devil bunnies! */
-
-	for (; i > 0; i--)
-	{
-		/* Reset division sequence table indexes as necessary */
-
-		if (!divide_seq[divide_width_index]) divide_width_index = 0;
-		if (!divide_seq[divide_height_index]) divide_height_index = 0;
-
-		/* Set new divisor if found in table */
-
-		if (divide_seq[divide_width_index] < 0)
-			divisor_width = abs (divide_seq[divide_width_index++]);
-		if (divide_seq[divide_height_index] < 0)
-			divisor_height = abs (divide_seq[divide_height_index++]);
-
-		/* Widen */
-
-		if (strong_axis == AXIS_X || axis_counter >= 1.0)
-		{
-			line = ((divide_seq[divide_width_index] * area_width) / divisor_width) + 0.5;
-
-			if ((line < target_x && target_x > area_width / 2) || (line > target_x && target_x > (area_width / 2) + zoom_chunk))
-			{
-				/* Push left */
-
-				for (j = 0; j < zoom_chunk - 1; j++)
-					gdk_window_copy_area (window, gc, line + j + 1, 0, window, line, 0, 1, area_height);
-
-				gdk_window_copy_area (window, gc, 0, 0, window, zoom_chunk, 0, line, area_height);
-				if (line > target_x) target_x -= zoom_chunk;
-			}
-			else
-			{
-				/* Push right */
-
-				for (j = 0; j < zoom_chunk - 1; j++)
-					gdk_window_copy_area (window, gc, line + j - (zoom_chunk - 1), 0, window, line - zoom_chunk, 0, 1, area_height);
-
-				gdk_window_copy_area (window, gc, line, 0, window, line - zoom_chunk, 0, area_width - line, area_height);
-				if (line < target_x) target_x += zoom_chunk;
-			}
-		}
-
-		if (strong_axis == AXIS_Y || axis_counter >= 1.0)
-		{
-			/* Heighten */
-
-			line = ((divide_seq[divide_height_index] * area_height) / divisor_height) + 0.5;
-
-			if ((line < target_y && target_y > area_height / 2) || (line > target_y && target_y > (area_height / 2) + zoom_chunk))
-			{
-				/* Push up */
-
-				for (j = 0; j < zoom_chunk - 1; j++)
-					gdk_window_copy_area (window, gc, 0, line + j + 1, window, 0, line, area_width, 1);
-
-				gdk_window_copy_area (window, gc, 0, 0, window, 0, zoom_chunk, area_width, line);
-				if (line > target_y) target_y -= zoom_chunk;
-			}
-			else
-			{
-				/* Push down */
-
-				for (j = 0; j < zoom_chunk - 1; j++)
-					gdk_window_copy_area (window, gc, 0, line + j - (zoom_chunk - 1), window, 0, line - zoom_chunk, area_width, 1);
-
-				gdk_window_copy_area (window, gc, 0, line, window, 0, line - zoom_chunk, area_width, area_height - line);
-				if (line < target_y) target_y += zoom_chunk;
-			}
-		}
-
-		divide_width_index++;
-		divide_height_index++;
-		if (axis_counter >= 1.0) axis_counter -= 1.0;
-		axis_counter += axis_factor;
-	}
-
-	/* Free our GC */
-
-	gdk_gc_destroy (gc);
-}
-
-
-static void
-zoom_in_smooth (EMap *map)
-{
-	GdkRectangle area;
-	EMapPrivate *priv;
-	GdkWindow *window;
-	int width, height;
-	int win_width, win_height;
-	int target_width, target_height;
-	double x, y;
-
-	g_return_if_fail (map);
-	g_return_if_fail (GTK_WIDGET_REALIZED (GTK_WIDGET (map)));
-
-	area.x = 0;
-	area.y = 0;
-	area.width = GTK_WIDGET (map)->allocation.width;
-	area.height = GTK_WIDGET (map)->allocation.height;
-
-	priv = map->priv;
-	window = GTK_WIDGET (map)->window;
-	width = gdk_pixbuf_get_width (priv->map_render_pixbuf);
-	height = gdk_pixbuf_get_height (priv->map_render_pixbuf);
-	win_width = GTK_WIDGET (map)->allocation.width;
-	win_height = GTK_WIDGET (map)->allocation.height;
-	target_width = win_width / 4;
-	target_height = win_height / 4;
-
-	/* Center the target point as much as possible */
-  
-	e_map_world_to_window (map, priv->zoom_target_long, priv->zoom_target_lat, &x, &y);
-	smooth_center_at (map, x + priv->xofs, y + priv->yofs);
-
-	/* Render and paint a temporary map without overlays, so they don't get in
-	 * the way (look ugly) while zooming */
-  
-	update_render_pixbuf (map, GDK_INTERP_BILINEAR, FALSE);
-	request_paint_area (map, &area);
-  
-	/* Find out where in the area we're going to zoom to */
-
-	e_map_world_to_window (map, priv->zoom_target_long, priv->zoom_target_lat, &x, &y);
-  
-	/* Pre-render the zoomed-in map, so we can put it there quickly when the
-	 * blowup sequence ends */
-  
-	priv->zoom_state = E_MAP_ZOOMED_IN;
-	update_render_pixbuf (map, GDK_INTERP_BILINEAR, TRUE);
-  
-	/* Do the blowup */
-  
-	blowup_window_area (window, priv->xofs, priv->yofs, x, y, width, height, 1.68);
-
-	/* Set new scroll offsets and paint the zoomed map */
-  
-	e_map_world_to_window (map, priv->zoom_target_long, priv->zoom_target_lat, &x, &y);
-	priv->xofs = CLAMP (priv->xofs + x - area.width / 2.0, 0, E_MAP_GET_WIDTH (map) - area.width);
-	priv->yofs = CLAMP (priv->yofs + y - area.height / 2.0, 0, E_MAP_GET_HEIGHT (map) - area.height);
-
-	request_paint_area (map, &area);
-}
-
-
-static void
-zoom_in (EMap *map)
-{
-	GdkRectangle area;
-	EMapPrivate *priv;
-	double x, y;
-
-	priv = map->priv;
-
-	area.x = 0;
-	area.y = 0;
-	area.width = GTK_WIDGET (map)->allocation.width;
-	area.height = GTK_WIDGET (map)->allocation.height;
-
-	priv->zoom_state = E_MAP_ZOOMED_IN;
-
-	update_render_pixbuf (map, GDK_INTERP_BILINEAR, TRUE);
-
-	e_map_world_to_window (map, priv->zoom_target_long, priv->zoom_target_lat, &x, &y);
-	priv->xofs = CLAMP (priv->xofs + x - area.width / 2.0, 0, E_MAP_GET_WIDTH (map) - area.width);
-	priv->yofs = CLAMP (priv->yofs + y - area.height / 2.0, 0, E_MAP_GET_HEIGHT (map) - area.height);
-
-	request_paint_area (map, &area);
-}
-
-
-static void
-zoom_out (EMap *map)
-{
-	GdkRectangle area;
-	EMapPrivate *priv;
-	double longitude, latitude;
-	double x, y;
-
-	priv = map->priv;
-
-	area.x = 0;
-	area.y = 0;
-	area.width = GTK_WIDGET (map)->allocation.width;
-	area.height = GTK_WIDGET (map)->allocation.height;
-
-	/* Must be done before update_render_pixbuf() */
-
-	e_map_window_to_world (map, area.width / 2, area.height / 2,
-			       &longitude, &latitude);
-
-	priv->zoom_state = E_MAP_ZOOMED_OUT;
-	update_render_pixbuf (map, GDK_INTERP_BILINEAR, TRUE);
-
-	e_map_world_to_window (map, longitude, latitude, &x, &y);
-	center_at (map, x + priv->xofs, y + priv->yofs, FALSE);
-/*	request_paint_area (map, &area); */
-	repaint_visible (map);
-}
-
-
-static void
-zoom_do (EMap *map)
-{
-	EMapPrivate *priv;
-
-	priv = map->priv;
-
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->hadj), map);
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->vadj), map);
-
-	if (priv->zoom_state == E_MAP_ZOOMING_IN)
-	{
-		if (e_map_get_smooth_zoom (map)) zoom_in_smooth (map);
-		else zoom_in (map);
-	}
-	else if (priv->zoom_state == E_MAP_ZOOMING_OUT)
-	{
-/*    if (e_map_get_smooth_zoom(map)) zoom_out_smooth(map); */
-		zoom_out (map);
-	}
-  
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->hadj), map);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->vadj), map);
-
-	set_scroll_area(map);
-}
-
-
-/* Callback used when an adjustment is changed */
-
-static void
-adjustment_changed_cb (GtkAdjustment *adj, gpointer data)
-{
-	EMap *view;
-	EMapPrivate *priv;
-
-	view = E_MAP (data);
-	priv = view->priv;
-
-	scroll_to (view, priv->hadj->value, priv->vadj->value);
-}
-
-
-static void
-set_scroll_area (EMap *view)
-{
-	EMapPrivate *priv;
-
-	priv = view->priv;
-
-	if (!GTK_WIDGET_REALIZED (GTK_WIDGET (view))) return;
-	if (!priv->hadj || !priv->vadj) return;
-
-	/* Set scroll increments */
-
-	priv->hadj->page_size = GTK_WIDGET (view)->allocation.width;
-	priv->hadj->page_increment = GTK_WIDGET (view)->allocation.width / 2;
-	priv->hadj->step_increment = SCROLL_STEP_SIZE;
-
-	priv->vadj->page_size = GTK_WIDGET (view)->allocation.height;
-	priv->vadj->page_increment = GTK_WIDGET (view)->allocation.height / 2;
-	priv->vadj->step_increment = SCROLL_STEP_SIZE;
-
-	/* Set scroll bounds and new offsets */
-
-	priv->hadj->lower = 0;
-	if (priv->map_render_pixbuf)
-		priv->hadj->upper = gdk_pixbuf_get_width (priv->map_render_pixbuf);
-
-	priv->vadj->lower = 0;
-	if (priv->map_render_pixbuf)
-		priv->vadj->upper = gdk_pixbuf_get_height (priv->map_render_pixbuf);
-
-	gtk_signal_emit_by_name (GTK_OBJECT (priv->hadj), "changed");
-	gtk_signal_emit_by_name (GTK_OBJECT (priv->vadj), "changed");
-
-	priv->xofs = CLAMP (priv->xofs, 0, priv->hadj->upper - priv->hadj->page_size);
-	priv->yofs = CLAMP (priv->yofs, 0, priv->vadj->upper - priv->vadj->page_size);
-
-	if (priv->hadj->value != priv->xofs)
-	{
-		priv->hadj->value = priv->xofs;
-
-		gtk_signal_handler_block_by_data (GTK_OBJECT (priv->hadj), view);
-		gtk_signal_emit_by_name (GTK_OBJECT (priv->hadj), "value_changed");
-		gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->hadj), view);
-	}
-
-	if (priv->vadj->value != priv->yofs)
-	{
-		priv->vadj->value = priv->yofs;
-
-		gtk_signal_handler_block_by_data (GTK_OBJECT (priv->vadj), view);
-		gtk_signal_emit_by_name (GTK_OBJECT (priv->vadj), "value_changed");
-		gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->vadj), view);
-	}
-}
diff --git a/widgets/misc/e-map.h b/widgets/misc/e-map.h
deleted file mode 100644
index df914bec72..0000000000
--- a/widgets/misc/e-map.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Map widget.
- *
- * Copyright (C) 2000-2001 Ximian, Inc.
- *
- * Authors: Hans Petter Jansson <hpj@ximian.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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.
- */
-
-#ifndef E_MAP_H
-#define E_MAP_H
-
-#include <libgnome/gnome-defs.h>
-#include <gtk/gtkwidget.h>
-
-#define TYPE_E_MAP            (e_map_get_type ())
-#define E_MAP(obj)            (GTK_CHECK_CAST ((obj), TYPE_E_MAP, EMap))
-#define E_MAP_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_E_MAP, EMapClass))
-#define IS_E_MAP(obj)         (GTK_CHECK_TYPE ((obj), TYPE_E_MAP))
-#define IS_E_MAP_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_E_MAP))
-
-typedef struct _EMap EMap;
-typedef struct _EMapClass EMapClass;
-typedef struct _EMapPoint EMapPoint;
-
-struct _EMap
-{
-	GtkWidget widget;
-
-	/* Private data */
-	gpointer priv;
-};
-
-struct _EMapClass
-{
-	GtkWidgetClass parent_class;
-
-	/* Notification signals */
-	void (*zoom_fit) (EMap * view);
-
-	/* GTK+ scrolling interface */
-	void (*set_scroll_adjustments) (GtkWidget * widget,
-					GtkAdjustment * hadj,
-					GtkAdjustment * vadj);
-};
-
-/* The definition of Dot */
-
-struct _EMapPoint
-{
-	gchar *name;  /* Can be NULL */
-	double longitude, latitude;
-	guint32 rgba;
-	gpointer user_data;
-};
-
-
-/* --- Widget --- */
-
-GtkType e_map_get_type (void);
-
-EMap *e_map_new (void);
-
-/* Stop doing redraws when map data changes (e.g. by modifying points) */
-void e_map_freeze (EMap *map);
-
-/* Do an immediate repaint, and start doing realtime repaints again */
-void e_map_thaw (EMap *map);
-
-/* --- Coordinate translation --- */
-
-/* Translates window-relative coords to lat/long */
-void e_map_window_to_world (EMap *map,
-			    double win_x, double win_y,
-			    double *world_longitude, double *world_latitude);
-
-/* Translates lat/long to window-relative coordinates. Note that the
- * returned coordinates can be negative or greater than the current size
- * of the allocation area */
-void e_map_world_to_window (EMap *map,
-			    double world_longitude, double world_latitude,
-			    double *win_x, double *win_y);
-
-/* --- Zoom --- */
-
-double e_map_get_magnification (EMap *map);
-
-/* Pass TRUE if we want the smooth zoom hack */
-void e_map_set_smooth_zoom (EMap *map, gboolean state);
-
-/* TRUE if smooth zoom hack will be employed */
-gboolean e_map_get_smooth_zoom (EMap *map);
-
-/* NB: Function definition will change shortly */
-void e_map_zoom_to_location (EMap *map, double longitude, double latitude);
-
-/* Zoom to mag factor 1.0 */
-void e_map_zoom_out (EMap *map);
-
-/* --- Points --- */
-
-EMapPoint *e_map_add_point (EMap *map, gchar *name,
-			    double longitude, double latitude,
-			    guint32 color_rgba);
-
-void e_map_remove_point (EMap *map, EMapPoint *point);
-
-void e_map_point_get_location (EMapPoint *point,
-			       double *longitude, double *latitude);
-
-gchar *e_map_point_get_name (EMapPoint *point);
-
-guint32 e_map_point_get_color_rgba (EMapPoint *point);
-
-void e_map_point_set_color_rgba (EMap *map, EMapPoint *point, guint32 color_rgba);
-
-void e_map_point_set_data (EMapPoint *point, gpointer data);
-
-gpointer e_map_point_get_data (EMapPoint *point);
-
-gboolean e_map_point_is_in_view (EMap *map, EMapPoint *point);
-
-EMapPoint *e_map_get_closest_point (EMap *map, double longitude, double latitude,
-				    gboolean in_view);
-
-#endif
diff --git a/widgets/misc/e-messagebox.c b/widgets/misc/e-messagebox.c
deleted file mode 100644
index 6549476e1d..0000000000
--- a/widgets/misc/e-messagebox.c
+++ /dev/null
@@ -1,356 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Original Author: Jay Painter
- *  Modified: Jeffrey Stedfast
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  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 Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#include <config.h>
-#include <stdarg.h>
-#include <string.h> /* for strcmp */
-
-#include <glib.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-triggers.h>
-#include <libgnome/gnome-util.h>
-#include <libgnomeui/gnome-pixmap.h>
-#include <libgnomeui/gnome-uidefs.h>
-#include "e-messagebox.h"
-
-#define E_MESSAGE_BOX_WIDTH  425
-#define E_MESSAGE_BOX_HEIGHT 125
-
-struct _EMessageBoxPrivate {
-	GtkWidget *label;
-	GtkWidget *checkbox;
-};
-
-static void e_message_box_class_init (EMessageBoxClass *klass);
-static void e_message_box_init       (EMessageBox *messagebox);
-static void e_message_box_destroy    (GtkObject *object);
-static void e_message_box_finalize   (GtkObject *object);
-
-static GnomeDialogClass *parent_class;
-
-GtkType
-e_message_box_get_type (void)
-{
-	static GtkType message_box_type = 0;
-	
-	if (!message_box_type) {
-		GtkTypeInfo message_box_info = {
-			"EMessageBox",
-			sizeof (EMessageBox),
-			sizeof (EMessageBoxClass),
-			(GtkClassInitFunc) e_message_box_class_init,
-			(GtkObjectInitFunc) e_message_box_init,
-			NULL,
-			NULL
-		};
-		
-		message_box_type = gtk_type_unique (gnome_dialog_get_type (), &message_box_info);
-	}
-	
-	return message_box_type;
-}
-
-static void
-e_message_box_class_init (EMessageBoxClass *klass)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = (GtkObjectClass *)klass;
-	parent_class = gtk_type_class (gnome_dialog_get_type ());
-	
-	object_class->destroy = e_message_box_destroy;
-	object_class->finalize = e_message_box_finalize;
-}
-
-static void
-e_message_box_init (EMessageBox *message_box)
-{
-	message_box->_priv = g_new0 (EMessageBoxPrivate, 1); 
-}
-
-static void
-e_message_box_destroy (GtkObject *object)
-{
-	/* remember, destroy can be run multiple times! */
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void
-e_message_box_finalize (GtkObject *object)
-{
-	EMessageBox *mbox = E_MESSAGE_BOX (object);
-	
-	g_free (mbox->_priv);
-	mbox->_priv = NULL;
-	
-	if (GTK_OBJECT_CLASS (parent_class)->finalize)
-		(* GTK_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-/**
- * e_message_box_construct:
- * @messagebox: The message box to construct
- * @message: The message to be displayed.
- * @message_box_type: The type of the message
- * @buttons: a NULL terminated array with the buttons to insert.
- *
- * For language bindings or subclassing, from C use #e_message_box_new or
- * #e_message_box_newv
- *
- * Returns:
- */
-void
-e_message_box_construct (EMessageBox *messagebox,
-			 const gchar *message,
-			 const gchar *message_box_type,
-			 const gchar **buttons)
-{
-	GtkWidget *hbox;
-	GtkWidget *pixmap = NULL;
-	GtkWidget *alignment;
-	char *s;
-	GtkStyle *style;
-        const gchar* title = NULL;
-	gint i = 0;
-	
-	g_return_if_fail (messagebox != NULL);
-	g_return_if_fail (E_IS_MESSAGE_BOX (messagebox));
-	g_return_if_fail (message != NULL);
-	g_return_if_fail (message_box_type != NULL);
-	
-	style = gtk_widget_get_style (GTK_WIDGET (messagebox));
-	
-	/* Make noises, basically */
-	gnome_triggers_vdo (message, message_box_type, NULL);
-	
-	if (strcmp (E_MESSAGE_BOX_INFO, message_box_type) == 0) {
-                title = _("Information");
-		s = gnome_unconditional_pixmap_file("gnome-info.png");
-		if (s) {
-                        pixmap = gnome_pixmap_new_from_file (s);
-                        g_free(s);
-                }
-	} else if (strcmp (E_MESSAGE_BOX_WARNING, message_box_type) == 0) {
-                title = _("Warning");
-		s = gnome_unconditional_pixmap_file ("gnome-warning.png");
-		if (s) {
-                        pixmap = gnome_pixmap_new_from_file (s);
-                        g_free (s);
-                }
-	} else if (strcmp (E_MESSAGE_BOX_ERROR, message_box_type) == 0) {
-                title = _("Error");
-		s = gnome_unconditional_pixmap_file ("gnome-error");
-		if (s) {
-                        pixmap = gnome_pixmap_new_from_file (s);
-                        g_free(s);
-                }
-	} else if (strcmp (E_MESSAGE_BOX_QUESTION, message_box_type) == 0) {
-                title = _("Question");
-		s = gnome_unconditional_pixmap_file ("gnome-question.png");
-		if (s) {
-                        pixmap = gnome_pixmap_new_from_file (s);
-                        g_free (s);
-                }
-	} else {
-                title = _("Message");
-	}
-	
-        g_assert (title != NULL);
-	
-	gtk_window_set_title (GTK_WINDOW (messagebox), title);
-	
-	hbox = gtk_hbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (messagebox)->vbox),
-			    hbox, TRUE, TRUE, 10);
-	gtk_widget_show (hbox);
-	
-	if ((pixmap == NULL) || (GNOME_PIXMAP (pixmap)->pixmap == NULL)) {
-        	if (pixmap)
-			gtk_widget_destroy (pixmap);
-		s = gnome_unconditional_pixmap_file ("gnome-default.png");
-         	if (s) {
-			pixmap = gnome_pixmap_new_from_file (s);
-                        g_free (s);
-                } else
-			pixmap = NULL;
-	}
-	if (pixmap) {
-		gtk_box_pack_start (GTK_BOX (hbox), pixmap, FALSE, TRUE, 0);
-		gtk_widget_show (pixmap);
-	}
-	
-	messagebox->_priv->label = gtk_label_new (message);
-	gtk_label_set_justify (GTK_LABEL (messagebox->_priv->label), GTK_JUSTIFY_LEFT);
-        gtk_label_set_line_wrap (GTK_LABEL (messagebox->_priv->label), TRUE);
-	gtk_misc_set_padding (GTK_MISC (messagebox->_priv->label), GNOME_PAD, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), messagebox->_priv->label, TRUE, TRUE, 0);
-	gtk_widget_show (messagebox->_priv->label);
-	
-	/* Add some extra space on the right to balance the pixmap */
-	if (pixmap) {
-		alignment = gtk_alignment_new (0., 0., 0., 0.);
-		gtk_widget_set_usize (alignment, GNOME_PAD, -1);
-		gtk_widget_show (alignment);
-		
-		gtk_box_pack_start (GTK_BOX (hbox), alignment, FALSE, FALSE, 0);
-	}
-	
-	/* Add the "Don't show this message again." checkbox */
-	messagebox->_priv->checkbox = gtk_check_button_new_with_label (_("Don't show this message again."));
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (messagebox)->vbox),
-			    messagebox->_priv->checkbox, TRUE, TRUE, 10);
-	gtk_widget_show (messagebox->_priv->checkbox);
-	
-	if (buttons) {
-		while (buttons[i]) {
-			gnome_dialog_append_button (GNOME_DIALOG (messagebox), 
-						    buttons[i]);
-			i++;
-		};
-	}
-	
-	if (GNOME_DIALOG (messagebox)->buttons)
-		gtk_widget_grab_focus (g_list_last (GNOME_DIALOG (messagebox)->buttons)->data);
-	
-	gnome_dialog_set_close (GNOME_DIALOG (messagebox), TRUE);
-}
-
-/**
- * e_message_box_new:
- * @message: The message to be displayed.
- * @message_box_type: The type of the message
- * @...: A NULL terminated list of strings to use in each button.
- *
- * Creates a dialog box of type @message_box_type with @message.  A number
- * of buttons are inserted on it.  You can use the GNOME stock identifiers
- * to create gnome-stock-buttons.
- *
- * Returns a widget that has the dialog box.
- */
-GtkWidget*
-e_message_box_new (const gchar *message,
-		   const gchar *message_box_type, ...)
-{
-	va_list ap;
-	EMessageBox *message_box;
-	
-	g_return_val_if_fail (message != NULL, NULL);
-	g_return_val_if_fail (message_box_type != NULL, NULL);
-        
-	va_start (ap, message_box_type);
-	
-	message_box = gtk_type_new (e_message_box_get_type ());
-	
-	e_message_box_construct (message_box, message, message_box_type, NULL);
-	
-	/* we need to add buttons by hand here */
-	while (TRUE) {
-		gchar * button_name;
-		
-		button_name = va_arg (ap, gchar *);
-		
-		if (button_name == NULL) {
-			break;
-		}
-		
-		gnome_dialog_append_button (GNOME_DIALOG (message_box), button_name);
-	}
-	
-	va_end (ap);
-	
-	gtk_widget_grab_focus (g_list_last (GNOME_DIALOG (message_box)->buttons)->data);
-	
-	return GTK_WIDGET (message_box);
-}
-
-/**
- * e_message_box_newv:
- * @message: The message to be displayed.
- * @message_box_type: The type of the message
- * @buttons: a NULL terminated array with the buttons to insert.
- *
- * Creates a dialog box of type @message_box_type with @message.  A number
- * of buttons are inserted on it, the messages come from the @buttons array.
- * You can use the GNOME stock identifiers to create gnome-stock-buttons.
- * The buttons array can be NULL if you wish to add buttons yourself later.
- *
- * Returns a widget that has the dialog box.
- */
-GtkWidget*
-e_message_box_newv (const gchar *message,
-		    const gchar *message_box_type,
-		    const gchar **buttons)
-{
-	EMessageBox *message_box;
-	
-	g_return_val_if_fail (message != NULL, NULL);
-	g_return_val_if_fail (message_box_type != NULL, NULL);
-	
-	message_box = gtk_type_new (e_message_box_get_type ());
-	
-	e_message_box_construct (message_box, message,
-				     message_box_type, buttons);
-	
-	return GTK_WIDGET (message_box);
-}
-
-
-/**
- * e_message_box_get_label:
- * @messagebox: The message box to work on
- *
- * Gets the label widget of the message box.  You should use this
- * function instead of using the structure directly.
- *
- * Returns: the widget of the label with the message */
-GtkWidget *
-e_message_box_get_label (EMessageBox *messagebox)
-{
-	g_return_val_if_fail (messagebox != NULL, NULL);
-	g_return_val_if_fail (E_IS_MESSAGE_BOX (messagebox), NULL);
-	
-	return messagebox->_priv->label;
-}
-
-
-/**
- * e_message_box_get_checkbox:
- * @messagebox: The message box to work on
- *
- * Gets the checkbox widget of the message box.  You should use this
- * function instead of using the structure directly.
- *
- * Returns: the checkbox widget */
-GtkWidget *
-e_message_box_get_checkbox (EMessageBox *messagebox)
-{
-	g_return_val_if_fail (messagebox != NULL, NULL);
-	g_return_val_if_fail (E_IS_MESSAGE_BOX (messagebox), NULL);
-	
-	return messagebox->_priv->checkbox;
-}
diff --git a/widgets/misc/e-messagebox.h b/widgets/misc/e-messagebox.h
deleted file mode 100644
index 11a4026848..0000000000
--- a/widgets/misc/e-messagebox.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Original Author: Jay Painter
- *  Modified: Jeffrey Stedfast
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  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 Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#ifndef __E_MESSAGE_BOX_H__
-#define __E_MESSAGE_BOX_H__
-
-#include <glib.h>
-#include <gtk/gtkwidget.h>
-#include <libgnomeui/gnome-dialog.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TYPE_MESSAGE_BOX            (e_message_box_get_type ())
-#define E_MESSAGE_BOX(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_MESSAGE_BOX, EMessageBox))
-#define E_MESSAGE_BOX_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_MESSAGE_BOX, EMessageBoxClass))
-#define E_IS_MESSAGE_BOX(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_MESSAGE_BOX))
-#define E_IS_MESSAGE_BOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_MESSAGE_BOX))
-#define E_MESSAGE_BOX_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), E_TYPE_MESSAGE_BOX, EMessageBoxClass))
-
-
-#define E_MESSAGE_BOX_INFO      "info"
-#define E_MESSAGE_BOX_WARNING   "warning"
-#define E_MESSAGE_BOX_ERROR     "error"
-#define E_MESSAGE_BOX_QUESTION  "question"
-#define E_MESSAGE_BOX_GENERIC   "generic"
-
-
-typedef struct _EMessageBox        EMessageBox;
-typedef struct _EMessageBoxPrivate EMessageBoxPrivate;
-typedef struct _EMessageBoxClass   EMessageBoxClass;
-typedef struct _EMessageBoxButton  EMessageBoxButton;
-
-struct _EMessageBox
-{
-	GnomeDialog dialog;
-	/*< private >*/
-	EMessageBoxPrivate *_priv;
-};
-
-struct _EMessageBoxClass
-{
-	GnomeDialogClass parent_class;
-};
-
-
-guint      e_message_box_get_type   (void) G_GNUC_CONST;
-GtkWidget* e_message_box_new        (const gchar *message,
-				     const gchar *messagebox_type,
-				     ...);
-
-GtkWidget* e_message_box_newv       (const gchar *message,
-				     const gchar *messagebox_type,
-				     const gchar **buttons);
-
-void       e_message_box_construct  (EMessageBox *messagebox,
-				     const gchar *message,
-				     const gchar *messagebox_type,
-				     const gchar **buttons);
-
-GtkWidget *e_message_box_get_label  (EMessageBox *messagebox);
-
-GtkWidget *e_message_box_get_checkbox  (EMessageBox *messagebox);
-
-END_GNOME_DECLS
-
-#endif /* __E_MESSAGE_BOX_H__ */
diff --git a/widgets/misc/e-popup-menu.c b/widgets/misc/e-popup-menu.c
deleted file mode 100644
index 82f0a74fc6..0000000000
--- a/widgets/misc/e-popup-menu.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-popup-menu.c: popup menu display
-nnn *
- * Authors:
- *   Miguel de Icaza (miguel@kernel.org)
- *   Jody Goldberg (jgoldberg@home.com)
- *   Jeffrey Stedfast <fejj@helixcode.com>
- *
- * (C) 2000 Helix Code, Inc.
- */
-#include <config.h>
-#include <string.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkaccellabel.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtksignal.h>
-#include <libgnomeui/gtkpixmapmenuitem.h>
-#include <libgnomeui/gnome-stock.h>
-
-#include "e-popup-menu.h"
-#include "e-gui-utils.h"
-
-#include <libgnome/gnome-i18n.h>
-
-#ifndef GNOME_APP_HELPER_H
-/* Copied this i18n function to use for the same purpose */
-
-#ifdef ENABLE_NLS
-#define L_(x) gnome_app_helper_gettext(x)
-
-static gchar *
-gnome_app_helper_gettext (const gchar *str)
-{
-	char *s;
-
-        s = gettext (str);
-	if ( s == str )
-	        s = dgettext (PACKAGE, str);
-
-	return s;
-}
-
-#else
-#define L_(x) x
-#endif
-
-#endif
-
-/*
- * Creates an item with an optional icon
- */
-static GtkWidget *
-make_item (GtkMenu *menu, const char *name, const char *pixname)
-{
-	GtkWidget *label, *item;
-	guint label_accel;
-
-	if (*name == '\0')
-		return gtk_menu_item_new ();
-	
-	/*
-	 * Ugh.  This needs to go into Gtk+
-	 */
-	label = gtk_accel_label_new ("");
-	label_accel = gtk_label_parse_uline (GTK_LABEL (label), name);
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	gtk_widget_show (label);
-	
-	item = pixname ? gtk_pixmap_menu_item_new () : gtk_menu_item_new ();
-	gtk_container_add (GTK_CONTAINER (item), label);
-	
-	if (label_accel != GDK_VoidSymbol){
-		gtk_widget_add_accelerator (
-			item,
-			"activate_item",
-			gtk_menu_ensure_uline_accel_group (GTK_MENU (menu)),
-			label_accel, 0,
-			GTK_ACCEL_LOCKED);
-	}
-
-	if (pixname){
-		GtkWidget *pixmap = gnome_stock_pixmap_widget (item, pixname);
-
-		gtk_widget_show (pixmap);
-		gtk_pixmap_menu_item_set_pixmap (
-			GTK_PIXMAP_MENU_ITEM (item), pixmap);
-	}
-
-	return item;
-}
-
-GtkMenu *
-e_popup_menu_create (EPopupMenu *menu_list, guint32 disable_mask, guint32 hide_mask, void *closure)
-{
-	GtkMenu *menu = GTK_MENU (gtk_menu_new ());
-	gboolean last_item_seperator = TRUE;
-	gint last_non_seperator = -1;
-	gint i;
-	
-	for (i = 0; menu_list[i].name; i++) {
-		if (strcmp ("", menu_list[i].name) && !(menu_list [i].disable_mask & hide_mask)) {
-			last_non_seperator = i;
-		}
-	}
-	
-	for (i = 0; i <= last_non_seperator; i++) {
-		gboolean seperator;
-		
-		seperator = !strcmp ("", menu_list[i].name);
-		
-		if ((!(seperator && last_item_seperator)) && !(menu_list [i].disable_mask & hide_mask)) {
-			GtkWidget *item;
-			
-			item = make_item (menu, seperator ? "" : L_(menu_list[i].name), menu_list[i].pixname);
-			gtk_menu_append (menu, item);
-			
-			if (!menu_list[i].submenu) {
-				if (menu_list[i].fn)
-					gtk_signal_connect (GTK_OBJECT (item), "activate",
-							    GTK_SIGNAL_FUNC (menu_list[i].fn),
-							    closure);
-			} else {
-				/* submenu */
-				GtkMenu *submenu;
-				
-				submenu = e_popup_menu_create (menu_list[i].submenu, disable_mask, hide_mask, closure);
-				
-				gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), GTK_WIDGET (submenu));
-			}
-			
-			if (menu_list[i].disable_mask & disable_mask)
-				gtk_widget_set_sensitive (item, FALSE);
-			
-			gtk_widget_show (item);
-		}
-		
-		last_item_seperator = seperator;
-	}
-	
-	return menu;
-}
-
-void
-e_popup_menu_run (EPopupMenu *menu_list, GdkEvent *event, guint32 disable_mask, guint32 hide_mask, void *closure)
-{
-	GtkMenu *menu;
-	
-	g_return_if_fail (menu_list != NULL);
-	g_return_if_fail (event != NULL);
-	
-	menu = e_popup_menu_create (menu_list, disable_mask, hide_mask, closure);
-	
-	e_popup_menu (menu, event);
-}
-
diff --git a/widgets/misc/e-popup-menu.h b/widgets/misc/e-popup-menu.h
deleted file mode 100644
index 26e06476b3..0000000000
--- a/widgets/misc/e-popup-menu.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef E_POPUP_MENU_H
-#define E_POPUP_MENU_H
-
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkwidget.h>
-#include <libgnome/gnome-defs.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_POPUP_SEPARATOR  { "", NULL, (NULL), NULL,  0 }
-#define E_POPUP_TERMINATOR { NULL, NULL, (NULL), NULL,  0 }
-
-typedef struct _EPopupMenu EPopupMenu;
-
-struct _EPopupMenu {
-	char *name;
-	char *pixname;
-	void (*fn) (GtkWidget *widget, void *closure);
-	EPopupMenu *submenu;
-	guint32 disable_mask;
-};
-
-GtkMenu *e_popup_menu_create  (EPopupMenu     *menu_list,
-			       guint32         disable_mask,
-			       guint32         hide_mask,
-			       void           *closure);
-
-void     e_popup_menu_run     (EPopupMenu     *menu_list,
-			       GdkEvent       *event,
-			       guint32         disable_mask,
-			       guint32         hide_mask,
-			       void           *closure);
-
-END_GNOME_DECLS
-
-#endif /* E_POPUP_MENU_H */
diff --git a/widgets/misc/e-printable.c b/widgets/misc/e-printable.c
deleted file mode 100644
index f029e88573..0000000000
--- a/widgets/misc/e-printable.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-printable.c: an object printer.
- *
- * Author:
- *   Christopher James Lahey <clahey@helixcode.com>
- *
- * (C) 2000 Helix Code, Inc.
- */
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "gal/util/e-util.h"
-#include "e-printable.h"
-
-#define EP_CLASS(e) ((EPrintableClass *)((GtkObject *)e)->klass)
-
-#define PARENT_TYPE gtk_object_get_type ()
-					  
-
-static GtkObjectClass *e_printable_parent_class;
-
-enum {
-	PRINT_PAGE,
-	DATA_LEFT,
-	RESET,
-	HEIGHT,
-	WILL_FIT,
-	LAST_SIGNAL
-};
-
-static guint e_printable_signals [LAST_SIGNAL] = { 0, };
-
-static void
-e_printable_class_init (GtkObjectClass *object_class)
-{
-	EPrintableClass *klass = E_PRINTABLE_CLASS(object_class);
-	e_printable_parent_class = gtk_type_class (PARENT_TYPE);
-	
-	e_printable_signals [PRINT_PAGE] =
-		gtk_signal_new ("print_page",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EPrintableClass, print_page),
-				e_marshal_NONE__OBJECT_DOUBLE_DOUBLE_BOOL,
-				GTK_TYPE_NONE, 4, GTK_TYPE_OBJECT, GTK_TYPE_DOUBLE, GTK_TYPE_DOUBLE, GTK_TYPE_BOOL);
-
-	e_printable_signals [DATA_LEFT] =
-		gtk_signal_new ("data_left",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EPrintableClass, data_left),
-				gtk_marshal_BOOL__NONE,
-				GTK_TYPE_BOOL, 0, GTK_TYPE_NONE);
-
-	e_printable_signals [RESET] =
-		gtk_signal_new ("reset",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EPrintableClass, reset),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0, GTK_TYPE_NONE);
-
-	e_printable_signals [HEIGHT] =
-		gtk_signal_new ("height",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EPrintableClass, height),
-				e_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOL,
-				GTK_TYPE_DOUBLE, 4, GTK_TYPE_OBJECT, GTK_TYPE_DOUBLE, GTK_TYPE_DOUBLE, GTK_TYPE_BOOL);
-
-	e_printable_signals [WILL_FIT] =
-		gtk_signal_new ("will_fit",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EPrintableClass, will_fit),
-				e_marshal_BOOL__OBJECT_DOUBLE_DOUBLE_BOOL,
-				GTK_TYPE_BOOL, 4, GTK_TYPE_OBJECT, GTK_TYPE_DOUBLE, GTK_TYPE_DOUBLE, GTK_TYPE_BOOL);
-
-	gtk_object_class_add_signals (object_class, e_printable_signals, LAST_SIGNAL);
-
-	klass->print_page = NULL;    
-	klass->data_left = NULL;
-	klass->reset = NULL;
-	klass->height = NULL;
-	klass->will_fit = NULL;
-}
-
-
-guint
-e_printable_get_type (void)
-{
-  static guint type = 0;
-
-  if (!type)
-    {
-      GtkTypeInfo info =
-      {
-	"EPrintable",
-	sizeof (EPrintable),
-	sizeof (EPrintableClass),
-	(GtkClassInitFunc) e_printable_class_init,
-	NULL,
-	/* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      type = gtk_type_unique (gtk_object_get_type (), &info);
-    }
-
-  return type;
-}
-
-EPrintable *
-e_printable_new(void)
-{
-	return E_PRINTABLE(gtk_type_new(e_printable_get_type()));
-}
-
-void
-e_printable_print_page          (EPrintable        *e_printable,
-				 GnomePrintContext *context,
-				 gdouble            width,
-				 gdouble            height,
-				 gboolean           quantized)
-{
-	g_return_if_fail (e_printable != NULL);
-	g_return_if_fail (E_IS_PRINTABLE (e_printable));
-	
-	gtk_signal_emit (GTK_OBJECT (e_printable),
-			 e_printable_signals [PRINT_PAGE],
-			 context,
-			 width,
-			 height,
-			 quantized);
-}
-
-gboolean
-e_printable_data_left           (EPrintable        *e_printable)
-{
-        gboolean ret_val;
-
-	g_return_val_if_fail (e_printable != NULL, FALSE);
-	g_return_val_if_fail (E_IS_PRINTABLE (e_printable), FALSE);
-
-	gtk_signal_emit (GTK_OBJECT (e_printable),
-			 e_printable_signals [DATA_LEFT],
-			 &ret_val);
-
-	return ret_val;
-}
-
-void
-e_printable_reset               (EPrintable        *e_printable)
-{
-	g_return_if_fail (e_printable != NULL);
-	g_return_if_fail (E_IS_PRINTABLE (e_printable));
-	
-	gtk_signal_emit (GTK_OBJECT (e_printable),
-			 e_printable_signals [RESET]);
-}
-
-gdouble
-e_printable_height              (EPrintable        *e_printable,
-				 GnomePrintContext *context,
-				 gdouble            width,
-				 gdouble            max_height,
-				 gboolean           quantized)
-{
-        gdouble ret_val;
-
-	g_return_val_if_fail (e_printable != NULL, -1);
-	g_return_val_if_fail (E_IS_PRINTABLE (e_printable), -1);
-
-	gtk_signal_emit (GTK_OBJECT (e_printable),
-			 e_printable_signals [HEIGHT],
-			 context,
-			 width,
-			 max_height,
-			 quantized,
-			 &ret_val);
-
-	return ret_val;
-}
-
-gboolean
-e_printable_will_fit            (EPrintable        *e_printable,
-				 GnomePrintContext *context,
-				 gdouble            width,
-				 gdouble            max_height,
-				 gboolean           quantized)
-{
-        gboolean ret_val;
-
-	g_return_val_if_fail (e_printable != NULL, -1);
-	g_return_val_if_fail (E_IS_PRINTABLE (e_printable), -1);
-
-	gtk_signal_emit (GTK_OBJECT (e_printable),
-			 e_printable_signals [WILL_FIT],
-			 context,
-			 width,
-			 max_height,
-			 quantized,
-			 &ret_val);
-
-	return ret_val;
-}
diff --git a/widgets/misc/e-printable.h b/widgets/misc/e-printable.h
deleted file mode 100644
index 581b1e6f63..0000000000
--- a/widgets/misc/e-printable.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-printable.h: an object printer.
- *
- * Author:
- *   Christopher James Lahey <clahey@helixcode.com>
- *
- * (C) 2000 Helix Code, Inc.
- */
-#ifndef _E_PRINTABLE_H_
-#define _E_PRINTABLE_H_
-
-#include <gtk/gtkobject.h>
-#include <libgnomeprint/gnome-print.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_PRINTABLE_TYPE        (e_printable_get_type ())
-#define E_PRINTABLE(o)          (GTK_CHECK_CAST ((o), E_PRINTABLE_TYPE, EPrintable))
-#define E_PRINTABLE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_PRINTABLE_TYPE, EPrintableClass))
-#define E_IS_PRINTABLE(o)       (GTK_CHECK_TYPE ((o), E_PRINTABLE_TYPE))
-#define E_IS_PRINTABLE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_PRINTABLE_TYPE))
-
-typedef struct {
-	GtkObject   base;
-} EPrintable;
-
-typedef struct {
-	GtkObjectClass parent_class;
-
-	/*
-	 * Signals
-	 */
-
-	void        (*print_page)  (EPrintable *etm, GnomePrintContext *context, gdouble width, gdouble height, gboolean quantized);
-	gboolean    (*data_left)   (EPrintable *etm);
-	void        (*reset)       (EPrintable *etm);
-	gdouble     (*height)      (EPrintable *etm, GnomePrintContext *context, gdouble width, gdouble max_height, gboolean quantized);
-
-	/* e_printable_will_fit (ep, ...) should be equal in value to
-	 * (e_printable_print_page (ep, ...),
-	 * !e_printable_data_left(ep)) except that the latter has the
-	 * side effect of doing the printing and advancing the
-	 * position of the printable.
-	 */
-
-	gboolean    (*will_fit)    (EPrintable *etm, GnomePrintContext *context, gdouble width, gdouble max_height, gboolean quantized);
-} EPrintableClass;
-
-GtkType     e_printable_get_type (void);
-
-EPrintable *e_printable_new                 (void);
-	
-/*
- * Routines for emitting signals on the e_table */
-void        e_printable_print_page          (EPrintable        *e_printable,
-					     GnomePrintContext *context,
-					     gdouble            width,
-					     gdouble            height,
-					     gboolean           quantized);
-gboolean    e_printable_data_left           (EPrintable        *e_printable);
-void        e_printable_reset               (EPrintable        *e_printable);
-gdouble     e_printable_height              (EPrintable        *e_printable,
-					     GnomePrintContext *context,
-					     gdouble            width,
-					     gdouble            max_height,
-					     gboolean           quantized);
-gboolean    e_printable_will_fit            (EPrintable        *e_printable,
-					     GnomePrintContext *context,
-					     gdouble            width,
-					     gdouble            max_height,
-					     gboolean           quantized);
-
-END_GNOME_DECLS
-
-#endif /* _E_PRINTABLE_H_ */
diff --git a/widgets/misc/e-reflow-model.c b/widgets/misc/e-reflow-model.c
deleted file mode 100644
index 74e7b1726c..0000000000
--- a/widgets/misc/e-reflow-model.c
+++ /dev/null
@@ -1,288 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-reflow-model.c: a Reflow Model
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *
- * (C) 2001 Ximian, Inc.
- */
-#include <config.h>
-#include "e-reflow-model.h"
-#include <gtk/gtksignal.h>
-
-#define ERM_CLASS(e) ((EReflowModelClass *)((GtkObject *)e)->klass)
-
-#define PARENT_TYPE gtk_object_get_type ()
-
-#define d(x)
-
-d(static gint depth = 0);
-
-
-static GtkObjectClass *e_reflow_model_parent_class;
-
-enum {
-	MODEL_CHANGED,
-	MODEL_ITEMS_INSERTED,
-	MODEL_ITEM_CHANGED,
-	LAST_SIGNAL
-};
-
-static guint e_reflow_model_signals [LAST_SIGNAL] = { 0, };
-
-/**
- * e_reflow_model_set_width:
- * @e_reflow_model: The e-reflow-model to operate on
- * @width: The new value for the width of each item.
- */
-void
-e_reflow_model_set_width (EReflowModel *e_reflow_model, int width)
-{
-	g_return_if_fail (e_reflow_model != NULL);
-	g_return_if_fail (E_IS_REFLOW_MODEL (e_reflow_model));
-
-	ERM_CLASS (e_reflow_model)->set_width (e_reflow_model, width);
-}
-
-/**
- * e_reflow_model_count:
- * @e_reflow_model: The e-reflow-model to operate on
- *
- * Returns: the number of items in the reflow model.
- */
-int
-e_reflow_model_count (EReflowModel *e_reflow_model)
-{
-	g_return_val_if_fail (e_reflow_model != NULL, 0);
-	g_return_val_if_fail (E_IS_REFLOW_MODEL (e_reflow_model), 0);
-
-	return ERM_CLASS (e_reflow_model)->count (e_reflow_model);
-}
-
-/**
- * e_reflow_model_height:
- * @e_reflow_model: The e-reflow-model to operate on
- * @n: The item number to get the height of.
- * @parent: The parent GnomeCanvasItem.
- *
- * Returns: the height of the nth item.
- */
-int
-e_reflow_model_height (EReflowModel *e_reflow_model, int n, GnomeCanvasGroup *parent)
-{
-	g_return_val_if_fail (e_reflow_model != NULL, 0);
-	g_return_val_if_fail (E_IS_REFLOW_MODEL (e_reflow_model), 0);
-
-	return ERM_CLASS (e_reflow_model)->height (e_reflow_model, n, parent);
-}
-
-/**
- * e_reflow_model_incarnate:
- * @e_reflow_model: The e-reflow-model to operate on
- * @n: The item to create.
- * @parent: The parent GnomeCanvasItem to create a child of.
- *
- * Create a GnomeCanvasItem to represent the nth piece of data.
- *
- * Returns: the new GnomeCanvasItem.
- */
-GnomeCanvasItem *
-e_reflow_model_incarnate (EReflowModel *e_reflow_model, int n, GnomeCanvasGroup *parent)
-{
-	g_return_val_if_fail (e_reflow_model != NULL, NULL);
-	g_return_val_if_fail (E_IS_REFLOW_MODEL (e_reflow_model), NULL);
-
-	return ERM_CLASS (e_reflow_model)->incarnate (e_reflow_model, n, parent);
-}
-
-/**
- * e_reflow_model_compare:
- * @e_reflow_model: The e-reflow-model to operate on
- * @n1: The first item to compare
- * @n2: The second item to compare
- *
- * Compares item n1 and item n2 to see which should come first.
- *
- * Returns: strcmp like semantics for the comparison value.
- */
-int
-e_reflow_model_compare (EReflowModel *e_reflow_model, int n1, int n2)
-{
-#if 0
-	g_return_val_if_fail (e_reflow_model != NULL, 0);
-	g_return_val_if_fail (E_IS_REFLOW_MODEL (e_reflow_model), 0);
-#endif
-
-	return ERM_CLASS (e_reflow_model)->compare (e_reflow_model, n1, n2);
-}
-
-/**
- * e_reflow_model_reincarnate:
- * @e_reflow_model: The e-reflow-model to operate on
- * @n: The item to create.
- * @item: The item to reuse.
- *
- * Update item to represent the nth piece of data.
- */
-void
-e_reflow_model_reincarnate (EReflowModel *e_reflow_model, int n, GnomeCanvasItem *item)
-{
-	g_return_if_fail (e_reflow_model != NULL);
-	g_return_if_fail (E_IS_REFLOW_MODEL (e_reflow_model));
-
-	ERM_CLASS (e_reflow_model)->reincarnate (e_reflow_model, n, item);
-}
-
-static void
-e_reflow_model_class_init (GtkObjectClass *object_class)
-{
-	EReflowModelClass *klass = E_REFLOW_MODEL_CLASS(object_class);
-	e_reflow_model_parent_class = gtk_type_class (PARENT_TYPE);
-
-	e_reflow_model_signals [MODEL_CHANGED] =
-		gtk_signal_new ("model_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EReflowModelClass, model_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_reflow_model_signals [MODEL_ITEMS_INSERTED] =
-		gtk_signal_new ("model_items_inserted",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EReflowModelClass, model_items_inserted),
-				gtk_marshal_NONE__INT_INT,
-				GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
-
-	e_reflow_model_signals [MODEL_ITEM_CHANGED] =
-		gtk_signal_new ("model_item_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EReflowModelClass, model_item_changed),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
-
-	gtk_object_class_add_signals (object_class, e_reflow_model_signals, LAST_SIGNAL);
-
-	klass->set_width            = NULL;
-	klass->count                = NULL;
-	klass->height               = NULL;
-	klass->incarnate            = NULL;
-	klass->reincarnate          = NULL;
-
-	klass->model_changed        = NULL;
-	klass->model_items_inserted = NULL;
-	klass->model_item_changed   = NULL;
-}
-
-
-guint
-e_reflow_model_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type)
-	{
-		GtkTypeInfo info =
-		{
-			"EReflowModel",
-			sizeof (EReflowModel),
-			sizeof (EReflowModelClass),
-			(GtkClassInitFunc) e_reflow_model_class_init,
-			NULL,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-		
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-  return type;
-}
-
-#if d(!)0
-static void
-print_tabs (void)
-{
-	int i;
-	for (i = 0; i < depth; i++)
-		g_print("\t");
-}
-#endif
-
-/**
- * e_reflow_model_changed:
- * @e_reflow_model: the reflow model to notify of the change
- *
- * Use this function to notify any views of this reflow model that
- * the contents of the reflow model have changed.  This will emit
- * the signal "model_changed" on the @e_reflow_model object.
- *
- * It is preferable to use the e_reflow_model_item_changed() signal to
- * notify of smaller changes than to invalidate the entire model, as
- * the views might have ways of caching the information they render
- * from the model.
- */
-void
-e_reflow_model_changed (EReflowModel *e_reflow_model)
-{
-	g_return_if_fail (e_reflow_model != NULL);
-	g_return_if_fail (E_IS_REFLOW_MODEL (e_reflow_model));
-	
-	d(print_tabs());
-	d(g_print("Emitting model_changed on model 0x%p.\n", e_reflow_model));
-	d(depth++);
-	gtk_signal_emit (GTK_OBJECT (e_reflow_model),
-			 e_reflow_model_signals [MODEL_CHANGED]);
-	d(depth--);
-}
-
-/**
- * e_reflow_model_items_inserted:
- * @e_reflow_model: The model changed.
- * @position: The position the items were insert in.
- * @count: The number of items inserted.
- * 
- * Use this function to notify any views of the reflow model that a number of items have been inserted.
- **/
-void
-e_reflow_model_items_inserted (EReflowModel *e_reflow_model, int position, int count)
-{
-	g_return_if_fail (e_reflow_model != NULL);
-	g_return_if_fail (E_IS_REFLOW_MODEL (e_reflow_model));
-
-	d(print_tabs());
-	d(g_print("Emitting items_inserted on model 0x%p, position=%d, count=%d.\n", e_reflow_model, position, count));
-	d(depth++);
-	gtk_signal_emit (GTK_OBJECT (e_reflow_model),
-			 e_reflow_model_signals [MODEL_ITEMS_INSERTED], position, count);
-	d(depth--);
-}
-
-/**
- * e_reflow_model_item_changed:
- * @e_reflow_model: the reflow model to notify of the change
- * @item: the item that was changed in the model.
- *
- * Use this function to notify any views of the reflow model that the
- * contents of item @item have changed in model such that the height
- * has changed or the item needs to be reincarnated.  This function
- * will emit the "model_item_changed" signal on the @e_reflow_model
- * object
- */
-void
-e_reflow_model_item_changed (EReflowModel *e_reflow_model, int n)
-{
-	g_return_if_fail (e_reflow_model != NULL);
-	g_return_if_fail (E_IS_REFLOW_MODEL (e_reflow_model));
-
-	d(print_tabs());
-	d(g_print("Emitting item_changed on model 0x%p, n=%d.\n", e_reflow_model, n));
-	d(depth++);
-	gtk_signal_emit (GTK_OBJECT (e_reflow_model),
-			 e_reflow_model_signals [MODEL_ITEM_CHANGED], n);
-	d(depth--);
-}
diff --git a/widgets/misc/e-reflow-model.h b/widgets/misc/e-reflow-model.h
deleted file mode 100644
index db26335a35..0000000000
--- a/widgets/misc/e-reflow-model.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_REFLOW_MODEL_H_
-#define _E_REFLOW_MODEL_H_
-
-#include <gtk/gtkobject.h>
-#include <libgnomeui/gnome-canvas.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_REFLOW_MODEL_TYPE        (e_reflow_model_get_type ())
-#define E_REFLOW_MODEL(o)          (GTK_CHECK_CAST ((o), E_REFLOW_MODEL_TYPE, EReflowModel))
-#define E_REFLOW_MODEL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_REFLOW_MODEL_TYPE, EReflowModelClass))
-#define E_IS_REFLOW_MODEL(o)       (GTK_CHECK_TYPE ((o), E_REFLOW_MODEL_TYPE))
-#define E_IS_REFLOW_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_REFLOW_MODEL_TYPE))
-
-typedef struct {
-	GtkObject   base;
-} EReflowModel;
-
-typedef struct {
-	GtkObjectClass parent_class;
-
-	/*
-	 * Virtual methods
-	 */
-	void             (*set_width)      (EReflowModel *etm, int width);
-
-	int              (*count)          (EReflowModel *etm);
-	int              (*height)         (EReflowModel *etm, int n, GnomeCanvasGroup *parent);
-	GnomeCanvasItem *(*incarnate)      (EReflowModel *etm, int n, GnomeCanvasGroup *parent);
-	int              (*compare)        (EReflowModel *etm, int n1, int n2);
-	void             (*reincarnate)    (EReflowModel *etm, int n, GnomeCanvasItem *item);
-	
-	/*
-	 * Signals
-	 */
-
-	/*
-	 * These all come after the change has been made.
-	 * Major structural changes: model_changed
-	 * Changes only in an item: item_changed
-	 */
-	void        (*model_changed)       (EReflowModel *etm);
-	void        (*model_items_inserted) (EReflowModel *etm, int position, int count);
-	void        (*model_item_changed)  (EReflowModel *etm, int n);
-} EReflowModelClass;
-
-GtkType          e_reflow_model_get_type        (void);
-
-/**/
-void             e_reflow_model_set_width       (EReflowModel     *e_reflow_model,
-						 int               width);
-int              e_reflow_model_count           (EReflowModel     *e_reflow_model);
-int              e_reflow_model_height          (EReflowModel     *e_reflow_model,
-						 int               n,
-						 GnomeCanvasGroup *parent);
-GnomeCanvasItem *e_reflow_model_incarnate       (EReflowModel     *e_reflow_model,
-						 int               n,
-						 GnomeCanvasGroup *parent);
-int              e_reflow_model_compare         (EReflowModel     *e_reflow_model,
-						 int               n1,
-						 int               n2);
-void             e_reflow_model_reincarnate     (EReflowModel     *e_reflow_model,
-						 int               n,
-						 GnomeCanvasItem  *item);
-
-/*
- * Routines for emitting signals on the e_reflow
- */
-void             e_reflow_model_changed         (EReflowModel     *e_reflow_model);
-void             e_reflow_model_items_inserted  (EReflowModel     *e_reflow_model,
-						 int               position,
-						 int               count);
-void             e_reflow_model_item_changed    (EReflowModel     *e_reflow_model,
-						 int               n);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_REFLOW_MODEL_H_ */
diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c
deleted file mode 100644
index ad414fd65e..0000000000
--- a/widgets/misc/e-reflow.c
+++ /dev/null
@@ -1,1264 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-reflow.c
- * Copyright (C) 2000, 2001  Ximian, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include "e-reflow.h"
-
-#include <math.h>
-#include <gdk/gdkkeysyms.h>
-#include "e-canvas-utils.h"
-#include "e-canvas.h"
-#include "gal/e-text/e-text.h"
-#include "gal/util/e-util.h"
-#include <gtk/gtksignal.h>
-#include "e-selection-model-simple.h"
-
-#include <string.h>
-
-static gboolean e_reflow_event (GnomeCanvasItem *item, GdkEvent *event);
-static void e_reflow_realize (GnomeCanvasItem *item);
-static void e_reflow_unrealize (GnomeCanvasItem *item);
-static void e_reflow_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
-				    int x, int y, int width, int height);
-static void e_reflow_update (GnomeCanvasItem *item, double affine[6], ArtSVP *clip_path, gint flags);
-static double e_reflow_point (GnomeCanvasItem *item, double x, double y, int cx, int cy, GnomeCanvasItem **actual_item);
-static void e_reflow_reflow (GnomeCanvasItem *item, int flags);
-static void set_empty(EReflow *reflow);
-
-static void e_reflow_resize_children (GnomeCanvasItem *item);
-
-#define E_REFLOW_DIVIDER_WIDTH 2
-#define E_REFLOW_BORDER_WIDTH 7
-#define E_REFLOW_FULL_GUTTER (E_REFLOW_DIVIDER_WIDTH + E_REFLOW_BORDER_WIDTH * 2)
-
-static GnomeCanvasGroupClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_MINIMUM_WIDTH,
-	ARG_WIDTH,
-	ARG_HEIGHT,
-	ARG_EMPTY_MESSAGE,
-	ARG_MODEL,
-};
-
-enum {
-	SELECTION_EVENT,
-	LAST_SIGNAL
-};
-
-static guint signals [LAST_SIGNAL] = {0, };
-
-static gint
-er_compare (int i1, int i2, gpointer user_data)
-{
-	EReflow *reflow = user_data;
-	return e_reflow_model_compare (reflow->model, i1, i2);
-}
-
-static gint
-e_reflow_pick_line (EReflow *reflow, double x)
-{
-	x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH;
-	x /= reflow->column_width + E_REFLOW_FULL_GUTTER;
-	return x;
-}
-
-static int
-er_find_item (EReflow *reflow, GnomeCanvasItem *item)
-{
-	int i;
-	for (i = 0; i < reflow->count; i++) {
-		if (reflow->items[i] == item)
-			return i;
-	}
-	return -1;
-}
-
-static void
-e_reflow_resize_children (GnomeCanvasItem *item)
-{
-	EReflow *reflow;
-	int i;
-	int count;
-
-	reflow = E_REFLOW (item);
-
-	count = reflow->count;
-	for (i = 0; i < count; i++) {
-		if (reflow->items[i])
-			gnome_canvas_item_set(reflow->items[i],
-					      "width", (double) reflow->column_width,
-					      NULL);
-	}
-}
-
-static void
-e_reflow_update_selection (EReflow *reflow)
-{
-	int i;
-	int count;
-
-	count = reflow->count;
-	for (i = 0; i < count; i++) {
-		if (reflow->items[i]) {
-			gtk_object_set(GTK_OBJECT(reflow->items[i]),
-     				       "selected", e_selection_model_is_row_selected(E_SELECTION_MODEL(reflow->selection), i),
-				       NULL);
-		} else if (e_selection_model_is_row_selected (E_SELECTION_MODEL (reflow->selection), i)) {
-			reflow->items[i] = e_reflow_model_incarnate (reflow->model, i, GNOME_CANVAS_GROUP (reflow));
-			gtk_object_set (GTK_OBJECT (reflow->items[i]),
-					"selected", e_selection_model_is_row_selected(E_SELECTION_MODEL(reflow->selection), i),
-					"width", (double) reflow->column_width,
-					NULL);
-		}
-	}
-}
-
-static void
-selection_changed (ESelectionModel *selection, EReflow *reflow)
-{
-	e_reflow_update_selection (reflow);
-}
-
-static void
-incarnate (EReflow *reflow)
-{
-	int column_width;
-	int first_column;
-	int last_column;
-	int first_cell;
-	int last_cell;
-	int i;
-	GtkAdjustment *adjustment = gtk_layout_get_hadjustment (GTK_LAYOUT (GNOME_CANVAS_ITEM (reflow)->canvas));
-
-	column_width = reflow->column_width;
-
-	first_column = adjustment->value - 1 + E_REFLOW_BORDER_WIDTH;
-	first_column /= column_width + E_REFLOW_FULL_GUTTER;
-
-	last_column = adjustment->value + adjustment->page_size + 1 - E_REFLOW_BORDER_WIDTH - E_REFLOW_DIVIDER_WIDTH;
-	last_column /= column_width + E_REFLOW_FULL_GUTTER;
-	last_column ++;
-
-	if (first_column >= 0 && first_column < reflow->column_count)
-		first_cell = reflow->columns[first_column];
-	else
-		first_cell = 0;
-
-	if (last_column >= 0 && last_column < reflow->column_count)
-		last_cell = reflow->columns[last_column];
-	else
-		last_cell = reflow->count;
-
-	for (i = first_cell; i < last_cell; i++) {
-		int unsorted = e_sorter_sorted_to_model (E_SORTER (reflow->sorter), i);
-		if (reflow->items[unsorted] == NULL) {
-			if (reflow->model) {
-				reflow->items[unsorted] = e_reflow_model_incarnate (reflow->model, unsorted, GNOME_CANVAS_GROUP (reflow));
-				gtk_object_set (GTK_OBJECT (reflow->items[unsorted]),
-						"selected", e_selection_model_is_row_selected(E_SELECTION_MODEL(reflow->selection), unsorted),
-						"width", (double) reflow->column_width,
-						NULL);
-			}
-		}
-	}
-	reflow->incarnate_idle_id = 0;
-}
-
-static gboolean
-invoke_incarnate (gpointer user_data)
-{
-	EReflow *reflow = user_data;
-	incarnate (reflow);
-	return FALSE;
-}
-
-static void
-queue_incarnate (EReflow *reflow)
-{
-	if (reflow->incarnate_idle_id == 0)
-		reflow->incarnate_idle_id =
-			g_idle_add_full (25, invoke_incarnate, reflow, NULL);
-}
-
-static void
-reflow_columns (EReflow *reflow)
-{
-	GSList *list;
-	int count;
-	int i;
-	int column_count;
-	double running_height;
-
-	g_free (reflow->columns);
-	reflow->column_count = 0;
-	reflow->columns      = NULL;
-
-	list = NULL;
-
-	running_height = E_REFLOW_BORDER_WIDTH;
-	column_count = 1;
-
-	count = reflow->count;
-	for (i = 0; i < count; i++) {
-		int unsorted = e_sorter_sorted_to_model (E_SORTER (reflow->sorter), i);
-		if (reflow->heights[unsorted] == -1) {
-			if (reflow->model)
-				reflow->heights[unsorted] = e_reflow_model_height (reflow->model, unsorted, GNOME_CANVAS_GROUP (reflow));
-			else
-				reflow->heights[unsorted] = 0;
-		}
-		if (i != 0 && running_height + reflow->heights[unsorted] + E_REFLOW_BORDER_WIDTH > reflow->height) {
-			list = g_slist_prepend (list, GINT_TO_POINTER(i));
-			column_count ++;
-			running_height = E_REFLOW_BORDER_WIDTH * 2 + reflow->heights[2];
-		} else
-			running_height += reflow->heights[unsorted] + E_REFLOW_BORDER_WIDTH;
-	}
-
-	reflow->column_count = column_count;
-	reflow->columns = g_new (int, column_count);
-	column_count --;
-	for (; column_count > 0; column_count--) {
-		GSList *to_free;
-		reflow->columns[column_count] = GPOINTER_TO_INT(list->data);
-		to_free = list;
-		list = list->next;
-		g_slist_free_1 (to_free);
-	}
-	reflow->columns[0] = 0;
-
-	queue_incarnate (reflow);
-
-	reflow->need_reflow_columns = FALSE;
-}
-
-static void
-item_changed (EReflowModel *model, int i, EReflow *reflow)
-{
-	if (i < 0 || i >= reflow->count)
-		return;
-
-	reflow->heights[i] = -1;
-	if (reflow->items[i] != NULL)
-		e_reflow_model_reincarnate (model, i, reflow->items[i]);
-	e_sorter_array_clean (reflow->sorter);
-	reflow->need_reflow_columns = TRUE;
-	e_canvas_item_request_reflow(GNOME_CANVAS_ITEM (reflow));
-}
-
-static void
-items_inserted (EReflowModel *model, int position, int count, EReflow *reflow)
-{
-	int i;
-	int oldcount;
-	if (position < 0 || position > reflow->count)
-		return;
-
-	oldcount = reflow->count;
-
-	reflow->count += count;
-
-	if (reflow->count > reflow->allocated_count) {
-		while (reflow->count > reflow->allocated_count)
-			reflow->allocated_count += 256;
-		reflow->heights = g_renew (int, reflow->heights, reflow->allocated_count);
-		reflow->items = g_renew (GnomeCanvasItem *, reflow->items, reflow->allocated_count);
-	}
-	memmove (reflow->heights + position + count, reflow->heights + position, (reflow->count - position - count) * sizeof (int));
-	memmove (reflow->items + position + count, reflow->items + position, (reflow->count - position - count) * sizeof (GnomeCanvasItem *));
-	for (i = position; i < position + count; i++) {
-		reflow->items[i] = 0;
-		reflow->heights[i] = -1;
-	}
-
-	e_selection_model_simple_set_row_count (E_SELECTION_MODEL_SIMPLE (reflow->selection), reflow->count);
-	if (position == oldcount)
-		e_sorter_array_append (reflow->sorter, count);
-	else
-		e_sorter_array_set_count (reflow->sorter, reflow->count);
-	reflow->need_reflow_columns = TRUE;
-	set_empty (reflow);
-	e_canvas_item_request_reflow(GNOME_CANVAS_ITEM (reflow));
-}
-
-static void
-model_changed (EReflowModel *model, EReflow *reflow)
-{
-	int i;
-	int count;
-	int oldcount;
-
-	count = reflow->count;
-	oldcount = count;
-
-	for (i = 0; i < count; i++) {
-		if (reflow->items[i])
-			gtk_object_destroy (GTK_OBJECT (reflow->items[i]));
-	}
-	g_free (reflow->items);
-	g_free (reflow->heights);
-	reflow->count = e_reflow_model_count (model);
-	reflow->allocated_count = reflow->count;
-	reflow->items = g_new (GnomeCanvasItem *, reflow->count);
-	reflow->heights = g_new (int, reflow->count);
-
-	count = reflow->count;
-	for (i = 0; i < count; i++) {
-		reflow->items[i] = 0;
-		reflow->heights[i] = -1;
-	}
-
-	e_selection_model_simple_set_row_count (E_SELECTION_MODEL_SIMPLE (reflow->selection), count);
-	e_sorter_array_set_count (reflow->sorter, reflow->count);
-
-	reflow->need_reflow_columns = TRUE;
-	if (oldcount > reflow->count)
-		reflow_columns (reflow);
-	set_empty (reflow);
-	e_canvas_item_request_reflow(GNOME_CANVAS_ITEM (reflow));
-}
-
-static void
-set_empty(EReflow *reflow)
-{
-	if (reflow->count == 0) {
-		if (reflow->empty_text) {
-			if (reflow->empty_message) {
-				gnome_canvas_item_set(reflow->empty_text,
-						      "width", reflow->minimum_width,
-						      "text", reflow->empty_message,
-						      NULL);
-				e_canvas_item_move_absolute(reflow->empty_text,
-							    reflow->minimum_width / 2,
-							    0);
-			} else {
-				gtk_object_destroy(GTK_OBJECT(reflow->empty_text));
-				reflow->empty_text = NULL;
-			}
-		} else {
-			if (reflow->empty_message)
-				reflow->empty_text =
-					gnome_canvas_item_new(GNOME_CANVAS_GROUP(reflow),
-							      e_text_get_type(),
-							      "anchor", GTK_ANCHOR_N,
-							      "width", reflow->minimum_width,
-							      "clip", TRUE,
-							      "use_ellipsis", TRUE,
-							      "font_gdk", GTK_WIDGET(GNOME_CANVAS_ITEM(reflow)->canvas)->style->font,
-							      "fill_color", "black",
-							      "justification", GTK_JUSTIFY_CENTER,
-							      "text", reflow->empty_message,
-							      "draw_background", FALSE,
-							      NULL);
-			e_canvas_item_move_absolute(reflow->empty_text,
-						    reflow->minimum_width / 2,
-						    0);
-		}
-	} else {
-		if (reflow->empty_text) {
-			gtk_object_destroy(GTK_OBJECT(reflow->empty_text));
-			reflow->empty_text = NULL;
-		}
-	}
-}
-
-static void
-disconnect_model (EReflow *reflow)
-{
-	if (reflow->model == NULL)
-		return;
-
-	gtk_signal_disconnect (GTK_OBJECT (reflow->model),
-			       reflow->model_changed_id);
-	gtk_signal_disconnect (GTK_OBJECT (reflow->model),
-			       reflow->model_items_inserted_id);
-	gtk_signal_disconnect (GTK_OBJECT (reflow->model),
-			       reflow->model_item_changed_id);
-	gtk_object_unref (GTK_OBJECT (reflow->model));
-
-	reflow->model_changed_id        = 0;
-	reflow->model_items_inserted_id = 0;
-	reflow->model_item_changed_id   = 0;
-	reflow->model                   = NULL;
-}
-
-static void
-disconnect_selection (EReflow *reflow)
-{
-	if (reflow->selection == NULL)
-		return;
-
-	gtk_signal_disconnect (GTK_OBJECT (reflow->selection),
-			       reflow->selection_changed_id);
-	gtk_object_unref (GTK_OBJECT (reflow->selection));
-
-	reflow->selection_changed_id = 0;
-	reflow->selection            = NULL;
-}
-
-static void
-connect_model (EReflow *reflow, EReflowModel *model)
-{
-	if (reflow->model != NULL)
-		disconnect_model (reflow);
-
-	if (model == NULL)
-		return;
-
-	reflow->model = model;
-	gtk_object_ref (GTK_OBJECT (reflow->model));
-	reflow->model_changed_id =
-		gtk_signal_connect (GTK_OBJECT (reflow->model), "model_changed",
-				    GTK_SIGNAL_FUNC (model_changed), reflow);
-	reflow->model_items_inserted_id =
-		gtk_signal_connect (GTK_OBJECT (reflow->model), "model_items_inserted",
-				    GTK_SIGNAL_FUNC (items_inserted), reflow);
-	reflow->model_item_changed_id =
-		gtk_signal_connect (GTK_OBJECT (reflow->model), "model_item_changed",
-				    GTK_SIGNAL_FUNC (item_changed), reflow);
-	model_changed (model, reflow);
-}
-
-static void
-adjustment_changed (GtkAdjustment *adjustment, EReflow *reflow)
-{
-	incarnate (reflow);
-}
-
-static void
-disconnect_adjustment (EReflow *reflow)
-{
-	if (reflow->adjustment == NULL)
-		return;
-
-	gtk_signal_disconnect (GTK_OBJECT (reflow->adjustment),
-			       reflow->adjustment_changed_id);
-	gtk_signal_disconnect (GTK_OBJECT (reflow->adjustment),
-			       reflow->adjustment_value_changed_id);
-
-	gtk_object_unref (GTK_OBJECT (reflow->adjustment));
-
-	reflow->adjustment_changed_id = 0;
-	reflow->adjustment_value_changed_id = 0;
-	reflow->adjustment = NULL;
-}
-
-static void
-connect_adjustment (EReflow *reflow, GtkAdjustment *adjustment)
-{
-	if (reflow->adjustment != NULL)
-		disconnect_adjustment (reflow);
-
-	if (adjustment == NULL)
-		return;
-
-	reflow->adjustment = adjustment;
-	reflow->adjustment_changed_id =
-		gtk_signal_connect (GTK_OBJECT (adjustment), "changed",
-				    adjustment_changed, reflow);
-	reflow->adjustment_value_changed_id =
-		gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed",
-				    adjustment_changed, reflow);
-	gtk_object_ref (GTK_OBJECT (adjustment));
-}
-
-static void
-set_scroll_adjustments (GtkLayout *layout, GtkAdjustment *hadj, GtkAdjustment *vadj, EReflow *reflow)
-{
-	connect_adjustment (reflow, hadj);
-}
-
-static void
-disconnect_set_adjustment (EReflow *reflow)
-{
-	gtk_signal_disconnect (GTK_OBJECT (GNOME_CANVAS_ITEM (reflow)->canvas),
-			       reflow->set_scroll_adjustments_id);
-	reflow->set_scroll_adjustments_id = 0;
-}
-
-static void
-connect_set_adjustment (EReflow *reflow)
-{
-	reflow->set_scroll_adjustments_id =
-		gtk_signal_connect (GTK_OBJECT (GNOME_CANVAS_ITEM (reflow)->canvas),
-				    "set_scroll_adjustments",
-				    GTK_SIGNAL_FUNC (set_scroll_adjustments), reflow);
-}
-
-
-
-
-/* Virtual functions */
-static void
-e_reflow_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EReflow *reflow;
-
-	item = GNOME_CANVAS_ITEM (o);
-	reflow = E_REFLOW (o);
-	
-	switch (arg_id){
-	case ARG_HEIGHT:
-		reflow->height = GTK_VALUE_DOUBLE (*arg);
-		reflow->need_reflow_columns = TRUE;
-		e_canvas_item_request_reflow(item);
-		break;
-	case ARG_MINIMUM_WIDTH:
-		reflow->minimum_width = GTK_VALUE_DOUBLE (*arg);
-		if (GNOME_CANVAS_ITEM_REALIZED & GTK_OBJECT_FLAGS(o))
-			set_empty(reflow);
-		e_canvas_item_request_reflow(item);
-		break;
-	case ARG_EMPTY_MESSAGE:
-		g_free(reflow->empty_message);
-		reflow->empty_message = g_strdup(GTK_VALUE_STRING (*arg));
-		if (GNOME_CANVAS_ITEM_REALIZED & GTK_OBJECT_FLAGS(o))
-			set_empty(reflow);
-		break;
-	case ARG_MODEL:
-		connect_model (reflow, (EReflowModel *) GTK_VALUE_OBJECT (*arg));
-		break;
-	}
-}
-
-static void
-e_reflow_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EReflow *reflow;
-
-	reflow = E_REFLOW (object);
-
-	switch (arg_id) {
-	case ARG_MINIMUM_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = reflow->minimum_width;
-		break;
-	case ARG_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = reflow->width;
-		break;
-	case ARG_HEIGHT:
-		GTK_VALUE_DOUBLE (*arg) = reflow->height;
-		break;
-	case ARG_EMPTY_MESSAGE:
-		GTK_VALUE_STRING (*arg) = g_strdup(reflow->empty_message);
-		break;
-	case ARG_MODEL:
-		GTK_VALUE_OBJECT (*arg) = (GtkObject *) reflow->model;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-e_reflow_destroy (GtkObject *object)
-{
-	EReflow *reflow = E_REFLOW(object);
-
-	g_free (reflow->items);
-	g_free (reflow->heights);
-	g_free (reflow->columns);
-
-	reflow->items          = NULL;
-	reflow->heights        = NULL;
-	reflow->columns        = NULL;
-	reflow->count          = 0;
-	reflow->allocated_count = 0;
-
-	if (reflow->incarnate_idle_id != 0)
-		g_source_remove (reflow->incarnate_idle_id);
-
-	disconnect_model (reflow);
-	disconnect_selection (reflow);
-	
-	g_free(reflow->empty_message);
-  
-	GTK_OBJECT_CLASS(parent_class)->destroy (object);
-}
-
-static void
-e_reflow_realize (GnomeCanvasItem *item)
-{
-	EReflow *reflow;
-	GnomeCanvasGroup *group;
-	GtkAdjustment *adjustment;
-	int count;
-	int i;
-
-	reflow = E_REFLOW (item);
-	group = GNOME_CANVAS_GROUP (item);
-
-	if (GNOME_CANVAS_ITEM_CLASS(parent_class)->realize)
-		(* GNOME_CANVAS_ITEM_CLASS(parent_class)->realize) (item);
-	
-	reflow->arrow_cursor = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW);
-	reflow->default_cursor = gdk_cursor_new (GDK_LEFT_PTR);
-
-	count = reflow->count;
-	for(i = 0; i < count; i++) {
-		if (reflow->items[i])
-			gnome_canvas_item_set(reflow->items[i],
-					      "width", (double) reflow->column_width,
-					      NULL);
-	}
-
-	set_empty(reflow);
-
-	reflow->need_reflow_columns = TRUE;
-	e_canvas_item_request_reflow(item);
-
-	adjustment = gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas));
-
-	connect_set_adjustment (reflow);
-	connect_adjustment (reflow, adjustment);
-
-	adjustment->step_increment = (reflow->column_width + E_REFLOW_FULL_GUTTER) / 2;
-	adjustment->page_increment = adjustment->page_size - adjustment->step_increment;
-	gtk_adjustment_changed(adjustment);
-	
-	if (!item->canvas->aa) {
-	}
-}
-
-static void
-e_reflow_unrealize (GnomeCanvasItem *item)
-{
-	EReflow *reflow;
-
-	reflow = E_REFLOW (item);
-
-	if (!item->canvas->aa) {
-	}
-  
-	gdk_cursor_destroy (reflow->arrow_cursor);
-	gdk_cursor_destroy (reflow->default_cursor);
-	reflow->arrow_cursor = NULL;
-	reflow->default_cursor = NULL;
-
-	g_free (reflow->columns);
-	reflow->columns = NULL;
-
-	disconnect_set_adjustment (reflow);
-	disconnect_adjustment (reflow);
-
-	if (GNOME_CANVAS_ITEM_CLASS(parent_class)->unrealize)
-		(* GNOME_CANVAS_ITEM_CLASS(parent_class)->unrealize) (item);
-}
-
-static gboolean
-e_reflow_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	EReflow *reflow;
-	int return_val = FALSE;
- 
-	reflow = E_REFLOW (item);
-
-	switch( event->type )
-		{
-		case GDK_KEY_PRESS:
-			return_val = e_selection_model_key_press(reflow->selection, (GdkEventKey *) event);
-			break;
-#if 0
-			if (event->key.keyval == GDK_Tab || 
-			    event->key.keyval == GDK_KP_Tab || 
-			    event->key.keyval == GDK_ISO_Left_Tab) {
-				int i;
-				int count;
-				count = reflow->count;
-				for (i = 0; i < count; i++) {
-					int unsorted = e_sorter_sorted_to_model (E_SORTER (reflow->sorter), i);
-					GnomeCanvasItem *item = reflow->items[unsorted];
-					EFocus has_focus;
-					if (item) {
-						gtk_object_get(GTK_OBJECT(item),
-							       "has_focus", &has_focus,
-							       NULL);
-						if (has_focus) {
-							if (event->key.state & GDK_SHIFT_MASK) {
-								if (i == 0)
-									return 0;
-								i--;
-							} else {
-								if (i == count - 1)
-									return 0;
-								i++;
-							}
-							
-							unsorted = e_sorter_sorted_to_model (E_SORTER (reflow->sorter), i);
-							if (reflow->items[unsorted] == NULL) {
-								reflow->items[unsorted] = e_reflow_model_incarnate (reflow->model, unsorted, GNOME_CANVAS_GROUP (reflow));
-							}
-
-							item = reflow->items[unsorted];
-							gnome_canvas_item_set(item,
-									      "has_focus", (event->key.state & GDK_SHIFT_MASK) ? E_FOCUS_END : E_FOCUS_START,
-									      NULL);
-							return 1;
-						}
-					}
-				}
-			}
-#endif
-			break;
-		case GDK_BUTTON_PRESS:
-			switch(event->button.button) 
-				{
-				case 1:
-					{
-						GdkEventButton *button = (GdkEventButton *) event;
-						double n_x, max_x;
-						n_x = button->x;
-						n_x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH;
-						n_x = fmod(n_x,(reflow->column_width + E_REFLOW_FULL_GUTTER));
-
-						max_x = E_REFLOW_BORDER_WIDTH;
-						max_x += (reflow->column_width + E_REFLOW_FULL_GUTTER) * reflow->column_count;
-						if ( button->y >= E_REFLOW_BORDER_WIDTH && button->y <= reflow->height - E_REFLOW_BORDER_WIDTH && n_x < E_REFLOW_FULL_GUTTER && max_x > button->x ) {
-							reflow->which_column_dragged = e_reflow_pick_line(reflow, button->x);
-							reflow->start_x = reflow->which_column_dragged * (reflow->column_width + E_REFLOW_FULL_GUTTER) - E_REFLOW_DIVIDER_WIDTH / 2;
-							reflow->temp_column_width = reflow->column_width;
-							reflow->column_drag = TRUE;
-						  
-							gnome_canvas_item_grab (item, 
-										GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK,
-										reflow->arrow_cursor,
-										button->time);
-						  
-							reflow->previous_temp_column_width = -1;
-							reflow->need_column_resize = TRUE;
-							gnome_canvas_item_request_update(item);
-							return TRUE;
-						}
-					}
-					break;
-				case 4:
-					{
-						GtkAdjustment *adjustment = gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas));
-						gdouble new_value = adjustment->value;
-						new_value -= adjustment->step_increment;
-						gtk_adjustment_set_value(adjustment, new_value);
-					}
-					break;
-				case 5: 
-					{
-						GtkAdjustment *adjustment = gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas));
-						gdouble new_value = adjustment->value;
-						new_value += adjustment->step_increment;
-						if ( new_value > adjustment->upper - adjustment->page_size )
-							new_value = adjustment->upper - adjustment->page_size;
-						gtk_adjustment_set_value(adjustment, new_value);
-					}
-					break;
-				}
-			break;
-		case GDK_BUTTON_RELEASE:
-			if (reflow->column_drag) {
-				gdouble old_width = reflow->column_width;
-				GdkEventButton *button = (GdkEventButton *) event;
-				GtkAdjustment *adjustment = gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas));
-				reflow->temp_column_width = reflow->column_width +
-					(button->x - reflow->start_x)/(reflow->which_column_dragged - e_reflow_pick_line(reflow, adjustment->value));
-				if ( reflow->temp_column_width < 50 )
-					reflow->temp_column_width = 50;
-				reflow->column_drag = FALSE;
-				if ( old_width != reflow->temp_column_width ) {
-					gtk_adjustment_set_value(adjustment, adjustment->value + e_reflow_pick_line(reflow, adjustment->value) * (reflow->temp_column_width - reflow->column_width));
-					reflow->column_width = reflow->temp_column_width;
-					adjustment->step_increment = (reflow->column_width + E_REFLOW_FULL_GUTTER) / 2;
-					adjustment->page_increment = adjustment->page_size - adjustment->step_increment;
-					gtk_adjustment_changed(adjustment);
-					e_reflow_resize_children(item);
-					e_canvas_item_request_reflow(item);
-				}
-				reflow->need_column_resize = TRUE;
-				gnome_canvas_item_request_update(item);
-				gnome_canvas_item_ungrab (item, button->time);
-				return TRUE;
-			}
-			break;
-		case GDK_MOTION_NOTIFY:
-			if (reflow->column_drag) {
-				double old_width = reflow->temp_column_width;
-				GdkEventMotion *motion = (GdkEventMotion *) event;
-				GtkAdjustment *adjustment = gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas));
-				reflow->temp_column_width = reflow->column_width +
-					(motion->x - reflow->start_x)/(reflow->which_column_dragged - e_reflow_pick_line(reflow, adjustment->value));
-				if (reflow->temp_column_width < 50)
-					reflow->temp_column_width = 50;
-				if (old_width != reflow->temp_column_width) {
-					reflow->need_column_resize = TRUE;
-					gnome_canvas_item_request_update(item);
-				}
-				return TRUE;
-			} else {
-				GdkEventMotion *motion = (GdkEventMotion *) event;
-				double n_x, max_x;
-
-				n_x = motion->x;
-				n_x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH;
-				n_x = fmod(n_x,(reflow->column_width + E_REFLOW_FULL_GUTTER));
-
-				max_x = E_REFLOW_BORDER_WIDTH;
-				max_x += (reflow->column_width + E_REFLOW_FULL_GUTTER) * reflow->column_count;
-
-				if ( motion->y >= E_REFLOW_BORDER_WIDTH && motion->y <= reflow->height - E_REFLOW_BORDER_WIDTH && n_x < E_REFLOW_FULL_GUTTER && max_x > motion->x) {
-					if ( reflow->default_cursor_shown ) {
-						gdk_window_set_cursor(GTK_WIDGET(item->canvas)->window, reflow->arrow_cursor);
-						reflow->default_cursor_shown = FALSE;
-					}
-				} else 
-					if ( ! reflow->default_cursor_shown ) {
-						gdk_window_set_cursor(GTK_WIDGET(item->canvas)->window, reflow->default_cursor);
-						reflow->default_cursor_shown = TRUE;
-					}
-			    
-			}
-			break;
-		case GDK_ENTER_NOTIFY:
-			if (!reflow->column_drag) {
-				GdkEventCrossing *crossing = (GdkEventCrossing *) event;
-				double n_x, max_x;
-				n_x = crossing->x;
-				n_x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH;
-				n_x = fmod(n_x,(reflow->column_width + E_REFLOW_FULL_GUTTER));
-
-				max_x = E_REFLOW_BORDER_WIDTH;
-				max_x += (reflow->column_width + E_REFLOW_FULL_GUTTER) * reflow->column_count;
-				if ( crossing->y >= E_REFLOW_BORDER_WIDTH && crossing->y <= reflow->height - E_REFLOW_BORDER_WIDTH && n_x < E_REFLOW_FULL_GUTTER && max_x > crossing->x) {
-					if ( reflow->default_cursor_shown ) {
-						gdk_window_set_cursor(GTK_WIDGET(item->canvas)->window, reflow->arrow_cursor);
-						reflow->default_cursor_shown = FALSE;
-					}
-				}
-			}
-			break;
-		case GDK_LEAVE_NOTIFY:
-			if (!reflow->column_drag) {
-				GdkEventCrossing *crossing = (GdkEventCrossing *) event;
-				double n_x;
-				n_x = crossing->x;
-				n_x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH;
-				n_x = fmod(n_x,(reflow->column_width + E_REFLOW_FULL_GUTTER));
-				if ( !( crossing->y >= E_REFLOW_BORDER_WIDTH && crossing->y <= reflow->height - E_REFLOW_BORDER_WIDTH && n_x < E_REFLOW_FULL_GUTTER ) ) {
-					if ( ! reflow->default_cursor_shown ) {
-						gdk_window_set_cursor(GTK_WIDGET(item->canvas)->window, reflow->default_cursor);
-						reflow->default_cursor_shown = TRUE;
-					}
-				}
-			}
-			break;
-		default:
-			break;
-		}
-	if (return_val)
-		return return_val;
-	else if (GNOME_CANVAS_ITEM_CLASS( parent_class )->event)
-		return (* GNOME_CANVAS_ITEM_CLASS( parent_class )->event) (item, event);
-	else
-		return FALSE;
-}
-
-static void e_reflow_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
-				    int x, int y, int width, int height)
-{
-	int x_rect, y_rect, width_rect, height_rect;
-	gdouble running_width;
-	EReflow *reflow = E_REFLOW(item);
-	int i;
-	double column_width;
-
-	if (GNOME_CANVAS_ITEM_CLASS(parent_class)->draw)
-		GNOME_CANVAS_ITEM_CLASS(parent_class)->draw (item, drawable, x, y, width, height);
-	column_width = reflow->column_width;
-	running_width = E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH;
-	x_rect = running_width;
-	y_rect = E_REFLOW_BORDER_WIDTH;
-	width_rect = E_REFLOW_DIVIDER_WIDTH;
-	height_rect = reflow->height - (E_REFLOW_BORDER_WIDTH * 2);
-
-	/* Compute first column to draw. */
-	i = x;
-	i /= column_width + E_REFLOW_FULL_GUTTER;
-	running_width += i * (column_width + E_REFLOW_FULL_GUTTER);
-
-	for ( ; i < reflow->column_count; i++) {
-		if ( running_width > x + width )
-			break;
-		x_rect = running_width;
-		gtk_paint_flat_box(GTK_WIDGET(item->canvas)->style,
-				   drawable,
-				   GTK_STATE_ACTIVE,
-				   GTK_SHADOW_NONE,
-				   NULL,
-				   GTK_WIDGET(item->canvas),
-				   "reflow",
-				   x_rect - x,
-				   y_rect - y,
-				   width_rect,
-				   height_rect);
-		running_width += E_REFLOW_DIVIDER_WIDTH + E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH;
-	}
-	if (reflow->column_drag) {
-		int start_line = e_reflow_pick_line(reflow,
-						    gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas))->value); 
-		i = x - start_line * (column_width + E_REFLOW_FULL_GUTTER);
-		running_width = start_line * (column_width + E_REFLOW_FULL_GUTTER);
-		column_width = reflow->temp_column_width;
-		running_width -= start_line * (column_width + E_REFLOW_FULL_GUTTER);
-		i += start_line * (column_width + E_REFLOW_FULL_GUTTER);
-		running_width += E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH;
-		x_rect = running_width;
-		y_rect = E_REFLOW_BORDER_WIDTH;
-		width_rect = E_REFLOW_DIVIDER_WIDTH;
-		height_rect = reflow->height - (E_REFLOW_BORDER_WIDTH * 2);
-
-		/* Compute first column to draw. */
-		i /= column_width + E_REFLOW_FULL_GUTTER;
-		running_width += i * (column_width + E_REFLOW_FULL_GUTTER);
-		
-		for ( ; i < reflow->column_count; i++) {
-			if ( running_width > x + width )
-				break;
-			x_rect = running_width;
-			gdk_draw_rectangle(drawable,
-					   GTK_WIDGET(item->canvas)->style->fg_gc[GTK_STATE_NORMAL],
-					   TRUE,
-					   x_rect - x,
-					   y_rect - y,
-					   width_rect - 1,
-					   height_rect - 1);					   
-			running_width += E_REFLOW_DIVIDER_WIDTH + E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH;
-		}
-	}
-}
-
-static void
-e_reflow_update (GnomeCanvasItem *item, double affine[6], ArtSVP *clip_path, gint flags)
-{
-	EReflow *reflow;
-	double x0, x1, y0, y1;
-
-	reflow = E_REFLOW (item);
-
-	if (GNOME_CANVAS_ITEM_CLASS(parent_class)->update)
-		GNOME_CANVAS_ITEM_CLASS(parent_class)->update (item, affine, clip_path, flags);
-	
-	x0 = item->x1;
-	y0 = item->y1;
-	x1 = item->x2;
-	y1 = item->y2;
-	if ( x1 < x0 + reflow->width )
-		x1 = x0 + reflow->width;
-	if ( y1 < y0 + reflow->height )
-		y1 = y0 + reflow->height;
-	item->x2 = x1;
-	item->y2 = y1;
-
-	if (reflow->need_height_update) {
-		x0 = item->x1;
-		y0 = item->y1;
-		x1 = item->x2;
-		y1 = item->y2;
-		if ( x0 > 0 )
-			x0 = 0;
-		if ( y0 > 0 )
-			y0 = 0;
-		if ( x1 < E_REFLOW(item)->width )
-			x1 = E_REFLOW(item)->width;
-		if ( x1 < E_REFLOW(item)->height )
-			x1 = E_REFLOW(item)->height;
-
-		gnome_canvas_request_redraw(item->canvas, x0, y0, x1, y1);
-		reflow->need_height_update = FALSE;
-	} else if (reflow->need_column_resize) {
-		int x_rect, y_rect, width_rect, height_rect;
-		int start_line = e_reflow_pick_line(reflow,
-						    gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas))->value); 
-		gdouble running_width;
-		int i;
-		double column_width;
-		
-		if ( reflow->previous_temp_column_width != -1 ) {
-			running_width = start_line * (reflow->column_width + E_REFLOW_FULL_GUTTER);
-			column_width = reflow->previous_temp_column_width;
-			running_width -= start_line * (column_width + E_REFLOW_FULL_GUTTER);
-			running_width += E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH;
-			y_rect = E_REFLOW_BORDER_WIDTH;
-			width_rect = E_REFLOW_DIVIDER_WIDTH;
-			height_rect = reflow->height - (E_REFLOW_BORDER_WIDTH * 2);
-			
-			for ( i = 0; i < reflow->column_count; i++) {
-				x_rect = running_width;
-				gnome_canvas_request_redraw(item->canvas, x_rect, y_rect, x_rect + width_rect, y_rect + height_rect);
-				running_width += E_REFLOW_DIVIDER_WIDTH + E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH;
-			}
-		}
-		
-		if ( reflow->temp_column_width != -1 ) {
-			running_width = start_line * (reflow->column_width + E_REFLOW_FULL_GUTTER);
-			column_width = reflow->temp_column_width;
-			running_width -= start_line * (column_width + E_REFLOW_FULL_GUTTER);
-			running_width += E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH;
-			y_rect = E_REFLOW_BORDER_WIDTH;
-			width_rect = E_REFLOW_DIVIDER_WIDTH;
-			height_rect = reflow->height - (E_REFLOW_BORDER_WIDTH * 2);
-			
-			for ( i = 0; i < reflow->column_count; i++) {
-				x_rect = running_width;
-				gnome_canvas_request_redraw(item->canvas, x_rect, y_rect, x_rect + width_rect, y_rect + height_rect);
-				running_width += E_REFLOW_DIVIDER_WIDTH + E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH;
-			}
-		}
-		
-		reflow->previous_temp_column_width = reflow->temp_column_width;
-		reflow->need_column_resize = FALSE;
-	}
-}
-
-static double
-e_reflow_point (GnomeCanvasItem *item,
-		double x, double y, int cx, int cy,
-		GnomeCanvasItem **actual_item)
-{
-	double distance = 1;
-
-	*actual_item = NULL;
-
-	if (GNOME_CANVAS_ITEM_CLASS(parent_class)->point)
-		distance = GNOME_CANVAS_ITEM_CLASS(parent_class)->point (item, x, y, cx, cy, actual_item);
-	if ((int) (distance * item->canvas->pixels_per_unit + 0.5) <= item->canvas->close_enough && *actual_item)
-		return distance;
-	
-	*actual_item = item;
-	return 0;
-#if 0
-	if (y >= E_REFLOW_BORDER_WIDTH && y <= reflow->height - E_REFLOW_BORDER_WIDTH) {
-	        float n_x;
-		n_x = x;
-		n_x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH;
-		n_x = fmod(n_x, (reflow->column_width + E_REFLOW_FULL_GUTTER));
-		if (n_x < E_REFLOW_FULL_GUTTER) {
-			*actual_item = item;
-			return 0;
-		}
-	}
-	return distance;
-#endif
-}
-
-static void
-e_reflow_reflow( GnomeCanvasItem *item, int flags )
-{
-	EReflow *reflow = E_REFLOW(item);
-	gdouble old_width;
-	gdouble running_width;
-	gdouble running_height;
-	int next_column;
-	int i;
-
-	if (! (GTK_OBJECT_FLAGS (reflow) & GNOME_CANVAS_ITEM_REALIZED))
-		return;
-
-	if (reflow->need_reflow_columns) {
-		reflow_columns (reflow);
-	}
-		
-	old_width = reflow->width;
-
-	running_width = E_REFLOW_BORDER_WIDTH;
-	running_height = E_REFLOW_BORDER_WIDTH;
-
-	next_column = 1;
-
-	for (i = 0; i < reflow->count; i++) {
-		int unsorted = e_sorter_sorted_to_model (E_SORTER (reflow->sorter), i);
-		if (next_column < reflow->column_count && i == reflow->columns[next_column]) {
-			running_height = E_REFLOW_BORDER_WIDTH;
-			running_width += reflow->column_width + E_REFLOW_FULL_GUTTER;
-			next_column ++;
-		}
-
-		if (reflow->items[unsorted])
-			e_canvas_item_move_absolute(GNOME_CANVAS_ITEM(reflow->items[unsorted]),
-						    (double) running_width,
-						    (double) running_height);
-		running_height += reflow->heights[unsorted] + E_REFLOW_BORDER_WIDTH;
-	}
-	reflow->width = running_width + reflow->column_width + E_REFLOW_BORDER_WIDTH;
-	if ( reflow->width < reflow->minimum_width )
-		reflow->width = reflow->minimum_width;
-	if (old_width != reflow->width)
-		e_canvas_item_request_parent_reflow(item);
-}
-
-static int
-e_reflow_selection_event_real (EReflow *reflow, GnomeCanvasItem *item, GdkEvent *event)
-{
-	int row;
-	int return_val = TRUE;
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-		switch (event->button.button) {
-		case 1: /* Fall through. */
-		case 2:
-			row = er_find_item (reflow, item);
-			e_selection_model_do_something(reflow->selection, row, 0, event->button.state);
-			break;
-		case 3:
-			row = er_find_item (reflow, item);
-			e_selection_model_maybe_do_something(reflow->selection, row, 0, event->button.state);
-			break;
-		default:
-			return_val = FALSE;
-			break;
-		}
-		break;
-	case GDK_KEY_PRESS:
-		return_val = e_selection_model_key_press(reflow->selection, (GdkEventKey *) event);
-		break;
-	default:
-		return_val = FALSE;
-		break;
-	}
-
-	return return_val;
-}
-
-static void
-e_reflow_class_init (EReflowClass *klass)
-{
-	GtkObjectClass *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	object_class = (GtkObjectClass*) klass;
-	item_class = (GnomeCanvasItemClass *) klass;
-
-	parent_class = gtk_type_class (gnome_canvas_group_get_type ());
-  
-	gtk_object_add_arg_type ("EReflow::minimum_width", GTK_TYPE_DOUBLE,
-				 GTK_ARG_READWRITE, ARG_MINIMUM_WIDTH);
-	gtk_object_add_arg_type ("EReflow::width", GTK_TYPE_DOUBLE,
-				 GTK_ARG_READABLE, ARG_WIDTH);
-	gtk_object_add_arg_type ("EReflow::height", GTK_TYPE_DOUBLE,
-				 GTK_ARG_READWRITE, ARG_HEIGHT);
-	gtk_object_add_arg_type ("EReflow::empty_message", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_EMPTY_MESSAGE);
-	gtk_object_add_arg_type ("EReflow::model", E_REFLOW_MODEL_TYPE,
-				 GTK_ARG_READWRITE, ARG_MODEL);
-
-	signals [SELECTION_EVENT] =
-		gtk_signal_new ("selection_event",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EReflowClass, selection_event),
-				e_marshal_INT__OBJECT_POINTER,
-				GTK_TYPE_INT, 2, GTK_TYPE_OBJECT, GTK_TYPE_GDK_EVENT);
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-
-	object_class->set_arg  = e_reflow_set_arg;
-	object_class->get_arg  = e_reflow_get_arg;
-	object_class->destroy  = e_reflow_destroy;
-  
-	/* GnomeCanvasItem method overrides */
-	item_class->event      = e_reflow_event;
-	item_class->realize    = e_reflow_realize;
-	item_class->unrealize  = e_reflow_unrealize;
-	item_class->draw       = e_reflow_draw;
-	item_class->update     = e_reflow_update;
-	item_class->point      = e_reflow_point;
-
-	klass->selection_event = e_reflow_selection_event_real;
-}
-
-static void
-e_reflow_init (EReflow *reflow)
-{
-	reflow->model                = NULL;
-	reflow->items                = NULL;
-	reflow->heights              = NULL;
-	reflow->count                = 0;
-
-	reflow->columns              = NULL;
-	reflow->column_count         = 0;
-
-	reflow->empty_text           = NULL;
-	reflow->empty_message        = NULL;
-
-	reflow->minimum_width        = 10;
-	reflow->width                = 10;
-	reflow->height               = 10;
-
-	reflow->column_width         = 150;
-
-	reflow->column_drag          = FALSE;
-
-	reflow->need_height_update   = FALSE;
-	reflow->need_column_resize   = FALSE;
-
-	reflow->default_cursor_shown = TRUE;
-	reflow->arrow_cursor         = NULL;
-	reflow->default_cursor       = NULL;
-
-	reflow->incarnate_idle_id    = 0;
-
-	reflow->selection            = E_SELECTION_MODEL (e_selection_model_simple_new());
-	reflow->sorter               = e_sorter_array_new (er_compare, reflow);
-
-	gtk_object_set (GTK_OBJECT (reflow->selection),
-			"sorter", reflow->sorter,
-			NULL);
-
-	reflow->selection_changed_id = 
-		gtk_signal_connect(GTK_OBJECT(reflow->selection), "selection_changed",
-				   GTK_SIGNAL_FUNC(selection_changed), reflow);
-
-	e_canvas_item_set_reflow_callback(GNOME_CANVAS_ITEM(reflow), e_reflow_reflow);
-}
-
-GtkType
-e_reflow_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type) {
-		static const GtkTypeInfo info = {
-			"EReflow",
-			sizeof (EReflow),
-			sizeof (EReflowClass),
-			(GtkClassInitFunc) e_reflow_class_init,
-			(GtkObjectInitFunc) e_reflow_init,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-
-		type = gtk_type_unique (gnome_canvas_group_get_type (), &info);
-	}
-
-	return type;
-}
diff --git a/widgets/misc/e-reflow.h b/widgets/misc/e-reflow.h
deleted file mode 100644
index 9ecbb5c529..0000000000
--- a/widgets/misc/e-reflow.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-reflow.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_REFLOW_H__
-#define __E_REFLOW_H__
-
-#include <libgnomeui/gnome-canvas.h>
-#include <gal/widgets/e-reflow-model.h>
-#include <gal/widgets/e-selection-model.h>
-#include <gal/util/e-sorter-array.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EReflow - A canvas item container.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * minimum_width double         RW              minimum width of the reflow.  width >= minimum_width
- * width        double          R               width of the reflow
- * height       double          RW              height of the reflow
- */
-
-#define E_REFLOW_TYPE			(e_reflow_get_type ())
-#define E_REFLOW(obj)			(GTK_CHECK_CAST ((obj), E_REFLOW_TYPE, EReflow))
-#define E_REFLOW_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_REFLOW_TYPE, EReflowClass))
-#define E_IS_REFLOW(obj)		(GTK_CHECK_TYPE ((obj), E_REFLOW_TYPE))
-#define E_IS_REFLOW_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_REFLOW_TYPE))
-
-
-typedef struct EReflowPriv    EReflowPriv;
-
-typedef struct _EReflow       EReflow;
-typedef struct _EReflowClass  EReflowClass;
-
-struct _EReflow
-{
-	GnomeCanvasGroup parent;
-	
-	/* item specific fields */
-	EReflowModel *model;
-	guint model_changed_id;
-	guint model_items_inserted_id;
-	guint model_item_changed_id;
-
-	ESelectionModel *selection;
-	guint selection_changed_id;
-	ESorterArray *sorter;
-
-	GtkAdjustment *adjustment;
-	guint adjustment_changed_id;
-	guint adjustment_value_changed_id;
-	guint set_scroll_adjustments_id;
-
-	int *heights;
-	GnomeCanvasItem **items;
-	int count;
-	int allocated_count;
-
-	int *columns;
-	gint column_count; /* Number of columnns */
-
-	GnomeCanvasItem *empty_text;
-	gchar *empty_message;
-
-	double minimum_width;
-	double width;
-	double height;
-
-	double column_width;
-
-	int incarnate_idle_id;
-
-	/* These are all for when the column is being dragged. */
-	gdouble start_x;
-	gint which_column_dragged;
-	double temp_column_width;
-	double previous_temp_column_width;
-
-	guint column_drag : 1;
-
-	guint need_height_update : 1;
-	guint need_column_resize : 1;
-	guint need_reflow_columns : 1;
-
-	guint default_cursor_shown : 1;
-	GdkCursor *arrow_cursor;
-	GdkCursor *default_cursor;
-};
-
-struct _EReflowClass
-{
-	GnomeCanvasGroupClass parent_class;
-
-	int (*selection_event) (EReflow *reflow, GnomeCanvasItem *item, GdkEvent *event);
-};
-
-/* 
- * To be added to a reflow, an item must have the argument "width" as
- * a Read/Write argument and "height" as a Read Only argument.  It
- * should also do an ECanvas parent reflow request if its size
- * changes.
- */
-GtkType  e_reflow_get_type       (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __E_REFLOW_H__ */
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
deleted file mode 100644
index e530e29591..0000000000
--- a/widgets/misc/e-search-bar.c
+++ /dev/null
@@ -1,524 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-search-bar.c
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * Authors:
- *  Chris Lahey <clahey@ximian.com>
- *  Ettore Perazzoli <ettore@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include <stdio.h> /* printf */
-#include <gtk/gtkdrawingarea.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkoptionmenu.h>
-
-#include <gal/widgets/e-unicode.h>
-#include <gal/widgets/e-gui-utils.h>
-
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-
-#include "e-search-bar.h"
-#include "e-dropdown-button.h"
-
-
-enum {
-	QUERY_CHANGED,
-	MENU_ACTIVATED,
-
-	LAST_SIGNAL
-};
-
-static gint esb_signals [LAST_SIGNAL] = { 0, };
-
-static GtkHBoxClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_OPTION_CHOICE,
-	ARG_TEXT,
-};
-
-
-/* Signals.  */
-
-static void
-emit_query_changed (ESearchBar *esb)
-{
-	gtk_signal_emit(GTK_OBJECT (esb),
-			esb_signals [QUERY_CHANGED]);
-}
-
-static void
-emit_menu_activated (ESearchBar *esb, int item)
-{
-	gtk_signal_emit(GTK_OBJECT (esb),
-			esb_signals [MENU_ACTIVATED],
-			item);
-}
-
-
-/* Callbacks.  */
-
-static void
-menubar_activated_cb (GtkWidget *widget, ESearchBar *esb)
-{
-	int id;
-
-	id = GPOINTER_TO_INT(gtk_object_get_data (GTK_OBJECT (widget), "EsbMenuId"));
-
-	emit_menu_activated(esb, id);
-}
-
-static void
-option_activated_cb (GtkWidget *widget,
-		     ESearchBar *esb)
-{
-	int id;
-
-	id = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (widget), "EsbChoiceId"));
-
-	esb->option_choice = id;
-	emit_query_changed (esb);
-}
-
-static void
-entry_activated_cb (GtkWidget *widget,
-		     ESearchBar *esb)
-{
-	emit_query_changed (esb);
-}
-
-
-/* Widgetry creation.  */
-
-static void add_dropdown(ESearchBar *esb, ESearchBarItem *items)
-{
-	GtkWidget *menu = esb->dropdown_menu;
-	GtkWidget *item;
-
-	if (items->text) {
-		char *str;
-		str = _(items->text);
-		if (str == items->text) {
-			/* It may be english string, or utf8 rule name */
-			item = e_utf8_gtk_menu_item_new_with_label (GTK_MENU (menu), str);
-		} else
-			item = gtk_menu_item_new_with_label (str);
-	}
-	else
-		item = gtk_menu_item_new();
-
-	gtk_widget_show(item);
-	gtk_menu_append (GTK_MENU (menu), item);
-	gtk_object_set_data (GTK_OBJECT (item), "EsbMenuId", GINT_TO_POINTER(items->id));
-	gtk_signal_connect (GTK_OBJECT (item), "activate",
-			    GTK_SIGNAL_FUNC (menubar_activated_cb),
-			    esb);
-}
-
-static void
-set_dropdown (ESearchBar *esb,
-	      ESearchBarItem *items)
-{
-	GtkWidget *menu;
-	GtkWidget *dropdown;
-	int i;
-
-	menu = esb->dropdown_menu = gtk_menu_new ();
-	for (i = 0; items[i].id != -1; i++)
-		add_dropdown(esb, items+i);
-
-	gtk_widget_show_all (menu);
-
-	dropdown = e_dropdown_button_new (_("Sear_ch"), GTK_MENU (menu));
-	gtk_widget_show (dropdown);
-
-	if (esb->dropdown_holder == NULL) {
-
-		/* So, GtkOptionMenu is stupid; it adds a 1-pixel-wide empty border
-	           around the button for no reason.  So we add a 1-pixel-wide border
-	           around the button as well, by using an event box.  */
-
-		esb->dropdown_holder = gtk_event_box_new ();
-		gtk_container_set_border_width (GTK_CONTAINER (esb->dropdown_holder), 1);
-		esb->dropdown = dropdown;
-		gtk_container_add (GTK_CONTAINER (esb->dropdown_holder), esb->dropdown);
-		gtk_widget_show (esb->dropdown_holder);
-
-		gtk_box_pack_start(GTK_BOX(esb), esb->dropdown_holder, FALSE, FALSE, 0);
-	} else {
-		gtk_widget_destroy(esb->dropdown);
-		esb->dropdown = dropdown;
-		gtk_container_add (GTK_CONTAINER (esb->dropdown_holder), esb->dropdown);
-	}
-}
-
-static void
-set_option(ESearchBar *esb, ESearchBarItem *items)
-{
-	GtkWidget *menu;
-	GtkRequisition dropdown_requisition;
-	GtkRequisition option_requisition;
-	int i;
-
-	if (esb->option) {
-		gtk_widget_destroy(esb->option_menu);
-	} else {
-		esb->option = gtk_option_menu_new();
-		gtk_widget_show(esb->option);
-		gtk_box_pack_start(GTK_BOX(esb), esb->option, FALSE, FALSE, 0);
-	}
-
-	esb->option_menu = menu = gtk_menu_new ();
-	for (i = 0; items[i].id != -1; i++) {
-		GtkWidget *item;
-
-		if (items[i].text) {
-			char *str;
-			str = _(items[i].text);
-			if (str == items[i].text) {
-				/* It may be english string, or utf8 rule name */
-				item = e_utf8_gtk_menu_item_new_with_label (GTK_MENU (menu), str);
-			} else
-				item = gtk_menu_item_new_with_label (str);
-		}
-		else
-			item = gtk_menu_item_new();
-
-		gtk_menu_append (GTK_MENU (menu), item);
-
-		gtk_object_set_data (GTK_OBJECT (item), "EsbChoiceId", GINT_TO_POINTER(items[i].id));
-
-		gtk_signal_connect (GTK_OBJECT (item), "activate",
-				    GTK_SIGNAL_FUNC (option_activated_cb),
-				    esb);
-	}
-	gtk_widget_show_all (menu);
-
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (esb->option), menu);
-	gtk_option_menu_set_history (GTK_OPTION_MENU (esb->option), 0);
-
-	gtk_widget_set_sensitive (esb->option, TRUE);
-
-	/* Set the minimum height of this widget to that of the dropdown
-           button, for a better look.  */
-	g_assert (esb->dropdown != NULL);
-
-	gtk_widget_size_request (esb->dropdown, &dropdown_requisition);
-	gtk_widget_size_request (esb->option, &option_requisition);
-
-	gtk_container_set_border_width (GTK_CONTAINER (esb->dropdown), GTK_CONTAINER (esb->option)->border_width);
-}
-
-static void
-add_entry (ESearchBar *esb)
-{
-	esb->entry = gtk_entry_new();
-	gtk_signal_connect (GTK_OBJECT (esb->entry), "activate",
-			    GTK_SIGNAL_FUNC (entry_activated_cb), esb);
-	gtk_widget_show(esb->entry);
-	gtk_box_pack_start(GTK_BOX(esb), esb->entry, TRUE, TRUE, 0);
-}
-
-static void
-add_spacer (ESearchBar *esb)
-{
-	GtkWidget *spacer;
-
-	spacer = gtk_drawing_area_new();
-	gtk_widget_show(spacer);
-	gtk_box_pack_start(GTK_BOX(esb), spacer, FALSE, FALSE, 0);
-
-	gtk_widget_set_usize(spacer, 19, 1);
-}
-
-static int
-find_id(GtkWidget *menu, int idin, const char *type, GtkWidget **widget)
-{
-	GList *l = GTK_MENU_SHELL(menu)->children;
-	int row = -1, i = 0, id;
-
-	if (widget)
-		*widget = NULL;
-	while (l) {
-		id = GPOINTER_TO_INT(gtk_object_get_data(l->data, type));
-		printf("comparing id %d to query %d\n", id, idin);
-		if (id == idin) {
-			row = i;
-			if (widget)
-				*widget = l->data;
-			break;
-		}
-		i++;
-		l = l->next;
-	}
-	return row;
-}
-
-
-/* GtkObject methods.  */
-
-static void
-impl_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESearchBar *esb = E_SEARCH_BAR(object);
-
-	switch (arg_id) {
-	case ARG_OPTION_CHOICE:
-		GTK_VALUE_ENUM (*arg) = e_search_bar_get_option_choice (esb);
-		break;
-
-	case ARG_TEXT:
-		GTK_VALUE_STRING (*arg) = e_search_bar_get_text (esb);
-		break;
-
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-impl_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESearchBar *esb = E_SEARCH_BAR(object);
-	int row;
-
-	switch (arg_id) {
-	case ARG_OPTION_CHOICE:
-		esb->option_choice = GTK_VALUE_ENUM(*arg);
-		row = find_id(esb->option_menu, esb->option_choice, "EsbChoiceId", NULL);
-		if (row == -1)
-			row = 0;
-		gtk_option_menu_set_history (GTK_OPTION_MENU (esb->option), row);
-		emit_query_changed (esb);
-		break;
-
-	case ARG_TEXT:
-		e_utf8_gtk_editable_set_text(GTK_EDITABLE(esb->entry), GTK_VALUE_STRING (*arg));
-		emit_query_changed (esb);
-		break;
-
-	default:
-		break;
-	}
-}
-
-static void
-impl_destroy (GtkObject *object)
-{
-	if (GTK_OBJECT_CLASS(parent_class)->destroy)
-		GTK_OBJECT_CLASS(parent_class)->destroy (object);
-}
-
-
-static void
-class_init (ESearchBarClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-
-	parent_class = gtk_type_class (gtk_hbox_get_type ());
-
-	object_class->set_arg = impl_set_arg;
-	object_class->get_arg = impl_get_arg;
-	object_class->destroy = impl_destroy;
-
-	klass->set_menu = set_dropdown;
-	klass->set_option = set_option;
-
-	gtk_object_add_arg_type ("ESearchBar::option_choice", GTK_TYPE_ENUM,
-				 GTK_ARG_READWRITE, ARG_OPTION_CHOICE);
-	gtk_object_add_arg_type ("ESearchBar::text", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_TEXT);
-
-	esb_signals [QUERY_CHANGED] =
-		gtk_signal_new ("query_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ESearchBarClass, query_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	esb_signals [MENU_ACTIVATED] =
-		gtk_signal_new ("menu_activated",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ESearchBarClass, menu_activated),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
-
-	gtk_object_class_add_signals (object_class, esb_signals, LAST_SIGNAL);
-}
-
-static void
-init (ESearchBar *esb)
-{
-	esb->dropdown      = NULL;
-	esb->option        = NULL;
-	esb->entry         = NULL;
-
-	esb->option_choice = 0;
-}
-
-
-/* Object construction.  */
-
-void
-e_search_bar_construct (ESearchBar *search_bar,
-			ESearchBarItem *menu_items,
-			ESearchBarItem *option_items)
-{
-	g_return_if_fail (search_bar != NULL);
-	g_return_if_fail (E_IS_SEARCH_BAR (search_bar));
-	g_return_if_fail (menu_items != NULL);
-	g_return_if_fail (option_items != NULL);
-	
-	gtk_box_set_spacing (GTK_BOX (search_bar), 1);
-
-	e_search_bar_set_menu(search_bar, menu_items);
-
-	e_search_bar_set_option(search_bar, option_items);
-
-	add_entry (search_bar);
-
-	add_spacer (search_bar);
-}
-
-void
-e_search_bar_set_menu(ESearchBar *search_bar, ESearchBarItem *menu_items)
-{
-	g_return_if_fail (search_bar != NULL);
-	g_return_if_fail (E_IS_SEARCH_BAR (search_bar));
-	g_return_if_fail (menu_items != NULL);
-
-	((ESearchBarClass *)((GtkObject *)search_bar)->klass)->set_menu(search_bar, menu_items);
-}
-
-void
-e_search_bar_add_menu(ESearchBar *search_bar, ESearchBarItem *menu_item)
-{
-	g_return_if_fail (search_bar != NULL);
-	g_return_if_fail (E_IS_SEARCH_BAR (search_bar));
-	g_return_if_fail (menu_item != NULL);
-
-	add_dropdown(search_bar, menu_item);
-}
-
-void
-e_search_bar_set_option(ESearchBar *search_bar, ESearchBarItem *option_items)
-{
-	g_return_if_fail (search_bar != NULL);
-	g_return_if_fail (E_IS_SEARCH_BAR (search_bar));
-	g_return_if_fail (option_items != NULL);
-
-	((ESearchBarClass *)((GtkObject *)search_bar)->klass)->set_option(search_bar, option_items);
-}
-
-GtkWidget *
-e_search_bar_new (ESearchBarItem *menu_items,
-		  ESearchBarItem *option_items)
-{
-	GtkWidget *widget;
-
-	g_return_val_if_fail (menu_items != NULL, NULL);
-	g_return_val_if_fail (option_items != NULL, NULL);
-	
-	widget = GTK_WIDGET (gtk_type_new (e_search_bar_get_type ()));
-
-	e_search_bar_construct (E_SEARCH_BAR (widget), menu_items, option_items);
-
-	return widget;
-}
-
-void
-e_search_bar_set_menu_sensitive(ESearchBar *esb, int id, gboolean state)
-{
-	int row;
-	GtkWidget *widget;
-
-	row = find_id(esb->dropdown_menu, id, "EsbMenuId", &widget);
-	if (row != -1)
-		gtk_widget_set_sensitive(widget, state);
-}
-
-GtkType
-e_search_bar_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type) {
-		static const GtkTypeInfo info = {
-			"ESearchBar",
-			sizeof (ESearchBar),
-			sizeof (ESearchBarClass),
-			(GtkClassInitFunc) class_init,
-			(GtkObjectInitFunc) init,
-			/* reserved_1 */ NULL,
-		       	/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-		
-		type = gtk_type_unique (gtk_hbox_get_type (), &info);
-	}
-
-	return type;
-}
-
-/**
- * e_search_bar_get_option_choice:
- * @search_bar: A search bar.
- * 
- * Queries the currently selected item in the options menu of a search bar.
- * 
- * Return value: Identifier of the selected item in the options menu.
- **/
-int
-e_search_bar_get_option_choice (ESearchBar *search_bar)
-{
-	g_return_val_if_fail (search_bar != NULL, -1);
-	g_return_val_if_fail (E_IS_SEARCH_BAR (search_bar), -1);
-
-	return search_bar->option_choice;
-}
-
-/**
- * e_search_bar_get_text:
- * @search_bar: A search bar.
- * 
- * Queries the text of the entry line in a search bar.
- * 
- * Return value: The text string that is in the entry line of the search bar.
- * This must be freed using g_free().
- **/
-char *
-e_search_bar_get_text (ESearchBar *search_bar)
-{
-	g_return_val_if_fail (search_bar != NULL, NULL);
-	g_return_val_if_fail (E_IS_SEARCH_BAR (search_bar), NULL);
-
-	return e_utf8_gtk_editable_get_text (GTK_EDITABLE (search_bar->entry));
-}
diff --git a/widgets/misc/e-search-bar.h b/widgets/misc/e-search-bar.h
deleted file mode 100644
index 9cdb83d029..0000000000
--- a/widgets/misc/e-search-bar.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-search-bar.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_SEARCH_BAR_H__
-#define __E_SEARCH_BAR_H__
-
-#include <gtk/gtkhbox.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* ESearchBar - A card displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		 type		read/write	description
- * ---------------------------------------------------------------------------------
- * option_choice int            RW              Which option choice is currently selected.
- * text          string         RW              Text in the entry box.
- */
-
-#define E_SEARCH_BAR_TYPE			(e_search_bar_get_type ())
-#define E_SEARCH_BAR(obj)			(GTK_CHECK_CAST ((obj), E_SEARCH_BAR_TYPE, ESearchBar))
-#define E_SEARCH_BAR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_SEARCH_BAR_TYPE, ESearchBarClass))
-#define E_IS_SEARCH_BAR(obj)		(GTK_CHECK_TYPE ((obj), E_SEARCH_BAR_TYPE))
-#define E_IS_SEARCH_BAR_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_SEARCH_BAR_TYPE))
-
-typedef struct {
-	char *text;
-	int id;
-} ESearchBarItem;
-
-typedef struct _ESearchBar       ESearchBar;
-typedef struct _ESearchBarClass  ESearchBarClass;
-
-struct _ESearchBar
-{
-	GtkHBox parent;
-	
-	/* item specific fields */
-	GtkWidget *dropdown;
-	GtkWidget *option;
-	GtkWidget *entry;
-
-	/* PRIVATE */
-	GtkWidget *dropdown_holder;	/* holds the dropdown */
-	GtkWidget *option_menu;
-	GtkWidget *dropdown_menu;
-
-	int        option_choice;
-};
-
-struct _ESearchBarClass
-{
-	GtkHBoxClass parent_class;
-
-	void (*set_menu)       (ESearchBar *, ESearchBarItem *);
-	void (*set_option)     (ESearchBar *, ESearchBarItem *);
-
-	void (*query_changed)  (ESearchBar *search);
-	void (*menu_activated) (ESearchBar *search, int item);
-};
-
-
-GtkType    e_search_bar_get_type   (void);
-void       e_search_bar_set_menu   (ESearchBar *search_bar, ESearchBarItem *menu_items);
-void	   e_search_bar_add_menu   (ESearchBar *search_bar, ESearchBarItem *menu_item);
-
-void       e_search_bar_set_option (ESearchBar *search_bar, ESearchBarItem *option_items);
-void       e_search_bar_construct  (ESearchBar     *search_bar,
-				    ESearchBarItem *menu_items,
-				    ESearchBarItem *option_items);
-GtkWidget *e_search_bar_new        (ESearchBarItem *menu_items,
-				    ESearchBarItem *option_items);
-
-void       e_search_bar_set_menu_sensitive(ESearchBar *search_bar, int id, gboolean state);
-
-int        e_search_bar_get_option_choice (ESearchBar *search_bar);
-char      *e_search_bar_get_text          (ESearchBar *search_bar);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_SEARCH_BAR_H__ */
diff --git a/widgets/misc/e-selection-model-array.c b/widgets/misc/e-selection-model-array.c
deleted file mode 100644
index de8265ce2a..0000000000
--- a/widgets/misc/e-selection-model-array.c
+++ /dev/null
@@ -1,466 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-selection-model-array.c: a Selection Model
- *
- * Author:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "e-selection-model-array.h"
-#include "gal/util/e-util.h"
-
-#define ESMA_CLASS(e) ((ESelectionModelArrayClass *)((GtkObject *)e)->klass)
-
-#define PARENT_TYPE e_selection_model_get_type ()
-
-static ESelectionModelClass *parent_class;
-
-enum {
-	ARG_0,
-	ARG_CURSOR_ROW,
-	ARG_CURSOR_COL,
-};
-
-void
-e_selection_model_array_confirm_row_count(ESelectionModelArray *esma)
-{
-	if (esma->eba == NULL) {
-		int row_count = e_selection_model_array_get_row_count(esma);
-		esma->eba = e_bit_array_new(row_count);
-	}
-}
-
-/* FIXME: Should this deal with moving the selection if it's in single mode? */
-void
-e_selection_model_array_delete_rows(ESelectionModelArray *esma, int row, int count)
-{
-	if (esma->eba) {
-
-		if (E_SELECTION_MODEL(esma)->mode == GTK_SELECTION_SINGLE)
-			e_bit_array_delete_single_mode(esma->eba, row, count);
-		else
-			e_bit_array_delete(esma->eba, row, count);
-
-		if (esma->cursor_row > row + count)
-			esma->cursor_row -= count;
-		else if (esma->cursor_row > row)
-			esma->cursor_row = row;
-
-		e_selection_model_selection_changed(E_SELECTION_MODEL(esma));
-		e_selection_model_cursor_changed(E_SELECTION_MODEL(esma), esma->cursor_row, esma->cursor_col);
-	}
-}
-
-void
-e_selection_model_array_insert_rows(ESelectionModelArray *esma, int row, int count)
-{
-	if (esma->eba) {
-		e_bit_array_insert(esma->eba, row, count);
-
-		if (esma->cursor_row >= row)
-			esma->cursor_row += count;
-
-		e_selection_model_selection_changed(E_SELECTION_MODEL(esma));
-		e_selection_model_cursor_changed(E_SELECTION_MODEL(esma), esma->cursor_row, esma->cursor_col);
-	}
-}
-
-void
-e_selection_model_array_move_row(ESelectionModelArray *esma, int old_row, int new_row)
-{
-	ESelectionModel *esm = E_SELECTION_MODEL(esma);
-
-	if (esma->eba) {
-		gboolean selected = e_bit_array_value_at(esma->eba, old_row);
-		gboolean cursor = (esma->cursor_row == old_row);
-
-		if (old_row < esma->cursor_row && esma->cursor_row < new_row)
-			esma->cursor_row --;
-		else if (new_row < esma->cursor_row && esma->cursor_row < old_row)
-			esma->cursor_row ++;
-
-		e_bit_array_move_row(esma->eba, old_row, new_row);
-
-		if (selected) {
-			if (esm->mode == GTK_SELECTION_SINGLE)
-				e_bit_array_select_single_row (esma->eba, new_row);
-			else
-				e_bit_array_change_one_row(esma->eba, new_row, TRUE);
-		}
-		if (cursor) {
-			esma->cursor_row = new_row;
-		}
-		e_selection_model_selection_changed(esm);
-		e_selection_model_cursor_changed(esm, esma->cursor_row, esma->cursor_col);
-	}
-}
-
-static void
-esma_destroy (GtkObject *object)
-{
-	ESelectionModelArray *esma;
-
-	esma = E_SELECTION_MODEL_ARRAY (object);
-
-	if (esma->eba) {
-		gtk_object_unref(GTK_OBJECT(esma->eba));
-		esma->eba = NULL;
-	}
-}
-
-static void
-esma_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY (o);
-
-	switch (arg_id){
-	case ARG_CURSOR_ROW:
-		GTK_VALUE_INT(*arg) = esma->cursor_row;
-		break;
-
-	case ARG_CURSOR_COL:
-		GTK_VALUE_INT(*arg) = esma->cursor_col;
-		break;
-	}
-}
-
-static void
-esma_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ESelectionModel *esm = E_SELECTION_MODEL (o);
-	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY (o);
-
-	switch (arg_id){
-	case ARG_CURSOR_ROW:
-		e_selection_model_do_something(esm, GTK_VALUE_INT(*arg), esma->cursor_col, 0);
-		break;
-
-	case ARG_CURSOR_COL:
-		e_selection_model_do_something(esm, esma->cursor_row, GTK_VALUE_INT(*arg), 0);
-		break;
-	}
-}
-
-/** 
- * e_selection_model_is_row_selected
- * @selection: #ESelectionModel to check
- * @n: The row to check
- *
- * This routine calculates whether the given row is selected.
- *
- * Returns: %TRUE if the given row is selected
- */
-static gboolean
-esma_is_row_selected (ESelectionModel *selection,
-		      gint             n)
-{
-	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection);
-	if (esma->eba)
-		return e_bit_array_value_at(esma->eba, n);
-	else
-		return FALSE;
-}
-
-/** 
- * e_selection_model_foreach
- * @selection: #ESelectionModel to traverse
- * @callback: The callback function to call back.
- * @closure: The closure
- *
- * This routine calls the given callback function once for each
- * selected row, passing closure as the closure.
- */
-static void 
-esma_foreach (ESelectionModel *selection,
-	      EForeachFunc     callback,
-	      gpointer         closure)
-{
-	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection);
-	if (esma->eba)
-		e_bit_array_foreach(esma->eba, callback, closure);
-}
-
-/** 
- * e_selection_model_clear
- * @selection: #ESelectionModel to clear
- *
- * This routine clears the selection to no rows selected.
- */
-static void
-esma_clear(ESelectionModel *selection)
-{
-	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection);
-	if (esma->eba) {
-		gtk_object_unref(GTK_OBJECT(esma->eba));
-		esma->eba = NULL;
-	}
-	esma->cursor_row = -1;
-	esma->cursor_col = -1;
-	e_selection_model_selection_changed(E_SELECTION_MODEL(esma));
-	e_selection_model_cursor_changed(E_SELECTION_MODEL(esma), -1, -1);
-}
-
-#define PART(x,n) (((x) & (0x01010101 << n)) >> n)
-#define SECTION(x, n) (((x) >> (n * 8)) & 0xff)
-
-/** 
- * e_selection_model_selected_count
- * @selection: #ESelectionModel to count
- *
- * This routine calculates the number of rows selected.
- *
- * Returns: The number of rows selected in the given model.
- */
-static gint
-esma_selected_count (ESelectionModel *selection)
-{
-	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection);
-	if (esma->eba)
-		return e_bit_array_selected_count(esma->eba);
-	else
-		return 0;
-}
-
-/** 
- * e_selection_model_select_all
- * @selection: #ESelectionModel to select all
- *
- * This routine selects all the rows in the given
- * #ESelectionModel.
- */
-static void
-esma_select_all (ESelectionModel *selection)
-{
-	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection);
-
-	e_selection_model_array_confirm_row_count(esma);
-
-	e_bit_array_select_all(esma->eba);
-
-	esma->cursor_col = 0;
-	esma->cursor_row = 0;
-	esma->selection_start_row = 0;
-	e_selection_model_selection_changed(E_SELECTION_MODEL(esma));
-	e_selection_model_cursor_changed(E_SELECTION_MODEL(esma), 0, 0);
-}
-
-/** 
- * e_selection_model_invert_selection
- * @selection: #ESelectionModel to invert
- *
- * This routine inverts all the rows in the given
- * #ESelectionModel.
- */
-static void
-esma_invert_selection (ESelectionModel *selection)
-{
-	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection);
-
-	e_selection_model_array_confirm_row_count(esma);
-
-	e_bit_array_invert_selection(esma->eba);
-	
-	esma->cursor_col = -1;
-	esma->cursor_row = -1;
-	esma->selection_start_row = 0;
-	e_selection_model_selection_changed(E_SELECTION_MODEL(esma));
-	e_selection_model_cursor_changed(E_SELECTION_MODEL(esma), -1, -1);
-}
-
-static int
-esma_row_count (ESelectionModel *selection)
-{
-	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection);
-	e_selection_model_array_confirm_row_count(esma);
-	return e_bit_array_bit_count(esma->eba);
-}
-
-static void
-esma_change_one_row(ESelectionModel *selection, int row, gboolean grow)
-{
-	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection);
-	e_selection_model_array_confirm_row_count(esma);
-	e_bit_array_change_one_row(esma->eba, row, grow);
-}
-
-static void
-esma_change_cursor (ESelectionModel *selection, int row, int col)
-{
-	ESelectionModelArray *esma;
-
-	g_return_if_fail(selection != NULL);
-	g_return_if_fail(E_IS_SELECTION_MODEL(selection));
-
-	esma = E_SELECTION_MODEL_ARRAY(selection);
-
-	esma->cursor_row = row;
-	esma->cursor_col = col;
-}
-
-static void
-esma_change_range(ESelectionModel *selection, int start, int end, gboolean grow)
-{
-	int i;
-	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection);
-	if (start != end) {
-		if (selection->sorter && e_sorter_needs_sorting(selection->sorter)) {
-			for ( i = start; i < end; i++) {
-				e_bit_array_change_one_row(esma->eba, e_sorter_sorted_to_model(selection->sorter, i), grow);
-			}
-		} else {
-			e_selection_model_array_confirm_row_count(esma);
-			e_bit_array_change_range(esma->eba, start, end, grow);
-		}
-	}
-}
-
-static int
-esma_cursor_row (ESelectionModel *selection)
-{
-	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection);
-	return esma->cursor_row;
-}
-
-static int
-esma_cursor_col (ESelectionModel *selection)
-{
-	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection);
-	return esma->cursor_col;
-}
-
-static void
-esma_select_single_row (ESelectionModel *selection, int row)
-{
-	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection);
-
-	e_selection_model_array_confirm_row_count(esma);
-	e_bit_array_select_single_row(esma->eba, row);
-
-	e_selection_model_selection_changed(E_SELECTION_MODEL(esma));
-	esma->selection_start_row = row;
-}
-
-static void
-esma_toggle_single_row (ESelectionModel *selection, int row)
-{
-	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection);
-
-	e_selection_model_array_confirm_row_count(esma);
-	e_bit_array_toggle_single_row(esma->eba, row);
-
-	esma->selection_start_row = row;
-	e_selection_model_selection_changed(E_SELECTION_MODEL(esma));
-}
-
-static void
-esma_move_selection_end (ESelectionModel *selection, int row)
-{
-	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection);
-	int old_start;
-	int old_end;
-	int new_start;
-	int new_end;
-	if (selection->sorter && e_sorter_needs_sorting(selection->sorter)) {
-		old_start = MIN (e_sorter_model_to_sorted(selection->sorter, esma->selection_start_row),
-				 e_sorter_model_to_sorted(selection->sorter, esma->cursor_row));
-		old_end = MAX (e_sorter_model_to_sorted(selection->sorter, esma->selection_start_row),
-			       e_sorter_model_to_sorted(selection->sorter, esma->cursor_row)) + 1;
-		new_start = MIN (e_sorter_model_to_sorted(selection->sorter, esma->selection_start_row),
-				 e_sorter_model_to_sorted(selection->sorter, row));
-		new_end = MAX (e_sorter_model_to_sorted(selection->sorter, esma->selection_start_row),
-			       e_sorter_model_to_sorted(selection->sorter, row)) + 1;
-	} else {
-		old_start = MIN (esma->selection_start_row, esma->cursor_row);
-		old_end = MAX (esma->selection_start_row, esma->cursor_row) + 1;
-		new_start = MIN (esma->selection_start_row, row);
-		new_end = MAX (esma->selection_start_row, row) + 1;
-	}
-	/* This wouldn't work nearly so smoothly if one end of the selection weren't held in place. */
-	if (old_start < new_start)
-		esma_change_range(selection, old_start, new_start, FALSE);
-	if (new_start < old_start)
-		esma_change_range(selection, new_start, old_start, TRUE);
-	if (old_end < new_end)
-		esma_change_range(selection, old_end, new_end, TRUE);
-	if (new_end < old_end)
-		esma_change_range(selection, new_end, old_end, FALSE);
-	e_selection_model_selection_changed(E_SELECTION_MODEL(esma));
-}
-
-static void
-esma_set_selection_end (ESelectionModel *selection, int row)
-{
-	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection);
-	esma_select_single_row(selection, esma->selection_start_row);
-	esma->cursor_row = esma->selection_start_row;
-	esma_move_selection_end(selection, row);
-}
-
-int
-e_selection_model_array_get_row_count (ESelectionModelArray *esma)
-{
-	g_return_val_if_fail(esma != NULL, 0);
-	g_return_val_if_fail(E_IS_SELECTION_MODEL_ARRAY(esma), 0);
-
-	if (ESMA_CLASS(esma)->get_row_count)
-		return ESMA_CLASS(esma)->get_row_count (esma);
-	else
-		return 0;
-}
-
-
-static void
-e_selection_model_array_init (ESelectionModelArray *esma)
-{
-	esma->eba = NULL;
-	esma->selection_start_row = 0;
-	esma->cursor_row = -1;
-	esma->cursor_col = -1;
-}
-
-static void
-e_selection_model_array_class_init (ESelectionModelArrayClass *klass)
-{
-	GtkObjectClass *object_class;
-	ESelectionModelClass *esm_class;
-
-	parent_class = gtk_type_class (e_selection_model_get_type ());
-
-	object_class = GTK_OBJECT_CLASS(klass);
-	esm_class = E_SELECTION_MODEL_CLASS(klass);
-
-	object_class->destroy = esma_destroy;
-	object_class->get_arg = esma_get_arg;
-	object_class->set_arg = esma_set_arg;
-
-	esm_class->is_row_selected    = esma_is_row_selected    ;
-	esm_class->foreach            = esma_foreach            ;
-	esm_class->clear              = esma_clear              ;
-	esm_class->selected_count     = esma_selected_count     ;
-	esm_class->select_all         = esma_select_all         ;
-	esm_class->invert_selection   = esma_invert_selection   ;
-	esm_class->row_count          = esma_row_count          ;
-
-	esm_class->change_one_row     = esma_change_one_row     ;
-	esm_class->change_cursor      = esma_change_cursor      ;
-	esm_class->cursor_row         = esma_cursor_row         ;
-	esm_class->cursor_col         = esma_cursor_col         ;
-
-	esm_class->select_single_row  = esma_select_single_row  ;
-	esm_class->toggle_single_row  = esma_toggle_single_row  ;
-	esm_class->move_selection_end = esma_move_selection_end ;
-	esm_class->set_selection_end  = esma_set_selection_end  ;
-
-	klass->get_row_count          = NULL                    ;
-
-	gtk_object_add_arg_type ("ESelectionModelArray::cursor_row", GTK_TYPE_INT,
-				 GTK_ARG_READWRITE, ARG_CURSOR_ROW);
-	gtk_object_add_arg_type ("ESelectionModelArray::cursor_col", GTK_TYPE_INT,
-				 GTK_ARG_READWRITE, ARG_CURSOR_COL);
-}
-
-E_MAKE_TYPE(e_selection_model_array, "ESelectionModelArray", ESelectionModelArray,
-	    e_selection_model_array_class_init, e_selection_model_array_init, PARENT_TYPE);
diff --git a/widgets/misc/e-selection-model-array.h b/widgets/misc/e-selection-model-array.h
deleted file mode 100644
index 990f688060..0000000000
--- a/widgets/misc/e-selection-model-array.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_SELECTION_MODEL_ARRAY_H_
-#define _E_SELECTION_MODEL_ARRAY_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/widgets/e-selection-model.h>
-#include <gal/util/e-bit-array.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_SELECTION_MODEL_ARRAY_TYPE        (e_selection_model_array_get_type ())
-#define E_SELECTION_MODEL_ARRAY(o)          (GTK_CHECK_CAST ((o), E_SELECTION_MODEL_ARRAY_TYPE, ESelectionModelArray))
-#define E_SELECTION_MODEL_ARRAY_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_SELECTION_MODEL_ARRAY_TYPE, ESelectionModelArrayClass))
-#define E_IS_SELECTION_MODEL_ARRAY(o)       (GTK_CHECK_TYPE ((o), E_SELECTION_MODEL_ARRAY_TYPE))
-#define E_IS_SELECTION_MODEL_ARRAY_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_SELECTION_MODEL_ARRAY_TYPE))
-
-typedef struct {
-	ESelectionModel base;
-
-	EBitArray *eba;
-
-	gint cursor_row;
-	gint cursor_col;
-	gint selection_start_row;
-
-	guint model_changed_id;
-	guint model_row_inserted_id, model_row_deleted_id;
-
-	guint frozen : 1;
-	guint selection_model_changed : 1;
-	guint group_info_changed : 1;
-} ESelectionModelArray;
-
-typedef struct {
-	ESelectionModelClass parent_class;
-
-	gint (*get_row_count)     (ESelectionModelArray *selection);
-} ESelectionModelArrayClass;
-
-GtkType  e_selection_model_array_get_type           (void);
-
-/* Protected Functions */
-void     e_selection_model_array_insert_rows        (ESelectionModelArray *esm,
-						     int                   row,
-						     int                   count);
-void     e_selection_model_array_delete_rows        (ESelectionModelArray *esm,
-						     int                   row,
-						     int                   count);
-void     e_selection_model_array_move_row           (ESelectionModelArray *esm,
-						     int                   old_row,
-						     int                   new_row);
-void     e_selection_model_array_confirm_row_count  (ESelectionModelArray *esm);
-
-/* Protected Virtual Function */
-gint     e_selection_model_array_get_row_count      (ESelectionModelArray *esm);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* _E_SELECTION_MODEL_ARRAY_H_ */
diff --git a/widgets/misc/e-selection-model-simple.c b/widgets/misc/e-selection-model-simple.c
deleted file mode 100644
index 80654e3097..0000000000
--- a/widgets/misc/e-selection-model-simple.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-selection-model-simple.c: a Table Selection Model
- *
- * Author:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#include <config.h>
-#include <gal/util/e-util.h>
-#include "e-selection-model-array.h"
-#include "e-selection-model-simple.h"
-
-#define ESMS_CLASS(e) ((ESelectionModelSimpleClass *)((GtkObject *)e)->klass)
-
-#define PARENT_TYPE e_selection_model_array_get_type ()
-
-static ESelectionModelArray *parent_class;
-
-static gint esms_get_row_count (ESelectionModelArray *esma);
-
-static void
-e_selection_model_simple_init (ESelectionModelSimple *selection)
-{
-	selection->row_count = 0;
-}
-
-static void
-e_selection_model_simple_class_init (ESelectionModelSimpleClass *klass)
-{
-	ESelectionModelArrayClass *esma_class;
-
-	parent_class             = gtk_type_class (PARENT_TYPE);
-
-	esma_class                = E_SELECTION_MODEL_ARRAY_CLASS(klass);
-
-	esma_class->get_row_count = esms_get_row_count;
-}
-
-E_MAKE_TYPE(e_selection_model_simple, "ESelectionModelSimple", ESelectionModelSimple,
-	    e_selection_model_simple_class_init, e_selection_model_simple_init, PARENT_TYPE);
-
-/** 
- * e_selection_model_simple_new
- *
- * This routine creates a new #ESelectionModelSimple.
- *
- * Returns: The new #ESelectionModelSimple.
- */
-ESelectionModelSimple *
-e_selection_model_simple_new (void)
-{
-	return gtk_type_new (e_selection_model_simple_get_type ());
-}
-
-void
-e_selection_model_simple_set_row_count (ESelectionModelSimple *esms,
-					int row_count)
-{
-	if (esms->row_count != row_count) {
-		ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(esms);
-		if (esma->eba)
-			gtk_object_unref(GTK_OBJECT(esma->eba));
-		esma->eba = NULL;
-	}
-	esms->row_count = row_count;
-}
-
-static gint
-esms_get_row_count (ESelectionModelArray *esma)
-{
-	ESelectionModelSimple *esms = E_SELECTION_MODEL_SIMPLE(esma);
-
-	return esms->row_count;
-}
-
-void      e_selection_model_simple_insert_rows         (ESelectionModelSimple *esms,
-							int                    row,
-							int                    count)
-{
-	esms->row_count += count;
-	e_selection_model_array_insert_rows (E_SELECTION_MODEL_ARRAY(esms), row, count);
-}
-
-void
-e_selection_model_simple_delete_rows          (ESelectionModelSimple *esms,
-					       int                    row,
-					       int                    count)
-{
-	esms->row_count -= count;
-	e_selection_model_array_delete_rows (E_SELECTION_MODEL_ARRAY(esms), row, count);
-}
-
-void
-e_selection_model_simple_move_row            (ESelectionModelSimple *esms,
-					      int                    old_row,
-					      int                    new_row)
-{
-	e_selection_model_array_move_row (E_SELECTION_MODEL_ARRAY(esms), old_row, new_row);
-}
diff --git a/widgets/misc/e-selection-model-simple.h b/widgets/misc/e-selection-model-simple.h
deleted file mode 100644
index 1fe312e4b4..0000000000
--- a/widgets/misc/e-selection-model-simple.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_SELECTION_MODEL_SIMPLE_H_
-#define _E_SELECTION_MODEL_SIMPLE_H_
-
-#include <gal/widgets/e-selection-model-array.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_SELECTION_MODEL_SIMPLE_TYPE        (e_selection_model_simple_get_type ())
-#define E_SELECTION_MODEL_SIMPLE(o)          (GTK_CHECK_CAST ((o), E_SELECTION_MODEL_SIMPLE_TYPE, ESelectionModelSimple))
-#define E_SELECTION_MODEL_SIMPLE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_SELECTION_MODEL_SIMPLE_TYPE, ESelectionModelSimpleClass))
-#define E_IS_SELECTION_MODEL_SIMPLE(o)       (GTK_CHECK_TYPE ((o), E_SELECTION_MODEL_SIMPLE_TYPE))
-#define E_IS_SELECTION_MODEL_SIMPLE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_SELECTION_MODEL_SIMPLE_TYPE))
-
-typedef struct {
-	ESelectionModelArray parent;
-
-	int row_count;
-} ESelectionModelSimple;
-
-typedef struct {
-	ESelectionModelArrayClass parent_class;
-} ESelectionModelSimpleClass;
-
-GtkType                e_selection_model_simple_get_type       (void);
-ESelectionModelSimple *e_selection_model_simple_new            (void);
-
-void                   e_selection_model_simple_insert_rows     (ESelectionModelSimple *esms,
-								 int                    row,
-								 int count);
-void                   e_selection_model_simple_delete_rows     (ESelectionModelSimple *esms,
-								 int                    row,
-								 int count);
-void                   e_selection_model_simple_move_row       (ESelectionModelSimple *esms,
-								int                    old_row,
-								int                    new_row);
-
-void                   e_selection_model_simple_set_row_count  (ESelectionModelSimple *selection,
-								int                    row_count);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_SELECTION_MODEL_SIMPLE_H_ */
-
diff --git a/widgets/misc/e-selection-model.c b/widgets/misc/e-selection-model.c
deleted file mode 100644
index 5b53619519..0000000000
--- a/widgets/misc/e-selection-model.c
+++ /dev/null
@@ -1,590 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-selection-model.c: a Selection Model
- *
- * Author:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#include <config.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtksignal.h>
-#include "e-selection-model.h"
-#include "gal/util/e-util.h"
-
-#define ESM_CLASS(e) ((ESelectionModelClass *)((GtkObject *)e)->klass)
-
-#define PARENT_TYPE gtk_object_get_type ()
-
-static GtkObjectClass *e_selection_model_parent_class;
-
-enum {
-	CURSOR_CHANGED,
-	CURSOR_ACTIVATED,
-	SELECTION_CHANGED,
-	LAST_SIGNAL
-};
-
-static guint e_selection_model_signals [LAST_SIGNAL] = { 0, };
-
-enum {
-	ARG_0,
-	ARG_SORTER,
-	ARG_SELECTION_MODE,
-	ARG_CURSOR_MODE,
-};
-
-inline static void
-add_sorter(ESelectionModel *esm, ESorter *sorter)
-{
-	esm->sorter = sorter;
-	if (sorter) {
-		gtk_object_ref(GTK_OBJECT(sorter));
-	}
-}
-
-inline static void
-drop_sorter(ESelectionModel *esm)
-{
-	if (esm->sorter) {
-		gtk_object_unref(GTK_OBJECT(esm->sorter));
-	}
-	esm->sorter = NULL;
-}
-
-static void
-esm_destroy (GtkObject *object)
-{
-	ESelectionModel *esm;
-
-	esm = E_SELECTION_MODEL (object);
-
-	drop_sorter(esm);
-}
-
-static void
-esm_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ESelectionModel *esm = E_SELECTION_MODEL (o);
-
-	switch (arg_id){
-	case ARG_SORTER:
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(esm->sorter);
-		break;
-
-	case ARG_SELECTION_MODE:
-		GTK_VALUE_ENUM(*arg) = esm->mode;
-		break;
-
-	case ARG_CURSOR_MODE:
-		GTK_VALUE_ENUM(*arg) = esm->cursor_mode;
-		break;
-	}
-}
-
-static void
-esm_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ESelectionModel *esm = E_SELECTION_MODEL (o);
-	
-	switch (arg_id){
-	case ARG_SORTER:
-		drop_sorter(esm);
-		add_sorter(esm, GTK_VALUE_OBJECT (*arg) ? E_SORTER(GTK_VALUE_OBJECT (*arg)) : NULL);
-		break;
-
-	case ARG_SELECTION_MODE:
-		esm->mode = GTK_VALUE_ENUM(*arg);
-		if (esm->mode == GTK_SELECTION_SINGLE) {
-			int cursor_row = e_selection_model_cursor_row(esm);
-			int cursor_col = e_selection_model_cursor_col(esm);
-			e_selection_model_do_something(esm, cursor_row, cursor_col, 0);
-		}
-		break;
-
-	case ARG_CURSOR_MODE:
-		esm->cursor_mode = GTK_VALUE_ENUM(*arg);
-		break;
-	}
-}
-
-static void
-e_selection_model_init (ESelectionModel *selection)
-{
-	selection->mode = GTK_SELECTION_MULTIPLE;
-	selection->cursor_mode = E_CURSOR_SIMPLE;
-}
-
-static void
-e_selection_model_class_init (ESelectionModelClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	e_selection_model_parent_class = gtk_type_class (gtk_object_get_type ());
-
-	object_class = GTK_OBJECT_CLASS(klass);
-
-	object_class->destroy = esm_destroy;
-	object_class->get_arg = esm_get_arg;
-	object_class->set_arg = esm_set_arg;
-
-	e_selection_model_signals [CURSOR_CHANGED] =
-		gtk_signal_new ("cursor_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ESelectionModelClass, cursor_changed),
-				gtk_marshal_NONE__INT_INT,
-				GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
-
-	e_selection_model_signals [CURSOR_ACTIVATED] =
-		gtk_signal_new ("cursor_activated",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ESelectionModelClass, cursor_activated),
-				gtk_marshal_NONE__INT_INT,
-				GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
-
-	e_selection_model_signals [SELECTION_CHANGED] =
-		gtk_signal_new ("selection_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ESelectionModelClass, selection_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	klass->cursor_changed     = NULL;
-	klass->cursor_activated   = NULL;
-	klass->selection_changed  = NULL;
-
-	klass->is_row_selected    = NULL;
-	klass->foreach            = NULL;
-	klass->clear              = NULL;
-	klass->selected_count     = NULL;
-	klass->select_all         = NULL;
-	klass->invert_selection   = NULL;
-	klass->row_count          = NULL;
-
-	klass->change_one_row     = NULL;
-	klass->change_cursor      = NULL;
-	klass->cursor_row         = NULL;
-	klass->cursor_col         = NULL;
-
-	klass->select_single_row  = NULL;
-	klass->toggle_single_row  = NULL;
-	klass->move_selection_end = NULL;
-	klass->set_selection_end  = NULL;
-
-
-	gtk_object_class_add_signals (object_class, e_selection_model_signals, LAST_SIGNAL);
-
-	gtk_object_add_arg_type ("ESelectionModel::sorter", GTK_TYPE_OBJECT,
-				 GTK_ARG_READWRITE, ARG_SORTER);
-	gtk_object_add_arg_type ("ESelectionModel::selection_mode", GTK_TYPE_ENUM,
-				 GTK_ARG_READWRITE, ARG_SELECTION_MODE);
-	gtk_object_add_arg_type ("ESelectionModel::cursor_mode", GTK_TYPE_ENUM,
-				 GTK_ARG_READWRITE, ARG_CURSOR_MODE);
-}
-
-E_MAKE_TYPE(e_selection_model, "ESelectionModel", ESelectionModel,
-	    e_selection_model_class_init, e_selection_model_init, PARENT_TYPE);
-
-/** 
- * e_selection_model_is_row_selected
- * @selection: #ESelectionModel to check
- * @n: The row to check
- *
- * This routine calculates whether the given row is selected.
- *
- * Returns: %TRUE if the given row is selected
- */
-gboolean
-e_selection_model_is_row_selected (ESelectionModel *selection,
-				   gint                 n)
-{
-	if (ESM_CLASS(selection)->is_row_selected)
-		return ESM_CLASS(selection)->is_row_selected (selection, n);
-	else
-		return FALSE;
-}
-
-/** 
- * e_selection_model_foreach
- * @selection: #ESelectionModel to traverse
- * @callback: The callback function to call back.
- * @closure: The closure
- *
- * This routine calls the given callback function once for each
- * selected row, passing closure as the closure.
- */
-void 
-e_selection_model_foreach     (ESelectionModel *selection,
-			       EForeachFunc callback,
-			       gpointer closure)
-{
-	if (ESM_CLASS(selection)->foreach)
-		ESM_CLASS(selection)->foreach (selection, callback, closure);
-}
-
-/** 
- * e_selection_model_clear
- * @selection: #ESelectionModel to clear
- *
- * This routine clears the selection to no rows selected.
- */
-void
-e_selection_model_clear(ESelectionModel *selection)
-{
-	if (ESM_CLASS(selection)->clear)
-		ESM_CLASS(selection)->clear (selection);
-}
-
-/** 
- * e_selection_model_selected_count
- * @selection: #ESelectionModel to count
- *
- * This routine calculates the number of rows selected.
- *
- * Returns: The number of rows selected in the given model.
- */
-gint
-e_selection_model_selected_count (ESelectionModel *selection)
-{
-	if (ESM_CLASS(selection)->selected_count)
-		return ESM_CLASS(selection)->selected_count (selection);
-	else
-		return 0;
-}
-
-/** 
- * e_selection_model_select_all
- * @selection: #ESelectionModel to select all
- *
- * This routine selects all the rows in the given
- * #ESelectionModel.
- */
-void
-e_selection_model_select_all (ESelectionModel *selection)
-{
-	if (ESM_CLASS(selection)->select_all)
-		ESM_CLASS(selection)->select_all (selection);
-}
-
-/** 
- * e_selection_model_invert_selection
- * @selection: #ESelectionModel to invert
- *
- * This routine inverts all the rows in the given
- * #ESelectionModel.
- */
-void
-e_selection_model_invert_selection (ESelectionModel *selection)
-{
-	if (ESM_CLASS(selection)->invert_selection)
-		ESM_CLASS(selection)->invert_selection (selection);
-}
-
-int
-e_selection_model_row_count (ESelectionModel *selection)
-{
-	if (ESM_CLASS(selection)->row_count)
-		return ESM_CLASS(selection)->row_count (selection);
-	else
-		return 0;
-}
-
-void
-e_selection_model_change_one_row(ESelectionModel *selection, int row, gboolean grow)
-{
-	if (ESM_CLASS(selection)->change_one_row)
-		ESM_CLASS(selection)->change_one_row (selection, row, grow);
-}
-
-void
-e_selection_model_change_cursor (ESelectionModel *selection, int row, int col)
-{
-	if (ESM_CLASS(selection)->change_cursor)
-		ESM_CLASS(selection)->change_cursor (selection, row, col);
-}
-
-int
-e_selection_model_cursor_row (ESelectionModel *selection)
-{
-	if (ESM_CLASS(selection)->cursor_row)
-		return ESM_CLASS(selection)->cursor_row (selection);
-	else
-		return -1;
-}
-
-int
-e_selection_model_cursor_col (ESelectionModel *selection)
-{
-	if (ESM_CLASS(selection)->cursor_col)
-		return ESM_CLASS(selection)->cursor_col (selection);
-	else
-		return -1;
-}
-
-void
-e_selection_model_select_single_row (ESelectionModel *selection, int row)
-{
-	if (ESM_CLASS(selection)->select_single_row)
-		ESM_CLASS(selection)->select_single_row (selection, row);
-}
-
-void
-e_selection_model_toggle_single_row (ESelectionModel *selection, int row)
-{
-	if (ESM_CLASS(selection)->toggle_single_row)
-		ESM_CLASS(selection)->toggle_single_row (selection, row);
-}
-
-void
-e_selection_model_move_selection_end (ESelectionModel *selection, int row)
-{
-	if (ESM_CLASS(selection)->move_selection_end)
-		ESM_CLASS(selection)->move_selection_end (selection, row);
-}
-
-void
-e_selection_model_set_selection_end (ESelectionModel *selection, int row)
-{
-	if (ESM_CLASS(selection)->set_selection_end)
-		ESM_CLASS(selection)->set_selection_end (selection, row);
-}
-
-/** 
- * e_selection_model_do_something
- * @selection: #ESelectionModel to do something to.
- * @row: The row to do something in.
- * @col: The col to do something in.
- * @state: The state in which to do something.
- *
- * This routine does whatever is appropriate as if the user clicked
- * the mouse in the given row and column.
- */
-void
-e_selection_model_do_something (ESelectionModel *selection,
-				guint                 row,
-				guint                 col,
-				GdkModifierType       state)
-{
-	gint shift_p = state & GDK_SHIFT_MASK;
-	gint ctrl_p = state & GDK_CONTROL_MASK;
-	int row_count;
-
-	if (row == -1 && col != -1)
-		row = 0;
-	if (col == -1 && row != -1)
-		col = 0;
-
-	row_count = e_selection_model_row_count(selection);
-	if (row_count >= 0 && row < row_count) {
-		switch (selection->mode) {
-		case GTK_SELECTION_SINGLE:
-			e_selection_model_select_single_row (selection, row);
-			break;
-		case GTK_SELECTION_BROWSE:
-		case GTK_SELECTION_MULTIPLE:
-		case GTK_SELECTION_EXTENDED:
-			if (shift_p) {
-				e_selection_model_set_selection_end (selection, row);
-			} else {
-				if (ctrl_p) {
-					e_selection_model_toggle_single_row (selection, row);
-				} else {
-					e_selection_model_select_single_row (selection, row);
-				}
-			}
-			break;
-		}
-		e_selection_model_change_cursor(selection, row, col);
-		gtk_signal_emit(GTK_OBJECT(selection),
-				e_selection_model_signals[CURSOR_CHANGED], row, col);
-		gtk_signal_emit(GTK_OBJECT(selection),
-				e_selection_model_signals[CURSOR_ACTIVATED], row, col);
-	}
-}
-
-/** 
- * e_selection_model_maybe_do_something
- * @selection: #ESelectionModel to do something to.
- * @row: The row to do something in.
- * @col: The col to do something in.
- * @state: The state in which to do something.
- *
- * If this row is selected, this routine just moves the cursor row and
- * column.  Otherwise, it does the same thing as
- * e_selection_model_do_something().  This is for being used on
- * right clicks and other events where if the user hit the selection,
- * they don't want it to change.
- */
-void
-e_selection_model_maybe_do_something      (ESelectionModel *selection,
-					   guint            row,
-					   guint            col,
-					   GdkModifierType  state)
-{
-	if (e_selection_model_is_row_selected(selection, row)) {
-		e_selection_model_change_cursor(selection, row, col);
-		gtk_signal_emit(GTK_OBJECT(selection),
-				e_selection_model_signals[CURSOR_CHANGED], row, col);
-	} else {
-		e_selection_model_do_something(selection, row, col, state);
-	}
-}
-
-void
-e_selection_model_select_as_key_press (ESelectionModel *selection,
-				       guint            row,
-				       guint            col,
-				       GdkModifierType  state)
-{
-	int cursor_activated = TRUE;
-
-	gint shift_p = state & GDK_SHIFT_MASK;
-	gint ctrl_p = state & GDK_CONTROL_MASK;
-
-	switch (selection->mode) {
-	case GTK_SELECTION_BROWSE:
-		if (shift_p) {
-			e_selection_model_set_selection_end (selection, row);
-		} else if (!ctrl_p) {
-			e_selection_model_select_single_row (selection, row);
-		} else
-			cursor_activated = FALSE;
-		break;
-	case GTK_SELECTION_SINGLE:
-	case GTK_SELECTION_MULTIPLE:
-	case GTK_SELECTION_EXTENDED:
-		e_selection_model_select_single_row (selection, row);
-		break;
-	}
-	if (row != -1) {
-		e_selection_model_change_cursor(selection, row, col);
-		gtk_signal_emit(GTK_OBJECT(selection),
-				e_selection_model_signals[CURSOR_CHANGED], row, col);
-		if (cursor_activated)
-			gtk_signal_emit(GTK_OBJECT(selection),
-					e_selection_model_signals[CURSOR_ACTIVATED], row, col);
-	}
-}
-
-static gint
-move_selection (ESelectionModel *selection,
-		gboolean              up,
-		GdkModifierType       state)
-{
-	int row = e_selection_model_cursor_row(selection);
-	int col = e_selection_model_cursor_col(selection);
-	int row_count;
-
-	row = e_sorter_model_to_sorted(selection->sorter, row);
-	if (up)
-		row--;
-	else
-		row++;
-	if (row < 0)
-		row = 0;
-	row_count = e_selection_model_row_count(selection);
-	if (row >= row_count)
-		row = row_count - 1;
-	row = e_sorter_sorted_to_model(selection->sorter, row);
-
-	e_selection_model_select_as_key_press (selection, row, col, state);
-	return TRUE;
-}
-
-/** 
- * e_selection_model_key_press
- * @selection: #ESelectionModel to affect.
- * @key: The event.
- *
- * This routine does whatever is appropriate as if the user pressed
- * the given key.
- *
- * Returns: %TRUE if the #ESelectionModel used the key.
- */
-gint
-e_selection_model_key_press      (ESelectionModel *selection,
-				  GdkEventKey          *key)
-{
-	switch (key->keyval) {
-	case GDK_Up:
-		return move_selection(selection, TRUE, key->state);
-		break;
-	case GDK_Down:
-		return move_selection(selection, FALSE, key->state);
-		break;
-	case GDK_space:
-	case GDK_KP_Space:
-		if (selection->mode != GTK_SELECTION_SINGLE) {
-			int row = e_selection_model_cursor_row(selection);
-			int col = e_selection_model_cursor_col(selection);
-			e_selection_model_toggle_single_row (selection, row);
-			gtk_signal_emit(GTK_OBJECT(selection),
-					e_selection_model_signals[CURSOR_ACTIVATED], row, col);
-			return TRUE;
-		}
-		break;
-	case GDK_Return:
-	case GDK_KP_Enter:
-		if (selection->mode != GTK_SELECTION_SINGLE) {
-			int row = e_selection_model_cursor_row(selection);
-			int col = e_selection_model_cursor_col(selection);
-			e_selection_model_select_single_row (selection, row);
-			gtk_signal_emit(GTK_OBJECT(selection),
-					e_selection_model_signals[CURSOR_ACTIVATED], row, col);
-			return TRUE;
-		}
-		break;
-	case GDK_Home:
-	case GDK_KP_Home:
-		if (selection->cursor_mode == E_CURSOR_LINE) {
-			int row = 0;
-			int cursor_col = e_selection_model_cursor_col(selection);
-
-			row = e_sorter_sorted_to_model(selection->sorter, row);
-			e_selection_model_select_as_key_press (selection, row, cursor_col, key->state);
-			return TRUE;
-		}
-		break;
-	case GDK_End:
-	case GDK_KP_End:
-		if (selection->cursor_mode == E_CURSOR_LINE) {
-			int row = e_selection_model_row_count(selection) - 1;
-			int cursor_col = e_selection_model_cursor_col(selection);
-
-			row = e_sorter_sorted_to_model(selection->sorter, row);
-			e_selection_model_select_as_key_press (selection, row, cursor_col, key->state);
-			return TRUE;
-		}
-		break;
-	}
-	return FALSE;
-}
-
-void
-e_selection_model_cursor_changed      (ESelectionModel *selection,
-				       int              row,
-				       int              col)
-{
-	gtk_signal_emit(GTK_OBJECT(selection),
-			e_selection_model_signals[CURSOR_CHANGED], row, col);
-}
-
-void
-e_selection_model_cursor_activated    (ESelectionModel *selection,
-				       int              row,
-				       int              col)
-{
-	gtk_signal_emit(GTK_OBJECT(selection),
-			e_selection_model_signals[CURSOR_ACTIVATED], row, col);
-}
-
-void
-e_selection_model_selection_changed   (ESelectionModel *selection)
-{
-	gtk_signal_emit(GTK_OBJECT(selection),
-			e_selection_model_signals[SELECTION_CHANGED]);
-}
diff --git a/widgets/misc/e-selection-model.h b/widgets/misc/e-selection-model.h
deleted file mode 100644
index f83d2631eb..0000000000
--- a/widgets/misc/e-selection-model.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_SELECTION_MODEL_H_
-#define _E_SELECTION_MODEL_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/util/e-sorter.h>
-#include <gdk/gdktypes.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_SELECTION_MODEL_TYPE        (e_selection_model_get_type ())
-#define E_SELECTION_MODEL(o)          (GTK_CHECK_CAST ((o), E_SELECTION_MODEL_TYPE, ESelectionModel))
-#define E_SELECTION_MODEL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_SELECTION_MODEL_TYPE, ESelectionModelClass))
-#define E_IS_SELECTION_MODEL(o)       (GTK_CHECK_TYPE ((o), E_SELECTION_MODEL_TYPE))
-#define E_IS_SELECTION_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_SELECTION_MODEL_TYPE))
-
-#ifndef _E_FOREACH_FUNC_H_
-#define _E_FOREACH_FUNC_H_
-typedef void (*EForeachFunc) (int model_row,
-			      gpointer closure);
-#endif
-
-/* list selection modes */
-typedef enum {
-	E_CURSOR_LINE,
-	E_CURSOR_SIMPLE,
-	E_CURSOR_SPREADSHEET,
-} ECursorMode;
-
-typedef struct {
-	GtkObject     base;
-
-	ESorter *sorter;
-
-	GtkSelectionMode mode;
-	ECursorMode cursor_mode;
-} ESelectionModel;
-
-typedef struct {
-	GtkObjectClass parent_class;
-
-	/* Virtual methods */
-	gboolean (*is_row_selected)     (ESelectionModel *esm, int row);
-	void     (*foreach)             (ESelectionModel *esm, EForeachFunc callback, gpointer closure);
-	void     (*clear)               (ESelectionModel *esm);
-	gint     (*selected_count)      (ESelectionModel *esm);
-	void     (*select_all)          (ESelectionModel *esm);
-	void     (*invert_selection)    (ESelectionModel *esm);
-	int      (*row_count)           (ESelectionModel *esm);
-
-	/* Protected virtual methods. */
-	void     (*change_one_row)      (ESelectionModel *esm, int row, gboolean on);
-	void     (*change_cursor)       (ESelectionModel *esm, int row, int col);
-	int      (*cursor_row)          (ESelectionModel *esm);
-	int      (*cursor_col)          (ESelectionModel *esm);
-
-	void     (*select_single_row)   (ESelectionModel *selection, int row);
-	void     (*toggle_single_row)   (ESelectionModel *selection, int row);
-	void     (*move_selection_end)  (ESelectionModel *selection, int row);
-	void     (*set_selection_end)   (ESelectionModel *selection, int row);
-
-	/*
-	 * Signals
-	 */
-
-	void     (*cursor_changed)      (ESelectionModel *esm, int row, int col);
-	void     (*cursor_activated)    (ESelectionModel *esm, int row, int col);
-	void     (*selection_changed)   (ESelectionModel *esm);
-
-} ESelectionModelClass;
-
-GtkType   e_selection_model_get_type             (void);
-void      e_selection_model_do_something         (ESelectionModel *esm,
-						  guint            row,
-						  guint            col,
-						  GdkModifierType  state);
-void      e_selection_model_maybe_do_something   (ESelectionModel *esm,
-						  guint            row,
-						  guint            col,
-						  GdkModifierType  state);
-gint      e_selection_model_key_press            (ESelectionModel *esm,
-						  GdkEventKey     *key);
-void      e_selection_model_select_as_key_press  (ESelectionModel *esm,
-						  guint            row,
-						  guint            col,
-						  GdkModifierType  state);
-
-/* Virtual functions */
-gboolean  e_selection_model_is_row_selected      (ESelectionModel *esm,
-						  gint             n);
-void      e_selection_model_foreach              (ESelectionModel *esm,
-						  EForeachFunc     callback,
-						  gpointer         closure);
-void      e_selection_model_clear                (ESelectionModel *esm);
-gint      e_selection_model_selected_count       (ESelectionModel *esm);
-void      e_selection_model_select_all           (ESelectionModel *esm);
-void      e_selection_model_invert_selection     (ESelectionModel *esm);
-int       e_selection_model_row_count            (ESelectionModel *esm);
-
-
-/* Private virtual Functions */
-void      e_selection_model_change_one_row       (ESelectionModel *esm,
-						  int              row,
-						  gboolean         on);
-void      e_selection_model_change_cursor        (ESelectionModel *esm,
-						  int              row,
-						  int              col);
-int       e_selection_model_cursor_row           (ESelectionModel *esm);
-int       e_selection_model_cursor_col           (ESelectionModel *esm);
-void      e_selection_model_select_single_row    (ESelectionModel *selection,
-						  int              row);
-void      e_selection_model_toggle_single_row    (ESelectionModel *selection,
-						  int              row);
-void      e_selection_model_move_selection_end   (ESelectionModel *selection,
-						  int              row);
-void      e_selection_model_set_selection_end    (ESelectionModel *selection,
-						  int              row);
-
-/* Signals */
-void      e_selection_model_cursor_changed       (ESelectionModel *selection,
-						  int              row,
-						  int              col);
-void      e_selection_model_cursor_activated     (ESelectionModel *selection,
-						  int              row,
-						  int              col);
-void      e_selection_model_selection_changed    (ESelectionModel *selection);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* _E_SELECTION_MODEL_H_ */
-
diff --git a/widgets/misc/e-title-bar.c b/widgets/misc/e-title-bar.c
deleted file mode 100644
index 128139f944..0000000000
--- a/widgets/misc/e-title-bar.c
+++ /dev/null
@@ -1,402 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-title-bar.c
- *
- * Copyright (C) 2000 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtkbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkpixmap.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktypeutils.h>
-
-#include <gal/util/e-util.h>
-#include "e-clipped-label.h"
-
-#include "e-title-bar.h"
-
-
-enum {
-	LABEL_BUTTON_PRESS_EVENT,
-	BUTTON_CLICKED,
-	LAST_SIGNAL
-};
-static guint signals[LAST_SIGNAL] = { 0 };
-
-
-/* The pixmaps.  */
-
-static char *close_xpm[] = {
-	"12 12 2 1",
-	" 	c none",
-	".	c #000000000000",
-	"            ",
-	" ..      .. ",
-	" ...    ... ",
-	"  ...  ...  ",
-	"   ......   ",
-	"    ....    ",
-	"    ....    ",
-	"   ......   ",
-	"  ...  ...  ",
-	" ...    ... ",
-	" ..      .. ",
-	"            "
-};
-
-static char *pin_xpm[] = {
-	"16 16 33 1",
-	" 	c None",
-	".	c #000000",
-	"+	c #74744D",
-	"@	c #B2B279",
-	"#	c #6C6C46",
-	"$	c #CACA9C",
-	"%	c #F4F4AD",
-	"&	c #85855A",
-	"*	c #B1B175",
-	"=	c #9A9A66",
-	"-	c #A9A98A",
-	";	c #B0B07B",
-	">	c #535353",
-	",	c #818181",
-	"'	c #B7B7B7",
-	")	c #D8D8D8",
-	"!	c #FFFFFF",
-	"~	c #EBEBA1",
-	"{	c #8A8A75",
-	"]	c #9F9F76",
-	"^	c #9E9E75",
-	"/	c #8A8A66",
-	"(	c #979770",
-	"_	c #6B6B46",
-	":	c #28281A",
-	"<	c #505034",
-	"[	c #666645",
-	"}	c #61614D",
-	"|	c #818155",
-	"1	c #4A4A31",
-	"2	c #4D4D34",
-	"3	c #6C6C48",
-	"4	c #5D5D3E",
-	"                ",
-	"                ",
-	"                ",
-	"      .     .   ",
-	"      ..   .+.  ",
-	"      .@...#$.  ",
-	" ......%&*=-;.  ",
-	".>,')!.~{]^/(.  ",
-	" ......_:<[}|.  ",
-	"      .1...23.  ",
-	"      ..   .4.  ",
-	"      .     .   ",
-	"                ",
-	"                ",
-	"                ",
-	"                "
-};
-	
-
-#define PARENT_TYPE GTK_TYPE_FRAME
-static GtkFrameClass *parent_class = NULL;
-
-struct _ETitleBarPrivate {
-	ETitleBarButtonMode button_mode;
-	GtkWidget *label;
-	GtkWidget *button;
-	GtkWidget *close_gtk_pixmap;
-	GtkWidget *pin_gtk_pixmap;
-};
-
-
-/* Mode handling.  We put both the close and pin GtkPixmaps into an hbox in the
-   button, and hide one of them according to the mode.  */
-
-static void
-show_and_hide_pixmaps_according_to_mode (ETitleBar *title_bar)
-{
-	ETitleBarPrivate *priv;
-
-	priv = title_bar->priv;
-
-	if (priv->close_gtk_pixmap == NULL || priv->pin_gtk_pixmap == NULL)
-		return;
-
-	switch (priv->button_mode) {
-	case E_TITLE_BAR_BUTTON_MODE_PIN:
-		gtk_widget_hide (priv->close_gtk_pixmap);
-		gtk_widget_show (priv->pin_gtk_pixmap);
-		break;
-	case E_TITLE_BAR_BUTTON_MODE_CLOSE:
-		gtk_widget_hide (priv->pin_gtk_pixmap);
-		gtk_widget_show (priv->close_gtk_pixmap);
-		break;
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-
-/* Child signal callbacks.  */
-
-static void
-button_realize_cb (GtkWidget *widget,
-		   gpointer data)
-{
-	GdkPixmap *close_pixmap;
-	GdkBitmap *close_mask;
-	GdkPixmap *pin_pixmap;
-	GdkBitmap *pin_mask;
-	GtkWidget *hbox;
-	ETitleBar *title_bar;
-	ETitleBarPrivate *priv;
-
-	title_bar = E_TITLE_BAR (data);
-	priv = title_bar->priv;
-
-	if (priv->close_gtk_pixmap != NULL)
-		return;
-
-	close_pixmap = gdk_pixmap_create_from_xpm_d (GTK_WIDGET (priv->button)->window,
-						     &close_mask, NULL, close_xpm);
-	priv->close_gtk_pixmap = gtk_pixmap_new (close_pixmap, close_mask);
-
-	pin_pixmap = gdk_pixmap_create_from_xpm_d (GTK_WIDGET (priv->button)->window,
-						   &pin_mask, NULL, pin_xpm);
-	priv->pin_gtk_pixmap = gtk_pixmap_new (pin_pixmap, pin_mask);
-
-	hbox = gtk_hbox_new (TRUE, 0);
-	gtk_widget_show (hbox);
-	gtk_box_pack_start (GTK_BOX (hbox), priv->pin_gtk_pixmap, TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), priv->close_gtk_pixmap, TRUE, TRUE, 0);
-
-	gtk_container_add (GTK_CONTAINER (priv->button), hbox);
-
-	gdk_pixmap_unref (close_pixmap);
-	gdk_bitmap_unref (close_mask);
-	gdk_pixmap_unref (pin_pixmap);
-	gdk_bitmap_unref (pin_mask);
-
-	show_and_hide_pixmaps_according_to_mode (title_bar);
-}
-
-static void
-button_clicked_cb (GtkButton *button,
-		   gpointer data)
-{
-	ETitleBar *title_bar;
-
-	title_bar = E_TITLE_BAR (data);
-
-	gtk_signal_emit (GTK_OBJECT (title_bar), signals[BUTTON_CLICKED]);
-}
-
-static void
-label_button_press_event_cb (GtkWidget *widget,
-			     GdkEventButton *event,
-			     gpointer data)
-{
-	ETitleBar *title_bar;
-
-	title_bar = E_TITLE_BAR (data);
-
-	gtk_signal_emit (GTK_OBJECT (title_bar), signals[LABEL_BUTTON_PRESS_EVENT], event);
-}
-
-
-/* GtkObject methods.  */
-
-static void
-destroy (GtkObject *object)
-{
-	ETitleBar *title_bar;
-	ETitleBarPrivate *priv;
-
-	title_bar = E_TITLE_BAR (object);
-	priv = title_bar->priv;
-
-	g_free (priv);
-
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-static void
-class_init (ETitleBarClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass*) klass;
-	object_class->destroy = destroy;
-
-	parent_class = gtk_type_class (gtk_frame_get_type ());
-
-	signals[LABEL_BUTTON_PRESS_EVENT] = 
-		gtk_signal_new ("label_button_press_event",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETitleBarClass, label_button_press_event),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_GDK_EVENT);
-
-	signals[BUTTON_CLICKED] = 
-		gtk_signal_new ("button_clicked",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETitleBarClass, button_clicked),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-init (ETitleBar *title_bar)
-{
-	ETitleBarPrivate *priv;
-
-	priv = g_new (ETitleBarPrivate, 1);
-
-	priv->button_mode      = E_TITLE_BAR_BUTTON_MODE_CLOSE;
-	priv->label            = NULL;
-	priv->button           = NULL;
-	priv->close_gtk_pixmap = NULL;
-	priv->pin_gtk_pixmap   = NULL;
-
-	title_bar->priv = priv;
-}
-
-
-void
-e_title_bar_construct (ETitleBar *title_bar,
-		       const char *title)
-{
-	ETitleBarPrivate *priv;
-	GtkWidget *hbox;
-
-	g_return_if_fail (title_bar != NULL);
-	g_return_if_fail (E_IS_TITLE_BAR (title_bar));
-
-	priv = title_bar->priv;
-
-	priv->label = e_clipped_label_new (title);
-	gtk_misc_set_alignment (GTK_MISC (priv->label), 0.0, 0.5);
-	gtk_widget_show (priv->label);
-
-	priv->button = gtk_button_new ();
-	GTK_WIDGET_UNSET_FLAGS (priv->button, GTK_CAN_FOCUS);
-	gtk_container_set_border_width (GTK_CONTAINER (priv->button), 1);
-	gtk_button_set_relief (GTK_BUTTON (priv->button), GTK_RELIEF_NONE);
-	gtk_widget_show (priv->button);
-
-	hbox = gtk_hbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), priv->label, TRUE, TRUE, 2);
-	gtk_box_pack_start (GTK_BOX (hbox), priv->button, FALSE, TRUE, 1);
-	gtk_widget_show (hbox);
-
-	gtk_container_add (GTK_CONTAINER (title_bar), hbox);
-
-	gtk_signal_connect (GTK_OBJECT (priv->button), "realize",
-			    GTK_SIGNAL_FUNC (button_realize_cb), title_bar);
-	gtk_signal_connect (GTK_OBJECT (priv->button), "clicked",
-			    GTK_SIGNAL_FUNC (button_clicked_cb), title_bar);
-	gtk_signal_connect (GTK_OBJECT (priv->label), "button_press_event",
-			    GTK_SIGNAL_FUNC (label_button_press_event_cb), title_bar);
-}
-
-GtkWidget *
-e_title_bar_new (const char *title)
-{
-	ETitleBar *title_bar;
-
-	title_bar = gtk_type_new (e_title_bar_get_type ());
-
-	e_title_bar_construct (title_bar, title);
-
-	return GTK_WIDGET (title_bar);
-}
-
-
-void
-e_title_bar_set_title (ETitleBar *title_bar,
-		       const char *title)
-{
-	g_return_if_fail (title_bar != NULL);
-	g_return_if_fail (E_IS_TITLE_BAR (title_bar));
-
-	e_clipped_label_set_text (E_CLIPPED_LABEL (title_bar->priv->label), title);
-}
-
-void
-e_title_bar_show_button (ETitleBar *title_bar,
-			 gboolean show)
-{
-	ETitleBarPrivate *priv;
-
-	g_return_if_fail (title_bar != NULL);
-	g_return_if_fail (E_IS_TITLE_BAR (title_bar));
-
-	priv = title_bar->priv;
-
-	if (show)
-		gtk_widget_show (priv->button);
-	else
-		gtk_widget_hide (priv->button);
-}
-
-void
-e_title_bar_set_button_mode (ETitleBar *title_bar,
-			     ETitleBarButtonMode button_mode)
-{
-	ETitleBarPrivate *priv;
-
-	g_return_if_fail (title_bar != NULL);
-	g_return_if_fail (E_IS_TITLE_BAR (title_bar));
-	g_return_if_fail (button_mode == E_TITLE_BAR_BUTTON_MODE_CLOSE
-			  || button_mode == E_TITLE_BAR_BUTTON_MODE_PIN);
-
-	priv = title_bar->priv;
-
-	if (priv->button_mode == button_mode)
-		return;
-
-	priv->button_mode = button_mode;
-	show_and_hide_pixmaps_according_to_mode (title_bar);
-}
-
-ETitleBarButtonMode
-e_title_bar_get_button_mode (ETitleBar *title_bar)
-{
-	g_return_val_if_fail (title_bar != NULL, E_TITLE_BAR_BUTTON_MODE_CLOSE);
-	g_return_val_if_fail (E_IS_TITLE_BAR (title_bar), E_TITLE_BAR_BUTTON_MODE_CLOSE);
-
-	return title_bar->priv->button_mode;
-}
-
-
-E_MAKE_TYPE (e_title_bar, "ETitleBar", ETitleBar, class_init, init, PARENT_TYPE)
diff --git a/widgets/misc/e-title-bar.h b/widgets/misc/e-title-bar.h
deleted file mode 100644
index f342fb73fb..0000000000
--- a/widgets/misc/e-title-bar.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-title-bar.h
- *
- * Copyright (C) 2000 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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: Ettore Perazzoli
- */
-
-#ifndef __E_TITLE_BAR_H__
-#define __E_TITLE_BAR_H__
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtkframe.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_TITLE_BAR			(e_title_bar_get_type ())
-#define E_TITLE_BAR(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_TITLE_BAR, ETitleBar))
-#define E_TITLE_BAR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_TITLE_BAR, ETitleBarClass))
-#define E_IS_TITLE_BAR(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_TITLE_BAR))
-#define E_IS_TITLE_BAR_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_TITLE_BAR))
-
-
-enum _ETitleBarButtonMode {
-	E_TITLE_BAR_BUTTON_MODE_PIN,
-	E_TITLE_BAR_BUTTON_MODE_CLOSE
-};
-typedef enum _ETitleBarButtonMode ETitleBarButtonMode;
-
-typedef struct _ETitleBar        ETitleBar;
-typedef struct _ETitleBarPrivate ETitleBarPrivate;
-typedef struct _ETitleBarClass   ETitleBarClass;
-
-struct _ETitleBar {
-	GtkFrame parent;
-
-	ETitleBarPrivate *priv;
-};
-
-struct _ETitleBarClass {
-	GtkFrameClass parent_class;
-
-	/* Signals.  */
-
-	void (* label_button_press_event) (ETitleBar *title_bar, GdkEventButton *event);
-	void (* button_clicked)           (ETitleBar *title_bar);
-};
-
-
-GtkType              e_title_bar_get_type         (void);
-void                 e_title_bar_construct        (ETitleBar           *title_bar,
-						   const char          *title);
-GtkWidget           *e_title_bar_new              (const char          *title);
-void                 e_title_bar_set_title        (ETitleBar           *title_bar,
-						   const char          *title);
-void                 e_title_bar_show_button      (ETitleBar           *title_bar,
-						   gboolean             show);
-void                 e_title_bar_set_button_mode  (ETitleBar           *title_bar,
-						   ETitleBarButtonMode  button_mode);
-ETitleBarButtonMode  e_title_bar_get_button_mode  (ETitleBar           *title_bar);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __E_TITLE_BAR_H__ */
diff --git a/widgets/misc/e-unicode.c b/widgets/misc/e-unicode.c
deleted file mode 100644
index acb4898120..0000000000
--- a/widgets/misc/e-unicode.c
+++ /dev/null
@@ -1,3004 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Lauris Kaplinski <lauris@helixcode.com>
- *
- * TODO: Break simple ligatures in e_utf8_strstrcasedecomp
- *
- */
-
-#include <config.h>
-
-#include "e-unicode.h"
-
-#include "gal/util/e-i18n.h"
-#include <ctype.h>
-#include <string.h>
-#include <stdio.h>
-#include <iconv.h>
-#include <gdk/gdk.h>
-#include <gdk/gdkx.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkmenuitem.h>
-#include "e-font.h"
-#include <gnome-xml/xmlmemory.h>
-#include <stdlib.h>
-
-#define d(x) x
-
-#define FONT_TESTING
-#define MAX_DECOMP 8
-
-static gint e_canonical_decomposition (gunichar ch, gunichar * buf);
-static gunichar e_stripped_char (gunichar ch);
-
-/*
- * This my favourite
- *
- * strstr doing case insensitive, decomposing search
- *
- * Lauris
- */
-
-const gchar *
-e_utf8_strstrcasedecomp (const gchar *haystack, const gchar *needle)
-{
-	gunichar *nuni;
-	gunichar unival;
-	gint nlen;
-	const guchar *o, *p;
-
-	if (haystack == NULL) return NULL;
-	if (needle == NULL) return NULL;
-	if (strlen (needle) == 0) return haystack;
-	if (strlen (haystack) == 0) return NULL;
-
-	nuni = alloca (sizeof (gunichar) * strlen (needle));
-
-	nlen = 0;
-	for (p = e_unicode_get_utf8 (needle, &unival); p && unival; p = e_unicode_get_utf8 (p, &unival)) {
-		gint sc;
-		sc = e_stripped_char (unival);
-		if (sc) {
-			nuni[nlen++] = sc;
-		}
-	}
-	/* NULL means there was illegal utf-8 sequence */
-	if (!p) return NULL;
-	/* If everything is correct, we have decomposed, lowercase, stripped needle */
-	if (nlen < 1) return haystack;
-
-	o = haystack;
-	for (p = e_unicode_get_utf8 (o, &unival); p && unival; p = e_unicode_get_utf8 (p, &unival)) {
-		gint sc;
-		sc = e_stripped_char (unival);
-		if (sc) {
-			/* We have valid stripped char */
-			if (sc == nuni[0]) {
-				const gchar *q = p;
-				gint npos = 1;
-				while (npos < nlen) {
-					q = e_unicode_get_utf8 (q, &unival);
-					if (!q || !unival) return NULL;
-					sc = e_stripped_char (unival);
-					if ((!sc) || (sc != nuni[npos])) break;
-					npos++;
-				}
-				if (npos == nlen) {
-					return p;
-				}
-			}
-		}
-		o = p;
-	}
-
-	return NULL;
-}
-
-const gchar *
-e_utf8_strstrcase (const gchar *haystack, const gchar *needle)
-{
-	gunichar *nuni;
-	gunichar unival;
-	gint nlen;
-	const guchar *o, *p;
-
-	if (haystack == NULL) return NULL;
-	if (needle == NULL) return NULL;
-	if (strlen (needle) == 0) return haystack;
-	if (strlen (haystack) == 0) return NULL;
-
-	nuni = alloca (sizeof (gunichar) * strlen (needle));
-
-	nlen = 0;
-	for (p = e_unicode_get_utf8 (needle, &unival); p && unival; p = e_unicode_get_utf8 (p, &unival)) {
-		nuni[nlen++] = g_unichar_tolower (unival);
-	}
-	/* NULL means there was illegal utf-8 sequence */
-	if (!p) return NULL;
-
-	o = haystack;
-	for (p = e_unicode_get_utf8 (o, &unival); p && unival; p = e_unicode_get_utf8 (p, &unival)) {
-		gint sc;
-		sc = g_unichar_tolower (unival);
-		/* We have valid stripped char */
-		if (sc == nuni[0]) {
-			const gchar *q = p;
-			gint npos = 1;
-			while (npos < nlen) {
-				q = e_unicode_get_utf8 (q, &unival);
-				if (!q || !unival) return NULL;
-				sc = g_unichar_tolower (unival);
-				if (sc != nuni[npos]) break;
-				npos++;
-			}
-			if (npos == nlen) {
-				return p;
-			}
-		}
-		o = p;
-	}
-
-	return NULL;
-}
-
-#if 0
-const gchar *
-e_utf8_strstrcase (const gchar *haystack, const gchar *needle)
-{
-	gchar *p;
-	gunichar *huni, *nuni;
-	gunichar unival;
-	gint hlen, nlen, hp, np;
-
-	if (haystack == NULL) return NULL;
-	if (needle == NULL) return NULL;
-	if (strlen (needle) == 0) return haystack;
-
-	huni = alloca (sizeof (gunichar) * strlen (haystack));
-
-	for (hlen = 0, p = e_unicode_get_utf8 (haystack, &unival); p && unival; hlen++, p = e_unicode_get_utf8 (p, &unival)) {
-		huni[hlen] = g_unichar_tolower (unival);
-	}
-
-	if (!p) return NULL;
-	if (hlen == 0) return NULL;
-
-	nuni = alloca (sizeof (gunichar) * strlen (needle));
-
-	for (nlen = 0, p = e_unicode_get_utf8 (needle, &unival); p && unival; nlen++, p = e_unicode_get_utf8 (p, &unival)) {
-		nuni[nlen] = g_unichar_tolower (unival);
-	}
-
-	if (!p) return NULL;
-	if (nlen == 0) return NULL;
-
-	if (hlen < nlen) return NULL;
-
-	for (hp = 0; hp <= hlen - nlen; hp++) {
-		for (np = 0; np < nlen; np++) {
-			if (huni[hp + np] != nuni[np]) break;
-		}
-		if (np == nlen) return haystack + unicode_offset_to_index (haystack, hp);
-	}
-
-	return NULL;
-}
-#endif
-
-gchar *
-e_utf8_from_gtk_event_key (GtkWidget *widget, guint keyval, const gchar *string)
-{
-	gint unival;
-	gchar *utf;
-	gint unilen;
-
-	if (keyval == GDK_VoidSymbol) {
-		utf = e_utf8_from_gtk_string (widget, string);
-	} else {
-		unival = gdk_keyval_to_unicode (keyval);
-
-		if (unival < ' ') return NULL;
-
-		utf = g_new (gchar, 7);
-
-		unilen = e_unichar_to_utf8 (unival, utf);
-
-		utf[unilen] = '\0';
-	}
-
-	return utf;
-}
-
-gchar *
-e_utf8_from_gtk_string_sized (GtkWidget *widget, const gchar *string, gint bytes)
-{
-	iconv_t ic;
-	char *new, *ob;
-	gchar * ib;
-	size_t ibl, obl;
-
-	g_return_val_if_fail (widget != NULL, NULL);
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
-
-	if (!string) return NULL;
-
-	g_return_val_if_fail (widget, NULL);
-
-	ic = e_iconv_from_gdk_font (widget->style->font);
-	if (ic == (iconv_t) -1) {
-		XFontStruct *xfs;
-		/* If iconv is missing we assume either iso-10646 or iso-8859-1 */
-		xfs = GDK_FONT_XFONT (widget->style->font);
-		if (widget->style->font->type == GDK_FONT_FONTSET || ((xfs->min_byte1 != 0) || (xfs->max_byte1 != 0))) {
-			gint i;
-			const guchar *ib;
-			guchar * ob, * new;
-			/* iso-10646 */
-			ib = string;
-			new = ob = g_new (unsigned char, bytes * 6 + 1);
-			for (i = 0; i < (bytes - 1); i += 2) {
-				ob += e_unichar_to_utf8 (ib[i] * 256 + ib[i + 1], ob);
-			}
-			*ob = '\0';
-			return new;
-		} else {
-			gint i;
-			/* iso-8859-1 */
-			ib = (char *) string;
-			new = ob = g_new (unsigned char, bytes * 2 + 1);
-			for (i = 0; i < (bytes); i ++) {
-				ob += e_unichar_to_utf8 (ib[i], ob);
-			}
-			*ob = '\0';
-			return new;
-		}
-	}
-
-	ib = (char *) string;
-	ibl = bytes;
-	new = ob = g_new (gchar, ibl * 6 + 1);
-	obl = ibl * 6 + 1;
-
-	while (ibl > 0) {
-		iconv (ic, &ib, &ibl, &ob, &obl);
-		if (ibl > 0) {
-			gint len;
-			if ((*ib & 0x80) == 0x00) len = 1;
-			else if ((*ib &0xe0) == 0xc0) len = 2;
-			else if ((*ib &0xf0) == 0xe0) len = 3;
-			else if ((*ib &0xf8) == 0xf0) len = 4;
-			else {
-				g_warning ("Invalid UTF-8 sequence");
-				break;
-			}
-			ib += len;
-			ibl = bytes - (ib - string);
-			if (ibl > bytes) ibl = 0;
-			*ob++ = '_';
-			obl--;
-		}
-	}
-
-	*ob = '\0';
-
-	return new;
-}
-
-gchar *
-e_utf8_from_gtk_string (GtkWidget *widget, const gchar *string)
-{
-	if (!string) return NULL;
-	return e_utf8_from_gtk_string_sized (widget, string, strlen (string));
-}
-
-gchar *
-e_utf8_to_gtk_string_sized (GtkWidget *widget, const gchar *string, gint bytes)
-{
-	iconv_t ic;
-	char *new, *ob;
-	gchar * ib;
-	size_t ibl, obl;
-
-	if (!string) return NULL;
-
-	g_return_val_if_fail (widget, NULL);
-
-	ic = e_iconv_to_gdk_font (widget->style->font);
-	if (ic == (iconv_t) -1) {
-		XFontStruct *xfs;
-		gboolean twobyte;
-		gint len;
-		const gchar *u;
-		gunichar uc;
-		/* If iconv is missing we assume either iso-10646 or iso-8859-1 */
-		xfs = GDK_FONT_XFONT (widget->style->font);
-		twobyte = (widget->style->font->type == GDK_FONT_FONTSET || ((xfs->min_byte1 != 0) || (xfs->max_byte1 != 0)));
-
-		new = g_new (unsigned char, bytes * 4 + 1);
-		u = string;
-		len = 0;
-
-		while ((u) && (u - string < bytes)) {
-			u = e_unicode_get_utf8 (u, &uc);
-			if (twobyte) {
-				new[len++] = (uc & 0xff00) >> 8;
-			}
-			new[len++] = uc & 0xff;
-		}
-		new[len] = '\0';
-		d(printf("utf8_to_gtk: %s => %s\n", string, new));
-		return new;
-	}
-
-	ib = (char *) string;
-	ibl = bytes;
-	new = ob = g_new (gchar, ibl * 4 + 1);
-	obl = ibl * 4 + 1;
-
-	while (ibl > 0) {
-		iconv (ic, &ib, &ibl, &ob, &obl);
-		if (ibl > 0) {
-			gint len;
-			if ((*ib & 0x80) == 0x00) len = 1;
-			else if ((*ib &0xe0) == 0xc0) len = 2;
-			else if ((*ib &0xf0) == 0xe0) len = 3;
-			else if ((*ib &0xf8) == 0xf0) len = 4;
-			else {
-				g_warning ("Invalid UTF-8 sequence");
-				break;
-			}
-			ib += len;
-			ibl = bytes - (ib - string);
-			if (ibl > bytes) ibl = 0;
-			*ob++ = '_';
-			obl--;
-		}
-	}
-
-	*ob = '\0';
-
-	return new;
-}
-
-gchar *
-e_utf8_to_gtk_string (GtkWidget *widget, const gchar *string)
-{
-	if (!string) return NULL;
-	return e_utf8_to_gtk_string_sized (widget, string, strlen (string));
-}
-
-gchar *
-e_utf8_from_locale_string_sized (const gchar *string, gint bytes)
-{
-	iconv_t ic;
-	char *new, *ob;
-	gchar * ib;
-	size_t ibl, obl;
-
-	if (!string) return NULL;
-
-	ic = e_iconv_from_locale ();
-	if (ic == (iconv_t) -1) {
-		gint i;
-		/* iso-8859-1 */
-		ib = (char *) string;
-		new = ob = g_new (unsigned char, bytes * 2 + 1);
-		for (i = 0; i < (bytes); i ++) {
-			ob += e_unichar_to_utf8 (ib[i], ob);
-		}
-		*ob = '\0';
-		return new;
-	}
-
-	ib = (char *) string;
-	ibl = bytes;
-	new = ob = g_new (gchar, ibl * 6 + 1);
-	obl = ibl * 6 + 1;
-
-	while (ibl > 0) {
-		iconv (ic, &ib, &ibl, &ob, &obl);
-		if (ibl > 0) {
-			gint len;
-			if ((*ib & 0x80) == 0x00) len = 1;
-			else if ((*ib &0xe0) == 0xc0) len = 2;
-			else if ((*ib &0xf0) == 0xe0) len = 3;
-			else if ((*ib &0xf8) == 0xf0) len = 4;
-			else {
-				g_warning ("Invalid UTF-8 sequence");
-				break;
-			}
-			ib += len;
-			ibl = bytes - (ib - string);
-			if (ibl > bytes) ibl = 0;
-			*ob++ = '_';
-			obl--;
-		}
-	}
-
-	*ob = '\0';
-
-	return new;
-}
-
-gchar *
-e_utf8_from_locale_string (const gchar *string)
-{
-	if (!string) return NULL;
-	return e_utf8_from_locale_string_sized (string, strlen (string));
-}
-
-gchar *
-e_utf8_to_locale_string_sized (const gchar *string, gint bytes)
-{
-	iconv_t ic;
-	char *new, *ob;
-	gchar * ib;
-	size_t ibl, obl;
-
-	if (!string) return NULL;
-
-	ic = e_iconv_to_locale ();
-	if (ic == (iconv_t) -1) {
-		gint len;
-		const gchar *u;
-		gunichar uc;
-
-		new = g_new (unsigned char, bytes * 4 + 1);
-		u = string;
-		len = 0;
-
-		while ((u) && (u - string < bytes)) {
-			u = e_unicode_get_utf8 (u, &uc);
-			new[len++] = uc & 0xff;
-		}
-		new[len] = '\0';
-		return new;
-	}
-
-	ib = (char *) string;
-	ibl = bytes;
-	new = ob = g_new (gchar, ibl * 4 + 1);
-	obl = ibl * 4 + 1;
-
-	while (ibl > 0) {
-		iconv (ic, &ib, &ibl, &ob, &obl);
-		if (ibl > 0) {
-			gint len;
-			if ((*ib & 0x80) == 0x00) len = 1;
-			else if ((*ib &0xe0) == 0xc0) len = 2;
-			else if ((*ib &0xf0) == 0xe0) len = 3;
-			else if ((*ib &0xf8) == 0xf0) len = 4;
-			else {
-				g_warning ("Invalid UTF-8 sequence");
-				break;
-			}
-			ib += len;
-			ibl = bytes - (ib - string);
-			if (ibl > bytes) ibl = 0;
-			*ob++ = '_';
-			obl--;
-		}
-	}
-
-	*ob = '\0';
-
-	return new;
-}
-
-gchar *
-e_utf8_to_locale_string (const gchar *string)
-{
-	if (!string) return NULL;
-	return e_utf8_to_locale_string_sized (string, strlen (string));
-}
-
-gchar *
-e_utf8_gtk_entry_get_text (GtkEntry *entry)
-{
-	gchar *s, *u;
-
-	s = gtk_entry_get_text (entry);
-	if (!s) return NULL;
-	u = e_utf8_from_gtk_string ((GtkWidget *) entry, s);
-	return u;
-}
-
-gchar *
-e_utf8_gtk_editable_get_text (GtkEditable *editable)
-{
-	return e_utf8_gtk_editable_get_chars(editable, 0, -1);
-}
-
-gchar *
-e_utf8_gtk_editable_get_chars (GtkEditable *editable, gint start, gint end)
-{
-	gchar *s, *u;
-
-	s = gtk_editable_get_chars (editable, start, end);
-	u = e_utf8_from_gtk_string ((GtkWidget *) editable, s);
-	g_free (s);
-	return u;
-}
-
-void
-e_utf8_gtk_editable_insert_text (GtkEditable *editable, const gchar *text, gint length, gint *position)
-{
-	gchar *s;
-
-	s = e_utf8_to_gtk_string_sized ((GtkWidget *) editable, text, length);
-
-	gtk_editable_insert_text (editable, s, length, position);
-
-	g_free (s);
-}
-
-void
-e_utf8_gtk_editable_set_text (GtkEditable *editable, const gchar *text)
-{
-	int position;
-	gtk_editable_delete_text(editable, 0, -1);
-	if (text)
-		e_utf8_gtk_editable_insert_text(editable, text, strlen(text), &position);
-}
-
-void
-e_utf8_gtk_entry_set_text (GtkEntry *entry, const gchar *text)
-{
-	if (!text)
-		gtk_entry_set_text(entry, "");
-	else {
-		gchar *s;
-
-		s = e_utf8_to_gtk_string ((GtkWidget *) entry, text);
-		gtk_entry_set_text (entry, s);
-		
-		if (s) g_free (s);
-	}
-}
-	
-GtkWidget *
-e_utf8_gtk_menu_item_new_with_label (GtkMenu *menu, const gchar *label)
-{
-	GtkWidget *w;
-	gchar *s;
-
-	if (!label) return NULL;
-
-	s = e_utf8_to_gtk_string ((GtkWidget *) menu, label);
-	w = gtk_menu_item_new_with_label (s);
-
-	g_free (s);
-
-	return w;
-}
-
-void
-e_utf8_gtk_clist_set_text (GtkCList *clist, gint row, gint col, const gchar *text)
-{
-	gchar *s;
-
-	if (!text) return;
-
-	s = e_utf8_to_gtk_string ((GtkWidget *) clist, text);
-	gtk_clist_set_text (clist, row, col, s);
-
-	if (s) g_free (s);
-}
-
-gint
-e_utf8_gtk_clist_append (GtkCList *clist, gchar *text[])
-{
-	gint row, i;
-	gchar **v;
-
-	if (!text) return 0;
-
-	v = g_new (gchar *, clist->columns);
-	for (i = 0; i < clist->columns; i++)
-		v[i] = e_utf8_to_gtk_string ((GtkWidget *) clist, text[i]);
-
-	row = gtk_clist_append (clist, v);
-
-	for (i = 0; i < clist->columns; i++)
-		if (v[i]) g_free (v[i]);
-
-	return row;
-}
-
-/*
- * Translate \U+XXXX\ sequences to utf8 chars
- */
-
-gchar *
-e_utf8_xml1_decode (const gchar *text)
-{
-	const guchar *c;
-	guchar *u, *d;
-	int len, s;
-
-	g_return_val_if_fail (text != NULL, NULL);
-
-	len = strlen (text)+1;
-	/* len * 2 is absolute maximum */
-	u = d = g_malloc (len * 2);
-
-	c = text;
-	s = 0;
-	while (s < len) {
-		if ((s <= (len - 8)) &&
-		    (c[s    ] == '\\') &&
-		    (c[s + 1] == 'U' ) &&
-		    (c[s + 2] == '+' ) &&
-		    isxdigit (c[s + 3]) &&
-		    isxdigit (c[s + 4]) &&
-		    isxdigit (c[s + 5]) &&
-		    isxdigit (c[s + 6]) &&
-		    (c[s + 7] == '\\')) {
-			/* Valid \U+XXXX\ sequence */
-			unsigned int unival;
-			unival = strtol (c + s + 3, NULL, 16);
-			d += e_unichar_to_utf8 (unival, d);
-			s += 8;
-		} else if (c[s] > 127) {
-			/* fixme: We assume iso-8859-1 currently */
-			d += e_unichar_to_utf8 (c[s], d);
-			s += 1;
-		} else {
-			*d++ = c[s++];
-		}
-	}
-	*d++ = '\0';
-	u = g_realloc (u, (d - u));
-
-	return u;
-}
-
-gchar *
-e_utf8_xml1_encode (const gchar *text)
-{
-	guchar *u, *d, *c;
-	int unival;
-	int len;
-
-	g_return_val_if_fail (text != NULL, NULL);
-
-	len = 0;
-	for (u = e_unicode_get_utf8 (text, &unival); u && unival; u = e_unicode_get_utf8 (u, &unival)) {
-		if ((unival >= 0x80) || (unival == '\\')) {
-			len += 8;
-		} else {
-			len += 1;
-		}
-	}
-	d = c = g_new (guchar, len + 1);
-
-	for (u = e_unicode_get_utf8 (text, &unival); u && unival; u = e_unicode_get_utf8 (u, &unival)) {
-		if ((unival >= 0x80) || (unival == '\\')) {
-			*c++ = '\\';
-			*c++ = 'U';
-			*c++ = '+';
-			c += sprintf (c, "%04x", unival);
-			*c++ = '\\';
-		} else {
-			*c++ = unival;
-		}
-	}
-	*c = '\0';
-
-	return d;
-}
-
-/**
- * e_unichar_to_utf8:
- * @c: a ISO10646 character code
- * @outbuf: output buffer, must have at least 6 bytes of space.
- *          If %NULL, the length will be computed and returned
- *          and nothing will be written to @out.
- * 
- * Convert a single character to utf8
- * 
- * Return value: number of bytes written
- **/
-
-gint
-e_unichar_to_utf8 (gint c, gchar *outbuf)
-{
-  size_t len = 0;
-  int first;
-  int i;
-
-  if (c < 0x80)
-    {
-      first = 0;
-      len = 1;
-    }
-  else if (c < 0x800)
-    {
-      first = 0xc0;
-      len = 2;
-    }
-  else if (c < 0x10000)
-    {
-      first = 0xe0;
-      len = 3;
-    }
-   else if (c < 0x200000)
-    {
-      first = 0xf0;
-      len = 4;
-    }
-  else if (c < 0x4000000)
-    {
-      first = 0xf8;
-      len = 5;
-    }
-  else
-    {
-      first = 0xfc;
-      len = 6;
-    }
-
-  if (outbuf)
-    {
-      for (i = len - 1; i > 0; --i)
-	{
-	  outbuf[i] = (c & 0x3f) | 0x80;
-	  c >>= 6;
-	}
-      outbuf[0] = c | first;
-    }
-
-  return len;
-}
-
-gchar *
-e_unicode_get_utf8 (const gchar *text, gunichar *out)
-{
-	*out = g_utf8_get_char (text);
-	return (*out == (gunichar)-1) ? NULL : g_utf8_next_char (text);
-}
-
-/*
- * The following is borrowed from Gtk+ 1.3
- */
-
-/* Thanks to Markus G. Kuhn <mkuhn@acm.org> for the ksysym<->Unicode
- * mapping functions, from the xterm sources.
- */
-
-/* These tables could be compressed by contiguous ranges, but the benefit of doing so
- * is smallish. It would save about ~1000 bytes total.
- */
-
-static struct {
-  unsigned short keysym;
-  unsigned short ucs;
-} gdk_keysym_to_unicode_tab[] = {
-  { 0x01a1, 0x0104 }, /*                     Aogonek Ą LATIN CAPITAL LETTER A WITH OGONEK */
-  { 0x01a2, 0x02d8 }, /*                       breve ˘ BREVE */
-  { 0x01a3, 0x0141 }, /*                     Lstroke Ł LATIN CAPITAL LETTER L WITH STROKE */
-  { 0x01a5, 0x013d }, /*                      Lcaron Ľ LATIN CAPITAL LETTER L WITH CARON */
-  { 0x01a6, 0x015a }, /*                      Sacute Ś LATIN CAPITAL LETTER S WITH ACUTE */
-  { 0x01a9, 0x0160 }, /*                      Scaron Š LATIN CAPITAL LETTER S WITH CARON */
-  { 0x01aa, 0x015e }, /*                    Scedilla Ş LATIN CAPITAL LETTER S WITH CEDILLA */
-  { 0x01ab, 0x0164 }, /*                      Tcaron Ť LATIN CAPITAL LETTER T WITH CARON */
-  { 0x01ac, 0x0179 }, /*                      Zacute Ź LATIN CAPITAL LETTER Z WITH ACUTE */
-  { 0x01ae, 0x017d }, /*                      Zcaron Ž LATIN CAPITAL LETTER Z WITH CARON */
-  { 0x01af, 0x017b }, /*                   Zabovedot Ż LATIN CAPITAL LETTER Z WITH DOT ABOVE */
-  { 0x01b1, 0x0105 }, /*                     aogonek ą LATIN SMALL LETTER A WITH OGONEK */
-  { 0x01b2, 0x02db }, /*                      ogonek ˛ OGONEK */
-  { 0x01b3, 0x0142 }, /*                     lstroke ł LATIN SMALL LETTER L WITH STROKE */
-  { 0x01b5, 0x013e }, /*                      lcaron ľ LATIN SMALL LETTER L WITH CARON */
-  { 0x01b6, 0x015b }, /*                      sacute ś LATIN SMALL LETTER S WITH ACUTE */
-  { 0x01b7, 0x02c7 }, /*                       caron ˇ CARON */
-  { 0x01b9, 0x0161 }, /*                      scaron š LATIN SMALL LETTER S WITH CARON */
-  { 0x01ba, 0x015f }, /*                    scedilla ş LATIN SMALL LETTER S WITH CEDILLA */
-  { 0x01bb, 0x0165 }, /*                      tcaron ť LATIN SMALL LETTER T WITH CARON */
-  { 0x01bc, 0x017a }, /*                      zacute ź LATIN SMALL LETTER Z WITH ACUTE */
-  { 0x01bd, 0x02dd }, /*                 doubleacute ˝ DOUBLE ACUTE ACCENT */
-  { 0x01be, 0x017e }, /*                      zcaron ž LATIN SMALL LETTER Z WITH CARON */
-  { 0x01bf, 0x017c }, /*                   zabovedot ż LATIN SMALL LETTER Z WITH DOT ABOVE */
-  { 0x01c0, 0x0154 }, /*                      Racute Ŕ LATIN CAPITAL LETTER R WITH ACUTE */
-  { 0x01c3, 0x0102 }, /*                      Abreve Ă LATIN CAPITAL LETTER A WITH BREVE */
-  { 0x01c5, 0x0139 }, /*                      Lacute Ĺ LATIN CAPITAL LETTER L WITH ACUTE */
-  { 0x01c6, 0x0106 }, /*                      Cacute Ć LATIN CAPITAL LETTER C WITH ACUTE */
-  { 0x01c8, 0x010c }, /*                      Ccaron Č LATIN CAPITAL LETTER C WITH CARON */
-  { 0x01ca, 0x0118 }, /*                     Eogonek Ę LATIN CAPITAL LETTER E WITH OGONEK */
-  { 0x01cc, 0x011a }, /*                      Ecaron Ě LATIN CAPITAL LETTER E WITH CARON */
-  { 0x01cf, 0x010e }, /*                      Dcaron Ď LATIN CAPITAL LETTER D WITH CARON */
-  { 0x01d0, 0x0110 }, /*                     Dstroke Đ LATIN CAPITAL LETTER D WITH STROKE */
-  { 0x01d1, 0x0143 }, /*                      Nacute Ń LATIN CAPITAL LETTER N WITH ACUTE */
-  { 0x01d2, 0x0147 }, /*                      Ncaron Ň LATIN CAPITAL LETTER N WITH CARON */
-  { 0x01d5, 0x0150 }, /*                Odoubleacute Ő LATIN CAPITAL LETTER O WITH DOUBLE ACUTE */
-  { 0x01d8, 0x0158 }, /*                      Rcaron Ř LATIN CAPITAL LETTER R WITH CARON */
-  { 0x01d9, 0x016e }, /*                       Uring Ů LATIN CAPITAL LETTER U WITH RING ABOVE */
-  { 0x01db, 0x0170 }, /*                Udoubleacute Ű LATIN CAPITAL LETTER U WITH DOUBLE ACUTE */
-  { 0x01de, 0x0162 }, /*                    Tcedilla Ţ LATIN CAPITAL LETTER T WITH CEDILLA */
-  { 0x01e0, 0x0155 }, /*                      racute ŕ LATIN SMALL LETTER R WITH ACUTE */
-  { 0x01e3, 0x0103 }, /*                      abreve ă LATIN SMALL LETTER A WITH BREVE */
-  { 0x01e5, 0x013a }, /*                      lacute ĺ LATIN SMALL LETTER L WITH ACUTE */
-  { 0x01e6, 0x0107 }, /*                      cacute ć LATIN SMALL LETTER C WITH ACUTE */
-  { 0x01e8, 0x010d }, /*                      ccaron č LATIN SMALL LETTER C WITH CARON */
-  { 0x01ea, 0x0119 }, /*                     eogonek ę LATIN SMALL LETTER E WITH OGONEK */
-  { 0x01ec, 0x011b }, /*                      ecaron ě LATIN SMALL LETTER E WITH CARON */
-  { 0x01ef, 0x010f }, /*                      dcaron ď LATIN SMALL LETTER D WITH CARON */
-  { 0x01f0, 0x0111 }, /*                     dstroke đ LATIN SMALL LETTER D WITH STROKE */
-  { 0x01f1, 0x0144 }, /*                      nacute ń LATIN SMALL LETTER N WITH ACUTE */
-  { 0x01f2, 0x0148 }, /*                      ncaron ň LATIN SMALL LETTER N WITH CARON */
-  { 0x01f5, 0x0151 }, /*                odoubleacute ő LATIN SMALL LETTER O WITH DOUBLE ACUTE */
-  { 0x01f8, 0x0159 }, /*                      rcaron ř LATIN SMALL LETTER R WITH CARON */
-  { 0x01f9, 0x016f }, /*                       uring ů LATIN SMALL LETTER U WITH RING ABOVE */
-  { 0x01fb, 0x0171 }, /*                udoubleacute ű LATIN SMALL LETTER U WITH DOUBLE ACUTE */
-  { 0x01fe, 0x0163 }, /*                    tcedilla ţ LATIN SMALL LETTER T WITH CEDILLA */
-  { 0x01ff, 0x02d9 }, /*                    abovedot ˙ DOT ABOVE */
-  { 0x02a1, 0x0126 }, /*                     Hstroke Ħ LATIN CAPITAL LETTER H WITH STROKE */
-  { 0x02a6, 0x0124 }, /*                 Hcircumflex Ĥ LATIN CAPITAL LETTER H WITH CIRCUMFLEX */
-  { 0x02a9, 0x0130 }, /*                   Iabovedot İ LATIN CAPITAL LETTER I WITH DOT ABOVE */
-  { 0x02ab, 0x011e }, /*                      Gbreve Ğ LATIN CAPITAL LETTER G WITH BREVE */
-  { 0x02ac, 0x0134 }, /*                 Jcircumflex Ĵ LATIN CAPITAL LETTER J WITH CIRCUMFLEX */
-  { 0x02b1, 0x0127 }, /*                     hstroke ħ LATIN SMALL LETTER H WITH STROKE */
-  { 0x02b6, 0x0125 }, /*                 hcircumflex ĥ LATIN SMALL LETTER H WITH CIRCUMFLEX */
-  { 0x02b9, 0x0131 }, /*                    idotless ı LATIN SMALL LETTER DOTLESS I */
-  { 0x02bb, 0x011f }, /*                      gbreve ğ LATIN SMALL LETTER G WITH BREVE */
-  { 0x02bc, 0x0135 }, /*                 jcircumflex ĵ LATIN SMALL LETTER J WITH CIRCUMFLEX */
-  { 0x02c5, 0x010a }, /*                   Cabovedot Ċ LATIN CAPITAL LETTER C WITH DOT ABOVE */
-  { 0x02c6, 0x0108 }, /*                 Ccircumflex Ĉ LATIN CAPITAL LETTER C WITH CIRCUMFLEX */
-  { 0x02d5, 0x0120 }, /*                   Gabovedot Ġ LATIN CAPITAL LETTER G WITH DOT ABOVE */
-  { 0x02d8, 0x011c }, /*                 Gcircumflex Ĝ LATIN CAPITAL LETTER G WITH CIRCUMFLEX */
-  { 0x02dd, 0x016c }, /*                      Ubreve Ŭ LATIN CAPITAL LETTER U WITH BREVE */
-  { 0x02de, 0x015c }, /*                 Scircumflex Ŝ LATIN CAPITAL LETTER S WITH CIRCUMFLEX */
-  { 0x02e5, 0x010b }, /*                   cabovedot ċ LATIN SMALL LETTER C WITH DOT ABOVE */
-  { 0x02e6, 0x0109 }, /*                 ccircumflex ĉ LATIN SMALL LETTER C WITH CIRCUMFLEX */
-  { 0x02f5, 0x0121 }, /*                   gabovedot ġ LATIN SMALL LETTER G WITH DOT ABOVE */
-  { 0x02f8, 0x011d }, /*                 gcircumflex ĝ LATIN SMALL LETTER G WITH CIRCUMFLEX */
-  { 0x02fd, 0x016d }, /*                      ubreve ŭ LATIN SMALL LETTER U WITH BREVE */
-  { 0x02fe, 0x015d }, /*                 scircumflex ŝ LATIN SMALL LETTER S WITH CIRCUMFLEX */
-  { 0x03a2, 0x0138 }, /*                         kra ĸ LATIN SMALL LETTER KRA */
-  { 0x03a3, 0x0156 }, /*                    Rcedilla Ŗ LATIN CAPITAL LETTER R WITH CEDILLA */
-  { 0x03a5, 0x0128 }, /*                      Itilde Ĩ LATIN CAPITAL LETTER I WITH TILDE */
-  { 0x03a6, 0x013b }, /*                    Lcedilla Ļ LATIN CAPITAL LETTER L WITH CEDILLA */
-  { 0x03aa, 0x0112 }, /*                     Emacron Ē LATIN CAPITAL LETTER E WITH MACRON */
-  { 0x03ab, 0x0122 }, /*                    Gcedilla Ģ LATIN CAPITAL LETTER G WITH CEDILLA */
-  { 0x03ac, 0x0166 }, /*                      Tslash Ŧ LATIN CAPITAL LETTER T WITH STROKE */
-  { 0x03b3, 0x0157 }, /*                    rcedilla ŗ LATIN SMALL LETTER R WITH CEDILLA */
-  { 0x03b5, 0x0129 }, /*                      itilde ĩ LATIN SMALL LETTER I WITH TILDE */
-  { 0x03b6, 0x013c }, /*                    lcedilla ļ LATIN SMALL LETTER L WITH CEDILLA */
-  { 0x03ba, 0x0113 }, /*                     emacron ē LATIN SMALL LETTER E WITH MACRON */
-  { 0x03bb, 0x0123 }, /*                    gcedilla ģ LATIN SMALL LETTER G WITH CEDILLA */
-  { 0x03bc, 0x0167 }, /*                      tslash ŧ LATIN SMALL LETTER T WITH STROKE */
-  { 0x03bd, 0x014a }, /*                         ENG Ŋ LATIN CAPITAL LETTER ENG */
-  { 0x03bf, 0x014b }, /*                         eng ŋ LATIN SMALL LETTER ENG */
-  { 0x03c0, 0x0100 }, /*                     Amacron Ā LATIN CAPITAL LETTER A WITH MACRON */
-  { 0x03c7, 0x012e }, /*                     Iogonek Į LATIN CAPITAL LETTER I WITH OGONEK */
-  { 0x03cc, 0x0116 }, /*                   Eabovedot Ė LATIN CAPITAL LETTER E WITH DOT ABOVE */
-  { 0x03cf, 0x012a }, /*                     Imacron Ī LATIN CAPITAL LETTER I WITH MACRON */
-  { 0x03d1, 0x0145 }, /*                    Ncedilla Ņ LATIN CAPITAL LETTER N WITH CEDILLA */
-  { 0x03d2, 0x014c }, /*                     Omacron Ō LATIN CAPITAL LETTER O WITH MACRON */
-  { 0x03d3, 0x0136 }, /*                    Kcedilla Ķ LATIN CAPITAL LETTER K WITH CEDILLA */
-  { 0x03d9, 0x0172 }, /*                     Uogonek Ų LATIN CAPITAL LETTER U WITH OGONEK */
-  { 0x03dd, 0x0168 }, /*                      Utilde Ũ LATIN CAPITAL LETTER U WITH TILDE */
-  { 0x03de, 0x016a }, /*                     Umacron Ū LATIN CAPITAL LETTER U WITH MACRON */
-  { 0x03e0, 0x0101 }, /*                     amacron ā LATIN SMALL LETTER A WITH MACRON */
-  { 0x03e7, 0x012f }, /*                     iogonek į LATIN SMALL LETTER I WITH OGONEK */
-  { 0x03ec, 0x0117 }, /*                   eabovedot ė LATIN SMALL LETTER E WITH DOT ABOVE */
-  { 0x03ef, 0x012b }, /*                     imacron ī LATIN SMALL LETTER I WITH MACRON */
-  { 0x03f1, 0x0146 }, /*                    ncedilla ņ LATIN SMALL LETTER N WITH CEDILLA */
-  { 0x03f2, 0x014d }, /*                     omacron ō LATIN SMALL LETTER O WITH MACRON */
-  { 0x03f3, 0x0137 }, /*                    kcedilla ķ LATIN SMALL LETTER K WITH CEDILLA */
-  { 0x03f9, 0x0173 }, /*                     uogonek ų LATIN SMALL LETTER U WITH OGONEK */
-  { 0x03fd, 0x0169 }, /*                      utilde ũ LATIN SMALL LETTER U WITH TILDE */
-  { 0x03fe, 0x016b }, /*                     umacron ū LATIN SMALL LETTER U WITH MACRON */
-  { 0x047e, 0x203e }, /*                    overline ‾ OVERLINE */
-  { 0x04a1, 0x3002 }, /*               kana_fullstop 。 IDEOGRAPHIC FULL STOP */
-  { 0x04a2, 0x300c }, /*         kana_openingbracket 「 LEFT CORNER BRACKET */
-  { 0x04a3, 0x300d }, /*         kana_closingbracket 」 RIGHT CORNER BRACKET */
-  { 0x04a4, 0x3001 }, /*                  kana_comma 、 IDEOGRAPHIC COMMA */
-  { 0x04a5, 0x30fb }, /*            kana_conjunctive ・ KATAKANA MIDDLE DOT */
-  { 0x04a6, 0x30f2 }, /*                     kana_WO ヲ KATAKANA LETTER WO */
-  { 0x04a7, 0x30a1 }, /*                      kana_a ァ KATAKANA LETTER SMALL A */
-  { 0x04a8, 0x30a3 }, /*                      kana_i ィ KATAKANA LETTER SMALL I */
-  { 0x04a9, 0x30a5 }, /*                      kana_u ゥ KATAKANA LETTER SMALL U */
-  { 0x04aa, 0x30a7 }, /*                      kana_e ェ KATAKANA LETTER SMALL E */
-  { 0x04ab, 0x30a9 }, /*                      kana_o ォ KATAKANA LETTER SMALL O */
-  { 0x04ac, 0x30e3 }, /*                     kana_ya ャ KATAKANA LETTER SMALL YA */
-  { 0x04ad, 0x30e5 }, /*                     kana_yu ュ KATAKANA LETTER SMALL YU */
-  { 0x04ae, 0x30e7 }, /*                     kana_yo ョ KATAKANA LETTER SMALL YO */
-  { 0x04af, 0x30c3 }, /*                    kana_tsu ッ KATAKANA LETTER SMALL TU */
-  { 0x04b0, 0x30fc }, /*              prolongedsound ー KATAKANA-HIRAGANA PROLONGED SOUND MARK */
-  { 0x04b1, 0x30a2 }, /*                      kana_A ア KATAKANA LETTER A */
-  { 0x04b2, 0x30a4 }, /*                      kana_I イ KATAKANA LETTER I */
-  { 0x04b3, 0x30a6 }, /*                      kana_U ウ KATAKANA LETTER U */
-  { 0x04b4, 0x30a8 }, /*                      kana_E エ KATAKANA LETTER E */
-  { 0x04b5, 0x30aa }, /*                      kana_O オ KATAKANA LETTER O */
-  { 0x04b6, 0x30ab }, /*                     kana_KA カ KATAKANA LETTER KA */
-  { 0x04b7, 0x30ad }, /*                     kana_KI キ KATAKANA LETTER KI */
-  { 0x04b8, 0x30af }, /*                     kana_KU ク KATAKANA LETTER KU */
-  { 0x04b9, 0x30b1 }, /*                     kana_KE ケ KATAKANA LETTER KE */
-  { 0x04ba, 0x30b3 }, /*                     kana_KO コ KATAKANA LETTER KO */
-  { 0x04bb, 0x30b5 }, /*                     kana_SA サ KATAKANA LETTER SA */
-  { 0x04bc, 0x30b7 }, /*                    kana_SHI シ KATAKANA LETTER SI */
-  { 0x04bd, 0x30b9 }, /*                     kana_SU ス KATAKANA LETTER SU */
-  { 0x04be, 0x30bb }, /*                     kana_SE セ KATAKANA LETTER SE */
-  { 0x04bf, 0x30bd }, /*                     kana_SO ソ KATAKANA LETTER SO */
-  { 0x04c0, 0x30bf }, /*                     kana_TA タ KATAKANA LETTER TA */
-  { 0x04c1, 0x30c1 }, /*                    kana_CHI チ KATAKANA LETTER TI */
-  { 0x04c2, 0x30c4 }, /*                    kana_TSU ツ KATAKANA LETTER TU */
-  { 0x04c3, 0x30c6 }, /*                     kana_TE テ KATAKANA LETTER TE */
-  { 0x04c4, 0x30c8 }, /*                     kana_TO ト KATAKANA LETTER TO */
-  { 0x04c5, 0x30ca }, /*                     kana_NA ナ KATAKANA LETTER NA */
-  { 0x04c6, 0x30cb }, /*                     kana_NI ニ KATAKANA LETTER NI */
-  { 0x04c7, 0x30cc }, /*                     kana_NU ヌ KATAKANA LETTER NU */
-  { 0x04c8, 0x30cd }, /*                     kana_NE ネ KATAKANA LETTER NE */
-  { 0x04c9, 0x30ce }, /*                     kana_NO ノ KATAKANA LETTER NO */
-  { 0x04ca, 0x30cf }, /*                     kana_HA ハ KATAKANA LETTER HA */
-  { 0x04cb, 0x30d2 }, /*                     kana_HI ヒ KATAKANA LETTER HI */
-  { 0x04cc, 0x30d5 }, /*                     kana_FU フ KATAKANA LETTER HU */
-  { 0x04cd, 0x30d8 }, /*                     kana_HE ヘ KATAKANA LETTER HE */
-  { 0x04ce, 0x30db }, /*                     kana_HO ホ KATAKANA LETTER HO */
-  { 0x04cf, 0x30de }, /*                     kana_MA マ KATAKANA LETTER MA */
-  { 0x04d0, 0x30df }, /*                     kana_MI ミ KATAKANA LETTER MI */
-  { 0x04d1, 0x30e0 }, /*                     kana_MU ム KATAKANA LETTER MU */
-  { 0x04d2, 0x30e1 }, /*                     kana_ME メ KATAKANA LETTER ME */
-  { 0x04d3, 0x30e2 }, /*                     kana_MO モ KATAKANA LETTER MO */
-  { 0x04d4, 0x30e4 }, /*                     kana_YA ヤ KATAKANA LETTER YA */
-  { 0x04d5, 0x30e6 }, /*                     kana_YU ユ KATAKANA LETTER YU */
-  { 0x04d6, 0x30e8 }, /*                     kana_YO ヨ KATAKANA LETTER YO */
-  { 0x04d7, 0x30e9 }, /*                     kana_RA ラ KATAKANA LETTER RA */
-  { 0x04d8, 0x30ea }, /*                     kana_RI リ KATAKANA LETTER RI */
-  { 0x04d9, 0x30eb }, /*                     kana_RU ル KATAKANA LETTER RU */
-  { 0x04da, 0x30ec }, /*                     kana_RE レ KATAKANA LETTER RE */
-  { 0x04db, 0x30ed }, /*                     kana_RO ロ KATAKANA LETTER RO */
-  { 0x04dc, 0x30ef }, /*                     kana_WA ワ KATAKANA LETTER WA */
-  { 0x04dd, 0x30f3 }, /*                      kana_N ン KATAKANA LETTER N */
-  { 0x04de, 0x309b }, /*                 voicedsound ゛ KATAKANA-HIRAGANA VOICED SOUND MARK */
-  { 0x04df, 0x309c }, /*             semivoicedsound ゜ KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK */
-  { 0x05ac, 0x060c }, /*                Arabic_comma ، ARABIC COMMA */
-  { 0x05bb, 0x061b }, /*            Arabic_semicolon ؛ ARABIC SEMICOLON */
-  { 0x05bf, 0x061f }, /*        Arabic_question_mark ؟ ARABIC QUESTION MARK */
-  { 0x05c1, 0x0621 }, /*                Arabic_hamza ء ARABIC LETTER HAMZA */
-  { 0x05c2, 0x0622 }, /*          Arabic_maddaonalef آ ARABIC LETTER ALEF WITH MADDA ABOVE */
-  { 0x05c3, 0x0623 }, /*          Arabic_hamzaonalef أ ARABIC LETTER ALEF WITH HAMZA ABOVE */
-  { 0x05c4, 0x0624 }, /*           Arabic_hamzaonwaw ؤ ARABIC LETTER WAW WITH HAMZA ABOVE */
-  { 0x05c5, 0x0625 }, /*       Arabic_hamzaunderalef إ ARABIC LETTER ALEF WITH HAMZA BELOW */
-  { 0x05c6, 0x0626 }, /*           Arabic_hamzaonyeh ئ ARABIC LETTER YEH WITH HAMZA ABOVE */
-  { 0x05c7, 0x0627 }, /*                 Arabic_alef ا ARABIC LETTER ALEF */
-  { 0x05c8, 0x0628 }, /*                  Arabic_beh ب ARABIC LETTER BEH */
-  { 0x05c9, 0x0629 }, /*           Arabic_tehmarbuta ة ARABIC LETTER TEH MARBUTA */
-  { 0x05ca, 0x062a }, /*                  Arabic_teh ت ARABIC LETTER TEH */
-  { 0x05cb, 0x062b }, /*                 Arabic_theh ث ARABIC LETTER THEH */
-  { 0x05cc, 0x062c }, /*                 Arabic_jeem ج ARABIC LETTER JEEM */
-  { 0x05cd, 0x062d }, /*                  Arabic_hah ح ARABIC LETTER HAH */
-  { 0x05ce, 0x062e }, /*                 Arabic_khah خ ARABIC LETTER KHAH */
-  { 0x05cf, 0x062f }, /*                  Arabic_dal د ARABIC LETTER DAL */
-  { 0x05d0, 0x0630 }, /*                 Arabic_thal ذ ARABIC LETTER THAL */
-  { 0x05d1, 0x0631 }, /*                   Arabic_ra ر ARABIC LETTER REH */
-  { 0x05d2, 0x0632 }, /*                 Arabic_zain ز ARABIC LETTER ZAIN */
-  { 0x05d3, 0x0633 }, /*                 Arabic_seen س ARABIC LETTER SEEN */
-  { 0x05d4, 0x0634 }, /*                Arabic_sheen ش ARABIC LETTER SHEEN */
-  { 0x05d5, 0x0635 }, /*                  Arabic_sad ص ARABIC LETTER SAD */
-  { 0x05d6, 0x0636 }, /*                  Arabic_dad ض ARABIC LETTER DAD */
-  { 0x05d7, 0x0637 }, /*                  Arabic_tah ط ARABIC LETTER TAH */
-  { 0x05d8, 0x0638 }, /*                  Arabic_zah ظ ARABIC LETTER ZAH */
-  { 0x05d9, 0x0639 }, /*                  Arabic_ain ع ARABIC LETTER AIN */
-  { 0x05da, 0x063a }, /*                Arabic_ghain غ ARABIC LETTER GHAIN */
-  { 0x05e0, 0x0640 }, /*              Arabic_tatweel ـ ARABIC TATWEEL */
-  { 0x05e1, 0x0641 }, /*                  Arabic_feh ف ARABIC LETTER FEH */
-  { 0x05e2, 0x0642 }, /*                  Arabic_qaf ق ARABIC LETTER QAF */
-  { 0x05e3, 0x0643 }, /*                  Arabic_kaf ك ARABIC LETTER KAF */
-  { 0x05e4, 0x0644 }, /*                  Arabic_lam ل ARABIC LETTER LAM */
-  { 0x05e5, 0x0645 }, /*                 Arabic_meem م ARABIC LETTER MEEM */
-  { 0x05e6, 0x0646 }, /*                 Arabic_noon ن ARABIC LETTER NOON */
-  { 0x05e7, 0x0647 }, /*                   Arabic_ha ه ARABIC LETTER HEH */
-  { 0x05e8, 0x0648 }, /*                  Arabic_waw و ARABIC LETTER WAW */
-  { 0x05e9, 0x0649 }, /*          Arabic_alefmaksura ى ARABIC LETTER ALEF MAKSURA */
-  { 0x05ea, 0x064a }, /*                  Arabic_yeh ي ARABIC LETTER YEH */
-  { 0x05eb, 0x064b }, /*             Arabic_fathatan ً ARABIC FATHATAN */
-  { 0x05ec, 0x064c }, /*             Arabic_dammatan ٌ ARABIC DAMMATAN */
-  { 0x05ed, 0x064d }, /*             Arabic_kasratan ٍ ARABIC KASRATAN */
-  { 0x05ee, 0x064e }, /*                Arabic_fatha َ ARABIC FATHA */
-  { 0x05ef, 0x064f }, /*                Arabic_damma ُ ARABIC DAMMA */
-  { 0x05f0, 0x0650 }, /*                Arabic_kasra ِ ARABIC KASRA */
-  { 0x05f1, 0x0651 }, /*               Arabic_shadda ّ ARABIC SHADDA */
-  { 0x05f2, 0x0652 }, /*                Arabic_sukun ْ ARABIC SUKUN */
-  { 0x06a1, 0x0452 }, /*                 Serbian_dje ђ CYRILLIC SMALL LETTER DJE */
-  { 0x06a2, 0x0453 }, /*               Macedonia_gje ѓ CYRILLIC SMALL LETTER GJE */
-  { 0x06a3, 0x0451 }, /*                 Cyrillic_io ё CYRILLIC SMALL LETTER IO */
-  { 0x06a4, 0x0454 }, /*                Ukrainian_ie є CYRILLIC SMALL LETTER UKRAINIAN IE */
-  { 0x06a5, 0x0455 }, /*               Macedonia_dse ѕ CYRILLIC SMALL LETTER DZE */
-  { 0x06a6, 0x0456 }, /*                 Ukrainian_i і CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I */
-  { 0x06a7, 0x0457 }, /*                Ukrainian_yi ї CYRILLIC SMALL LETTER YI */
-  { 0x06a8, 0x0458 }, /*                 Cyrillic_je ј CYRILLIC SMALL LETTER JE */
-  { 0x06a9, 0x0459 }, /*                Cyrillic_lje љ CYRILLIC SMALL LETTER LJE */
-  { 0x06aa, 0x045a }, /*                Cyrillic_nje њ CYRILLIC SMALL LETTER NJE */
-  { 0x06ab, 0x045b }, /*                Serbian_tshe ћ CYRILLIC SMALL LETTER TSHE */
-  { 0x06ac, 0x045c }, /*               Macedonia_kje ќ CYRILLIC SMALL LETTER KJE */
-  { 0x06ae, 0x045e }, /*         Byelorussian_shortu ў CYRILLIC SMALL LETTER SHORT U */
-  { 0x06af, 0x045f }, /*               Cyrillic_dzhe џ CYRILLIC SMALL LETTER DZHE */
-  { 0x06b0, 0x2116 }, /*                  numerosign № NUMERO SIGN */
-  { 0x06b1, 0x0402 }, /*                 Serbian_DJE Ђ CYRILLIC CAPITAL LETTER DJE */
-  { 0x06b2, 0x0403 }, /*               Macedonia_GJE Ѓ CYRILLIC CAPITAL LETTER GJE */
-  { 0x06b3, 0x0401 }, /*                 Cyrillic_IO Ё CYRILLIC CAPITAL LETTER IO */
-  { 0x06b4, 0x0404 }, /*                Ukrainian_IE Є CYRILLIC CAPITAL LETTER UKRAINIAN IE */
-  { 0x06b5, 0x0405 }, /*               Macedonia_DSE Ѕ CYRILLIC CAPITAL LETTER DZE */
-  { 0x06b6, 0x0406 }, /*                 Ukrainian_I І CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I */
-  { 0x06b7, 0x0407 }, /*                Ukrainian_YI Ї CYRILLIC CAPITAL LETTER YI */
-  { 0x06b8, 0x0408 }, /*                 Cyrillic_JE Ј CYRILLIC CAPITAL LETTER JE */
-  { 0x06b9, 0x0409 }, /*                Cyrillic_LJE Љ CYRILLIC CAPITAL LETTER LJE */
-  { 0x06ba, 0x040a }, /*                Cyrillic_NJE Њ CYRILLIC CAPITAL LETTER NJE */
-  { 0x06bb, 0x040b }, /*                Serbian_TSHE Ћ CYRILLIC CAPITAL LETTER TSHE */
-  { 0x06bc, 0x040c }, /*               Macedonia_KJE Ќ CYRILLIC CAPITAL LETTER KJE */
-  { 0x06be, 0x040e }, /*         Byelorussian_SHORTU Ў CYRILLIC CAPITAL LETTER SHORT U */
-  { 0x06bf, 0x040f }, /*               Cyrillic_DZHE Џ CYRILLIC CAPITAL LETTER DZHE */
-  { 0x06c0, 0x044e }, /*                 Cyrillic_yu ю CYRILLIC SMALL LETTER YU */
-  { 0x06c1, 0x0430 }, /*                  Cyrillic_a а CYRILLIC SMALL LETTER A */
-  { 0x06c2, 0x0431 }, /*                 Cyrillic_be б CYRILLIC SMALL LETTER BE */
-  { 0x06c3, 0x0446 }, /*                Cyrillic_tse ц CYRILLIC SMALL LETTER TSE */
-  { 0x06c4, 0x0434 }, /*                 Cyrillic_de д CYRILLIC SMALL LETTER DE */
-  { 0x06c5, 0x0435 }, /*                 Cyrillic_ie е CYRILLIC SMALL LETTER IE */
-  { 0x06c6, 0x0444 }, /*                 Cyrillic_ef ф CYRILLIC SMALL LETTER EF */
-  { 0x06c7, 0x0433 }, /*                Cyrillic_ghe г CYRILLIC SMALL LETTER GHE */
-  { 0x06c8, 0x0445 }, /*                 Cyrillic_ha х CYRILLIC SMALL LETTER HA */
-  { 0x06c9, 0x0438 }, /*                  Cyrillic_i и CYRILLIC SMALL LETTER I */
-  { 0x06ca, 0x0439 }, /*             Cyrillic_shorti й CYRILLIC SMALL LETTER SHORT I */
-  { 0x06cb, 0x043a }, /*                 Cyrillic_ka к CYRILLIC SMALL LETTER KA */
-  { 0x06cc, 0x043b }, /*                 Cyrillic_el л CYRILLIC SMALL LETTER EL */
-  { 0x06cd, 0x043c }, /*                 Cyrillic_em м CYRILLIC SMALL LETTER EM */
-  { 0x06ce, 0x043d }, /*                 Cyrillic_en н CYRILLIC SMALL LETTER EN */
-  { 0x06cf, 0x043e }, /*                  Cyrillic_o о CYRILLIC SMALL LETTER O */
-  { 0x06d0, 0x043f }, /*                 Cyrillic_pe п CYRILLIC SMALL LETTER PE */
-  { 0x06d1, 0x044f }, /*                 Cyrillic_ya я CYRILLIC SMALL LETTER YA */
-  { 0x06d2, 0x0440 }, /*                 Cyrillic_er р CYRILLIC SMALL LETTER ER */
-  { 0x06d3, 0x0441 }, /*                 Cyrillic_es с CYRILLIC SMALL LETTER ES */
-  { 0x06d4, 0x0442 }, /*                 Cyrillic_te т CYRILLIC SMALL LETTER TE */
-  { 0x06d5, 0x0443 }, /*                  Cyrillic_u у CYRILLIC SMALL LETTER U */
-  { 0x06d6, 0x0436 }, /*                Cyrillic_zhe ж CYRILLIC SMALL LETTER ZHE */
-  { 0x06d7, 0x0432 }, /*                 Cyrillic_ve в CYRILLIC SMALL LETTER VE */
-  { 0x06d8, 0x044c }, /*           Cyrillic_softsign ь CYRILLIC SMALL LETTER SOFT SIGN */
-  { 0x06d9, 0x044b }, /*               Cyrillic_yeru ы CYRILLIC SMALL LETTER YERU */
-  { 0x06da, 0x0437 }, /*                 Cyrillic_ze з CYRILLIC SMALL LETTER ZE */
-  { 0x06db, 0x0448 }, /*                Cyrillic_sha ш CYRILLIC SMALL LETTER SHA */
-  { 0x06dc, 0x044d }, /*                  Cyrillic_e э CYRILLIC SMALL LETTER E */
-  { 0x06dd, 0x0449 }, /*              Cyrillic_shcha щ CYRILLIC SMALL LETTER SHCHA */
-  { 0x06de, 0x0447 }, /*                Cyrillic_che ч CYRILLIC SMALL LETTER CHE */
-  { 0x06df, 0x044a }, /*           Cyrillic_hardsign ъ CYRILLIC SMALL LETTER HARD SIGN */
-  { 0x06e0, 0x042e }, /*                 Cyrillic_YU Ю CYRILLIC CAPITAL LETTER YU */
-  { 0x06e1, 0x0410 }, /*                  Cyrillic_A А CYRILLIC CAPITAL LETTER A */
-  { 0x06e2, 0x0411 }, /*                 Cyrillic_BE Б CYRILLIC CAPITAL LETTER BE */
-  { 0x06e3, 0x0426 }, /*                Cyrillic_TSE Ц CYRILLIC CAPITAL LETTER TSE */
-  { 0x06e4, 0x0414 }, /*                 Cyrillic_DE Д CYRILLIC CAPITAL LETTER DE */
-  { 0x06e5, 0x0415 }, /*                 Cyrillic_IE Е CYRILLIC CAPITAL LETTER IE */
-  { 0x06e6, 0x0424 }, /*                 Cyrillic_EF Ф CYRILLIC CAPITAL LETTER EF */
-  { 0x06e7, 0x0413 }, /*                Cyrillic_GHE Г CYRILLIC CAPITAL LETTER GHE */
-  { 0x06e8, 0x0425 }, /*                 Cyrillic_HA Х CYRILLIC CAPITAL LETTER HA */
-  { 0x06e9, 0x0418 }, /*                  Cyrillic_I И CYRILLIC CAPITAL LETTER I */
-  { 0x06ea, 0x0419 }, /*             Cyrillic_SHORTI Й CYRILLIC CAPITAL LETTER SHORT I */
-  { 0x06eb, 0x041a }, /*                 Cyrillic_KA К CYRILLIC CAPITAL LETTER KA */
-  { 0x06ec, 0x041b }, /*                 Cyrillic_EL Л CYRILLIC CAPITAL LETTER EL */
-  { 0x06ed, 0x041c }, /*                 Cyrillic_EM М CYRILLIC CAPITAL LETTER EM */
-  { 0x06ee, 0x041d }, /*                 Cyrillic_EN Н CYRILLIC CAPITAL LETTER EN */
-  { 0x06ef, 0x041e }, /*                  Cyrillic_O О CYRILLIC CAPITAL LETTER O */
-  { 0x06f0, 0x041f }, /*                 Cyrillic_PE П CYRILLIC CAPITAL LETTER PE */
-  { 0x06f1, 0x042f }, /*                 Cyrillic_YA Я CYRILLIC CAPITAL LETTER YA */
-  { 0x06f2, 0x0420 }, /*                 Cyrillic_ER Р CYRILLIC CAPITAL LETTER ER */
-  { 0x06f3, 0x0421 }, /*                 Cyrillic_ES С CYRILLIC CAPITAL LETTER ES */
-  { 0x06f4, 0x0422 }, /*                 Cyrillic_TE Т CYRILLIC CAPITAL LETTER TE */
-  { 0x06f5, 0x0423 }, /*                  Cyrillic_U У CYRILLIC CAPITAL LETTER U */
-  { 0x06f6, 0x0416 }, /*                Cyrillic_ZHE Ж CYRILLIC CAPITAL LETTER ZHE */
-  { 0x06f7, 0x0412 }, /*                 Cyrillic_VE В CYRILLIC CAPITAL LETTER VE */
-  { 0x06f8, 0x042c }, /*           Cyrillic_SOFTSIGN Ь CYRILLIC CAPITAL LETTER SOFT SIGN */
-  { 0x06f9, 0x042b }, /*               Cyrillic_YERU Ы CYRILLIC CAPITAL LETTER YERU */
-  { 0x06fa, 0x0417 }, /*                 Cyrillic_ZE З CYRILLIC CAPITAL LETTER ZE */
-  { 0x06fb, 0x0428 }, /*                Cyrillic_SHA Ш CYRILLIC CAPITAL LETTER SHA */
-  { 0x06fc, 0x042d }, /*                  Cyrillic_E Э CYRILLIC CAPITAL LETTER E */
-  { 0x06fd, 0x0429 }, /*              Cyrillic_SHCHA Щ CYRILLIC CAPITAL LETTER SHCHA */
-  { 0x06fe, 0x0427 }, /*                Cyrillic_CHE Ч CYRILLIC CAPITAL LETTER CHE */
-  { 0x06ff, 0x042a }, /*           Cyrillic_HARDSIGN Ъ CYRILLIC CAPITAL LETTER HARD SIGN */
-  { 0x07a1, 0x0386 }, /*           Greek_ALPHAaccent Ά GREEK CAPITAL LETTER ALPHA WITH TONOS */
-  { 0x07a2, 0x0388 }, /*         Greek_EPSILONaccent Έ GREEK CAPITAL LETTER EPSILON WITH TONOS */
-  { 0x07a3, 0x0389 }, /*             Greek_ETAaccent Ή GREEK CAPITAL LETTER ETA WITH TONOS */
-  { 0x07a4, 0x038a }, /*            Greek_IOTAaccent Ί GREEK CAPITAL LETTER IOTA WITH TONOS */
-  { 0x07a5, 0x03aa }, /*         Greek_IOTAdiaeresis Ϊ GREEK CAPITAL LETTER IOTA WITH DIALYTIKA */
-  { 0x07a7, 0x038c }, /*         Greek_OMICRONaccent Ό GREEK CAPITAL LETTER OMICRON WITH TONOS */
-  { 0x07a8, 0x038e }, /*         Greek_UPSILONaccent Ύ GREEK CAPITAL LETTER UPSILON WITH TONOS */
-  { 0x07a9, 0x03ab }, /*       Greek_UPSILONdieresis Ϋ GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA */
-  { 0x07ab, 0x038f }, /*           Greek_OMEGAaccent Ώ GREEK CAPITAL LETTER OMEGA WITH TONOS */
-  { 0x07ae, 0x0385 }, /*        Greek_accentdieresis ΅ GREEK DIALYTIKA TONOS */
-  { 0x07af, 0x2015 }, /*              Greek_horizbar ― HORIZONTAL BAR */
-  { 0x07b1, 0x03ac }, /*           Greek_alphaaccent ά GREEK SMALL LETTER ALPHA WITH TONOS */
-  { 0x07b2, 0x03ad }, /*         Greek_epsilonaccent έ GREEK SMALL LETTER EPSILON WITH TONOS */
-  { 0x07b3, 0x03ae }, /*             Greek_etaaccent ή GREEK SMALL LETTER ETA WITH TONOS */
-  { 0x07b4, 0x03af }, /*            Greek_iotaaccent ί GREEK SMALL LETTER IOTA WITH TONOS */
-  { 0x07b5, 0x03ca }, /*          Greek_iotadieresis ϊ GREEK SMALL LETTER IOTA WITH DIALYTIKA */
-  { 0x07b6, 0x0390 }, /*    Greek_iotaaccentdieresis ΐ GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS */
-  { 0x07b7, 0x03cc }, /*         Greek_omicronaccent ό GREEK SMALL LETTER OMICRON WITH TONOS */
-  { 0x07b8, 0x03cd }, /*         Greek_upsilonaccent ύ GREEK SMALL LETTER UPSILON WITH TONOS */
-  { 0x07b9, 0x03cb }, /*       Greek_upsilondieresis ϋ GREEK SMALL LETTER UPSILON WITH DIALYTIKA */
-  { 0x07ba, 0x03b0 }, /* Greek_upsilonaccentdieresis ΰ GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS */
-  { 0x07bb, 0x03ce }, /*           Greek_omegaaccent ώ GREEK SMALL LETTER OMEGA WITH TONOS */
-  { 0x07c1, 0x0391 }, /*                 Greek_ALPHA Α GREEK CAPITAL LETTER ALPHA */
-  { 0x07c2, 0x0392 }, /*                  Greek_BETA Β GREEK CAPITAL LETTER BETA */
-  { 0x07c3, 0x0393 }, /*                 Greek_GAMMA Γ GREEK CAPITAL LETTER GAMMA */
-  { 0x07c4, 0x0394 }, /*                 Greek_DELTA Δ GREEK CAPITAL LETTER DELTA */
-  { 0x07c5, 0x0395 }, /*               Greek_EPSILON Ε GREEK CAPITAL LETTER EPSILON */
-  { 0x07c6, 0x0396 }, /*                  Greek_ZETA Ζ GREEK CAPITAL LETTER ZETA */
-  { 0x07c7, 0x0397 }, /*                   Greek_ETA Η GREEK CAPITAL LETTER ETA */
-  { 0x07c8, 0x0398 }, /*                 Greek_THETA Θ GREEK CAPITAL LETTER THETA */
-  { 0x07c9, 0x0399 }, /*                  Greek_IOTA Ι GREEK CAPITAL LETTER IOTA */
-  { 0x07ca, 0x039a }, /*                 Greek_KAPPA Κ GREEK CAPITAL LETTER KAPPA */
-  { 0x07cb, 0x039b }, /*                Greek_LAMBDA Λ GREEK CAPITAL LETTER LAMDA */
-  { 0x07cc, 0x039c }, /*                    Greek_MU Μ GREEK CAPITAL LETTER MU */
-  { 0x07cd, 0x039d }, /*                    Greek_NU Ν GREEK CAPITAL LETTER NU */
-  { 0x07ce, 0x039e }, /*                    Greek_XI Ξ GREEK CAPITAL LETTER XI */
-  { 0x07cf, 0x039f }, /*               Greek_OMICRON Ο GREEK CAPITAL LETTER OMICRON */
-  { 0x07d0, 0x03a0 }, /*                    Greek_PI Π GREEK CAPITAL LETTER PI */
-  { 0x07d1, 0x03a1 }, /*                   Greek_RHO Ρ GREEK CAPITAL LETTER RHO */
-  { 0x07d2, 0x03a3 }, /*                 Greek_SIGMA Σ GREEK CAPITAL LETTER SIGMA */
-  { 0x07d4, 0x03a4 }, /*                   Greek_TAU Τ GREEK CAPITAL LETTER TAU */
-  { 0x07d5, 0x03a5 }, /*               Greek_UPSILON Υ GREEK CAPITAL LETTER UPSILON */
-  { 0x07d6, 0x03a6 }, /*                   Greek_PHI Φ GREEK CAPITAL LETTER PHI */
-  { 0x07d7, 0x03a7 }, /*                   Greek_CHI Χ GREEK CAPITAL LETTER CHI */
-  { 0x07d8, 0x03a8 }, /*                   Greek_PSI Ψ GREEK CAPITAL LETTER PSI */
-  { 0x07d9, 0x03a9 }, /*                 Greek_OMEGA Ω GREEK CAPITAL LETTER OMEGA */
-  { 0x07e1, 0x03b1 }, /*                 Greek_alpha α GREEK SMALL LETTER ALPHA */
-  { 0x07e2, 0x03b2 }, /*                  Greek_beta β GREEK SMALL LETTER BETA */
-  { 0x07e3, 0x03b3 }, /*                 Greek_gamma γ GREEK SMALL LETTER GAMMA */
-  { 0x07e4, 0x03b4 }, /*                 Greek_delta δ GREEK SMALL LETTER DELTA */
-  { 0x07e5, 0x03b5 }, /*               Greek_epsilon ε GREEK SMALL LETTER EPSILON */
-  { 0x07e6, 0x03b6 }, /*                  Greek_zeta ζ GREEK SMALL LETTER ZETA */
-  { 0x07e7, 0x03b7 }, /*                   Greek_eta η GREEK SMALL LETTER ETA */
-  { 0x07e8, 0x03b8 }, /*                 Greek_theta θ GREEK SMALL LETTER THETA */
-  { 0x07e9, 0x03b9 }, /*                  Greek_iota ι GREEK SMALL LETTER IOTA */
-  { 0x07ea, 0x03ba }, /*                 Greek_kappa κ GREEK SMALL LETTER KAPPA */
-  { 0x07eb, 0x03bb }, /*                Greek_lambda λ GREEK SMALL LETTER LAMDA */
-  { 0x07ec, 0x03bc }, /*                    Greek_mu μ GREEK SMALL LETTER MU */
-  { 0x07ed, 0x03bd }, /*                    Greek_nu ν GREEK SMALL LETTER NU */
-  { 0x07ee, 0x03be }, /*                    Greek_xi ξ GREEK SMALL LETTER XI */
-  { 0x07ef, 0x03bf }, /*               Greek_omicron ο GREEK SMALL LETTER OMICRON */
-  { 0x07f0, 0x03c0 }, /*                    Greek_pi π GREEK SMALL LETTER PI */
-  { 0x07f1, 0x03c1 }, /*                   Greek_rho ρ GREEK SMALL LETTER RHO */
-  { 0x07f2, 0x03c3 }, /*                 Greek_sigma σ GREEK SMALL LETTER SIGMA */
-  { 0x07f3, 0x03c2 }, /*       Greek_finalsmallsigma ς GREEK SMALL LETTER FINAL SIGMA */
-  { 0x07f4, 0x03c4 }, /*                   Greek_tau τ GREEK SMALL LETTER TAU */
-  { 0x07f5, 0x03c5 }, /*               Greek_upsilon υ GREEK SMALL LETTER UPSILON */
-  { 0x07f6, 0x03c6 }, /*                   Greek_phi φ GREEK SMALL LETTER PHI */
-  { 0x07f7, 0x03c7 }, /*                   Greek_chi χ GREEK SMALL LETTER CHI */
-  { 0x07f8, 0x03c8 }, /*                   Greek_psi ψ GREEK SMALL LETTER PSI */
-  { 0x07f9, 0x03c9 }, /*                 Greek_omega ω GREEK SMALL LETTER OMEGA */
-/*  0x08a1                               leftradical ? ??? */
-/*  0x08a2                            topleftradical ? ??? */
-/*  0x08a3                            horizconnector ? ??? */
-  { 0x08a4, 0x2320 }, /*                 topintegral ⌠ TOP HALF INTEGRAL */
-  { 0x08a5, 0x2321 }, /*                 botintegral ⌡ BOTTOM HALF INTEGRAL */
-  { 0x08a6, 0x2502 }, /*               vertconnector │ BOX DRAWINGS LIGHT VERTICAL */
-/*  0x08a7                          topleftsqbracket ? ??? */
-/*  0x08a8                          botleftsqbracket ? ??? */
-/*  0x08a9                         toprightsqbracket ? ??? */
-/*  0x08aa                         botrightsqbracket ? ??? */
-/*  0x08ab                             topleftparens ? ??? */
-/*  0x08ac                             botleftparens ? ??? */
-/*  0x08ad                            toprightparens ? ??? */
-/*  0x08ae                            botrightparens ? ??? */
-/*  0x08af                      leftmiddlecurlybrace ? ??? */
-/*  0x08b0                     rightmiddlecurlybrace ? ??? */
-/*  0x08b1                          topleftsummation ? ??? */
-/*  0x08b2                          botleftsummation ? ??? */
-/*  0x08b3                 topvertsummationconnector ? ??? */
-/*  0x08b4                 botvertsummationconnector ? ??? */
-/*  0x08b5                         toprightsummation ? ??? */
-/*  0x08b6                         botrightsummation ? ??? */
-/*  0x08b7                      rightmiddlesummation ? ??? */
-  { 0x08bc, 0x2264 }, /*               lessthanequal ≤ LESS-THAN OR EQUAL TO */
-  { 0x08bd, 0x2260 }, /*                    notequal ≠ NOT EQUAL TO */
-  { 0x08be, 0x2265 }, /*            greaterthanequal ≥ GREATER-THAN OR EQUAL TO */
-  { 0x08bf, 0x222b }, /*                    integral ∫ INTEGRAL */
-  { 0x08c0, 0x2234 }, /*                   therefore ∴ THEREFORE */
-  { 0x08c1, 0x221d }, /*                   variation ∝ PROPORTIONAL TO */
-  { 0x08c2, 0x221e }, /*                    infinity ∞ INFINITY */
-  { 0x08c5, 0x2207 }, /*                       nabla ∇ NABLA */
-  { 0x08c8, 0x2245 }, /*                 approximate ≅ APPROXIMATELY EQUAL TO */
-/*  0x08c9                              similarequal ? ??? */
-  { 0x08cd, 0x21d4 }, /*                    ifonlyif ⇔ LEFT RIGHT DOUBLE ARROW */
-  { 0x08ce, 0x21d2 }, /*                     implies ⇒ RIGHTWARDS DOUBLE ARROW */
-  { 0x08cf, 0x2261 }, /*                   identical ≡ IDENTICAL TO */
-  { 0x08d6, 0x221a }, /*                     radical √ SQUARE ROOT */
-  { 0x08da, 0x2282 }, /*                  includedin ⊂ SUBSET OF */
-  { 0x08db, 0x2283 }, /*                    includes ⊃ SUPERSET OF */
-  { 0x08dc, 0x2229 }, /*                intersection ∩ INTERSECTION */
-  { 0x08dd, 0x222a }, /*                       union ∪ UNION */
-  { 0x08de, 0x2227 }, /*                  logicaland ∧ LOGICAL AND */
-  { 0x08df, 0x2228 }, /*                   logicalor ∨ LOGICAL OR */
-  { 0x08ef, 0x2202 }, /*           partialderivative ∂ PARTIAL DIFFERENTIAL */
-  { 0x08f6, 0x0192 }, /*                    function ƒ LATIN SMALL LETTER F WITH HOOK */
-  { 0x08fb, 0x2190 }, /*                   leftarrow ← LEFTWARDS ARROW */
-  { 0x08fc, 0x2191 }, /*                     uparrow ↑ UPWARDS ARROW */
-  { 0x08fd, 0x2192 }, /*                  rightarrow → RIGHTWARDS ARROW */
-  { 0x08fe, 0x2193 }, /*                   downarrow ↓ DOWNWARDS ARROW */
-  { 0x09df, 0x2422 }, /*                       blank ␢ BLANK SYMBOL */
-  { 0x09e0, 0x25c6 }, /*                soliddiamond ◆ BLACK DIAMOND */
-  { 0x09e1, 0x2592 }, /*                checkerboard ▒ MEDIUM SHADE */
-  { 0x09e2, 0x2409 }, /*                          ht ␉ SYMBOL FOR HORIZONTAL TABULATION */
-  { 0x09e3, 0x240c }, /*                          ff ␌ SYMBOL FOR FORM FEED */
-  { 0x09e4, 0x240d }, /*                          cr ␍ SYMBOL FOR CARRIAGE RETURN */
-  { 0x09e5, 0x240a }, /*                          lf ␊ SYMBOL FOR LINE FEED */
-  { 0x09e8, 0x2424 }, /*                          nl ␤ SYMBOL FOR NEWLINE */
-  { 0x09e9, 0x240b }, /*                          vt ␋ SYMBOL FOR VERTICAL TABULATION */
-  { 0x09ea, 0x2518 }, /*              lowrightcorner ┘ BOX DRAWINGS LIGHT UP AND LEFT */
-  { 0x09eb, 0x2510 }, /*               uprightcorner ┐ BOX DRAWINGS LIGHT DOWN AND LEFT */
-  { 0x09ec, 0x250c }, /*                upleftcorner ┌ BOX DRAWINGS LIGHT DOWN AND RIGHT */
-  { 0x09ed, 0x2514 }, /*               lowleftcorner └ BOX DRAWINGS LIGHT UP AND RIGHT */
-  { 0x09ee, 0x253c }, /*               crossinglines ┼ BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */
-/*  0x09ef                            horizlinescan1 ? ??? */
-/*  0x09f0                            horizlinescan3 ? ??? */
-  { 0x09f1, 0x2500 }, /*              horizlinescan5 ─ BOX DRAWINGS LIGHT HORIZONTAL */
-/*  0x09f2                            horizlinescan7 ? ??? */
-/*  0x09f3                            horizlinescan9 ? ??? */
-  { 0x09f4, 0x251c }, /*                       leftt ├ BOX DRAWINGS LIGHT VERTICAL AND RIGHT */
-  { 0x09f5, 0x2524 }, /*                      rightt ┤ BOX DRAWINGS LIGHT VERTICAL AND LEFT */
-  { 0x09f6, 0x2534 }, /*                        bott ┴ BOX DRAWINGS LIGHT UP AND HORIZONTAL */
-  { 0x09f7, 0x252c }, /*                        topt ┬ BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */
-  { 0x09f8, 0x2502 }, /*                     vertbar │ BOX DRAWINGS LIGHT VERTICAL */
-  { 0x0aa1, 0x2003 }, /*                     emspace   EM SPACE */
-  { 0x0aa2, 0x2002 }, /*                     enspace   EN SPACE */
-  { 0x0aa3, 0x2004 }, /*                    em3space   THREE-PER-EM SPACE */
-  { 0x0aa4, 0x2005 }, /*                    em4space   FOUR-PER-EM SPACE */
-  { 0x0aa5, 0x2007 }, /*                  digitspace   FIGURE SPACE */
-  { 0x0aa6, 0x2008 }, /*                  punctspace   PUNCTUATION SPACE */
-  { 0x0aa7, 0x2009 }, /*                   thinspace   THIN SPACE */
-  { 0x0aa8, 0x200a }, /*                   hairspace   HAIR SPACE */
-  { 0x0aa9, 0x2014 }, /*                      emdash — EM DASH */
-  { 0x0aaa, 0x2013 }, /*                      endash – EN DASH */
-/*  0x0aac                               signifblank ? ??? */
-  { 0x0aae, 0x2026 }, /*                    ellipsis … HORIZONTAL ELLIPSIS */
-/*  0x0aaf                           doubbaselinedot ? ??? */
-  { 0x0ab0, 0x2153 }, /*                    onethird ⅓ VULGAR FRACTION ONE THIRD */
-  { 0x0ab1, 0x2154 }, /*                   twothirds ⅔ VULGAR FRACTION TWO THIRDS */
-  { 0x0ab2, 0x2155 }, /*                    onefifth ⅕ VULGAR FRACTION ONE FIFTH */
-  { 0x0ab3, 0x2156 }, /*                   twofifths ⅖ VULGAR FRACTION TWO FIFTHS */
-  { 0x0ab4, 0x2157 }, /*                 threefifths ⅗ VULGAR FRACTION THREE FIFTHS */
-  { 0x0ab5, 0x2158 }, /*                  fourfifths ⅘ VULGAR FRACTION FOUR FIFTHS */
-  { 0x0ab6, 0x2159 }, /*                    onesixth ⅙ VULGAR FRACTION ONE SIXTH */
-  { 0x0ab7, 0x215a }, /*                  fivesixths ⅚ VULGAR FRACTION FIVE SIXTHS */
-  { 0x0ab8, 0x2105 }, /*                      careof ℅ CARE OF */
-  { 0x0abb, 0x2012 }, /*                     figdash ‒ FIGURE DASH */
-  { 0x0abc, 0x2329 }, /*            leftanglebracket 〈 LEFT-POINTING ANGLE BRACKET */
-  { 0x0abd, 0x002e }, /*                decimalpoint . FULL STOP */
-  { 0x0abe, 0x232a }, /*           rightanglebracket 〉 RIGHT-POINTING ANGLE BRACKET */
-/*  0x0abf                                    marker ? ??? */
-  { 0x0ac3, 0x215b }, /*                   oneeighth ⅛ VULGAR FRACTION ONE EIGHTH */
-  { 0x0ac4, 0x215c }, /*                threeeighths ⅜ VULGAR FRACTION THREE EIGHTHS */
-  { 0x0ac5, 0x215d }, /*                 fiveeighths ⅝ VULGAR FRACTION FIVE EIGHTHS */
-  { 0x0ac6, 0x215e }, /*                seveneighths ⅞ VULGAR FRACTION SEVEN EIGHTHS */
-  { 0x0ac9, 0x2122 }, /*                   trademark ™ TRADE MARK SIGN */
-  { 0x0aca, 0x2613 }, /*               signaturemark ☓ SALTIRE */
-/*  0x0acb                         trademarkincircle ? ??? */
-  { 0x0acc, 0x25c1 }, /*            leftopentriangle ◁ WHITE LEFT-POINTING TRIANGLE */
-  { 0x0acd, 0x25b7 }, /*           rightopentriangle ▷ WHITE RIGHT-POINTING TRIANGLE */
-  { 0x0ace, 0x25cb }, /*                emopencircle ○ WHITE CIRCLE */
-  { 0x0acf, 0x25a1 }, /*             emopenrectangle □ WHITE SQUARE */
-  { 0x0ad0, 0x2018 }, /*         leftsinglequotemark ‘ LEFT SINGLE QUOTATION MARK */
-  { 0x0ad1, 0x2019 }, /*        rightsinglequotemark ’ RIGHT SINGLE QUOTATION MARK */
-  { 0x0ad2, 0x201c }, /*         leftdoublequotemark “ LEFT DOUBLE QUOTATION MARK */
-  { 0x0ad3, 0x201d }, /*        rightdoublequotemark ” RIGHT DOUBLE QUOTATION MARK */
-  { 0x0ad4, 0x211e }, /*                prescription ℞ PRESCRIPTION TAKE */
-  { 0x0ad6, 0x2032 }, /*                     minutes ′ PRIME */
-  { 0x0ad7, 0x2033 }, /*                     seconds ″ DOUBLE PRIME */
-  { 0x0ad9, 0x271d }, /*                  latincross ✝ LATIN CROSS */
-/*  0x0ada                                  hexagram ? ??? */
-  { 0x0adb, 0x25ac }, /*            filledrectbullet ▬ BLACK RECTANGLE */
-  { 0x0adc, 0x25c0 }, /*         filledlefttribullet ◀ BLACK LEFT-POINTING TRIANGLE */
-  { 0x0add, 0x25b6 }, /*        filledrighttribullet ▶ BLACK RIGHT-POINTING TRIANGLE */
-  { 0x0ade, 0x25cf }, /*              emfilledcircle ● BLACK CIRCLE */
-  { 0x0adf, 0x25a0 }, /*                emfilledrect ■ BLACK SQUARE */
-  { 0x0ae0, 0x25e6 }, /*            enopencircbullet ◦ WHITE BULLET */
-  { 0x0ae1, 0x25ab }, /*          enopensquarebullet ▫ WHITE SMALL SQUARE */
-  { 0x0ae2, 0x25ad }, /*              openrectbullet ▭ WHITE RECTANGLE */
-  { 0x0ae3, 0x25b3 }, /*             opentribulletup △ WHITE UP-POINTING TRIANGLE */
-  { 0x0ae4, 0x25bd }, /*           opentribulletdown ▽ WHITE DOWN-POINTING TRIANGLE */
-  { 0x0ae5, 0x2606 }, /*                    openstar ☆ WHITE STAR */
-  { 0x0ae6, 0x2022 }, /*          enfilledcircbullet • BULLET */
-  { 0x0ae7, 0x25aa }, /*            enfilledsqbullet ▪ BLACK SMALL SQUARE */
-  { 0x0ae8, 0x25b2 }, /*           filledtribulletup ▲ BLACK UP-POINTING TRIANGLE */
-  { 0x0ae9, 0x25bc }, /*         filledtribulletdown ▼ BLACK DOWN-POINTING TRIANGLE */
-  { 0x0aea, 0x261c }, /*                 leftpointer ☜ WHITE LEFT POINTING INDEX */
-  { 0x0aeb, 0x261e }, /*                rightpointer ☞ WHITE RIGHT POINTING INDEX */
-  { 0x0aec, 0x2663 }, /*                        club ♣ BLACK CLUB SUIT */
-  { 0x0aed, 0x2666 }, /*                     diamond ♦ BLACK DIAMOND SUIT */
-  { 0x0aee, 0x2665 }, /*                       heart ♥ BLACK HEART SUIT */
-  { 0x0af0, 0x2720 }, /*                maltesecross ✠ MALTESE CROSS */
-  { 0x0af1, 0x2020 }, /*                      dagger † DAGGER */
-  { 0x0af2, 0x2021 }, /*                doubledagger ‡ DOUBLE DAGGER */
-  { 0x0af3, 0x2713 }, /*                   checkmark ✓ CHECK MARK */
-  { 0x0af4, 0x2717 }, /*                 ballotcross ✗ BALLOT X */
-  { 0x0af5, 0x266f }, /*                musicalsharp ♯ MUSIC SHARP SIGN */
-  { 0x0af6, 0x266d }, /*                 musicalflat ♭ MUSIC FLAT SIGN */
-  { 0x0af7, 0x2642 }, /*                  malesymbol ♂ MALE SIGN */
-  { 0x0af8, 0x2640 }, /*                femalesymbol ♀ FEMALE SIGN */
-  { 0x0af9, 0x260e }, /*                   telephone ☎ BLACK TELEPHONE */
-  { 0x0afa, 0x2315 }, /*           telephonerecorder ⌕ TELEPHONE RECORDER */
-  { 0x0afb, 0x2117 }, /*         phonographcopyright ℗ SOUND RECORDING COPYRIGHT */
-  { 0x0afc, 0x2038 }, /*                       caret ‸ CARET */
-  { 0x0afd, 0x201a }, /*          singlelowquotemark ‚ SINGLE LOW-9 QUOTATION MARK */
-  { 0x0afe, 0x201e }, /*          doublelowquotemark „ DOUBLE LOW-9 QUOTATION MARK */
-/*  0x0aff                                    cursor ? ??? */
-  { 0x0ba3, 0x003c }, /*                   leftcaret < LESS-THAN SIGN */
-  { 0x0ba6, 0x003e }, /*                  rightcaret > GREATER-THAN SIGN */
-  { 0x0ba8, 0x2228 }, /*                   downcaret ∨ LOGICAL OR */
-  { 0x0ba9, 0x2227 }, /*                     upcaret ∧ LOGICAL AND */
-  { 0x0bc0, 0x00af }, /*                     overbar ¯ MACRON */
-  { 0x0bc2, 0x22a4 }, /*                    downtack ⊤ DOWN TACK */
-  { 0x0bc3, 0x2229 }, /*                      upshoe ∩ INTERSECTION */
-  { 0x0bc4, 0x230a }, /*                   downstile ⌊ LEFT FLOOR */
-  { 0x0bc6, 0x005f }, /*                    underbar _ LOW LINE */
-  { 0x0bca, 0x2218 }, /*                         jot ∘ RING OPERATOR */
-  { 0x0bcc, 0x2395 }, /*                        quad ⎕ APL FUNCTIONAL SYMBOL QUAD (Unicode 3.0) */
-  { 0x0bce, 0x22a5 }, /*                      uptack ⊥ UP TACK */
-  { 0x0bcf, 0x25cb }, /*                      circle ○ WHITE CIRCLE */
-  { 0x0bd3, 0x2308 }, /*                     upstile ⌈ LEFT CEILING */
-  { 0x0bd6, 0x222a }, /*                    downshoe ∪ UNION */
-  { 0x0bd8, 0x2283 }, /*                   rightshoe ⊃ SUPERSET OF */
-  { 0x0bda, 0x2282 }, /*                    leftshoe ⊂ SUBSET OF */
-  { 0x0bdc, 0x22a3 }, /*                    lefttack ⊣ LEFT TACK */
-  { 0x0bfc, 0x22a2 }, /*                   righttack ⊢ RIGHT TACK */
-  { 0x0cdf, 0x2017 }, /*        hebrew_doublelowline ‗ DOUBLE LOW LINE */
-  { 0x0ce0, 0x05d0 }, /*                hebrew_aleph א HEBREW LETTER ALEF */
-  { 0x0ce1, 0x05d1 }, /*                  hebrew_bet ב HEBREW LETTER BET */
-  { 0x0ce2, 0x05d2 }, /*                hebrew_gimel ג HEBREW LETTER GIMEL */
-  { 0x0ce3, 0x05d3 }, /*                hebrew_dalet ד HEBREW LETTER DALET */
-  { 0x0ce4, 0x05d4 }, /*                   hebrew_he ה HEBREW LETTER HE */
-  { 0x0ce5, 0x05d5 }, /*                  hebrew_waw ו HEBREW LETTER VAV */
-  { 0x0ce6, 0x05d6 }, /*                 hebrew_zain ז HEBREW LETTER ZAYIN */
-  { 0x0ce7, 0x05d7 }, /*                 hebrew_chet ח HEBREW LETTER HET */
-  { 0x0ce8, 0x05d8 }, /*                  hebrew_tet ט HEBREW LETTER TET */
-  { 0x0ce9, 0x05d9 }, /*                  hebrew_yod י HEBREW LETTER YOD */
-  { 0x0cea, 0x05da }, /*            hebrew_finalkaph ך HEBREW LETTER FINAL KAF */
-  { 0x0ceb, 0x05db }, /*                 hebrew_kaph כ HEBREW LETTER KAF */
-  { 0x0cec, 0x05dc }, /*                hebrew_lamed ל HEBREW LETTER LAMED */
-  { 0x0ced, 0x05dd }, /*             hebrew_finalmem ם HEBREW LETTER FINAL MEM */
-  { 0x0cee, 0x05de }, /*                  hebrew_mem מ HEBREW LETTER MEM */
-  { 0x0cef, 0x05df }, /*             hebrew_finalnun ן HEBREW LETTER FINAL NUN */
-  { 0x0cf0, 0x05e0 }, /*                  hebrew_nun נ HEBREW LETTER NUN */
-  { 0x0cf1, 0x05e1 }, /*               hebrew_samech ס HEBREW LETTER SAMEKH */
-  { 0x0cf2, 0x05e2 }, /*                 hebrew_ayin ע HEBREW LETTER AYIN */
-  { 0x0cf3, 0x05e3 }, /*              hebrew_finalpe ף HEBREW LETTER FINAL PE */
-  { 0x0cf4, 0x05e4 }, /*                   hebrew_pe פ HEBREW LETTER PE */
-  { 0x0cf5, 0x05e5 }, /*            hebrew_finalzade ץ HEBREW LETTER FINAL TSADI */
-  { 0x0cf6, 0x05e6 }, /*                 hebrew_zade צ HEBREW LETTER TSADI */
-  { 0x0cf7, 0x05e7 }, /*                 hebrew_qoph ק HEBREW LETTER QOF */
-  { 0x0cf8, 0x05e8 }, /*                 hebrew_resh ר HEBREW LETTER RESH */
-  { 0x0cf9, 0x05e9 }, /*                 hebrew_shin ש HEBREW LETTER SHIN */
-  { 0x0cfa, 0x05ea }, /*                  hebrew_taw ת HEBREW LETTER TAV */
-  { 0x0da1, 0x0e01 }, /*                  Thai_kokai ก THAI CHARACTER KO KAI */
-  { 0x0da2, 0x0e02 }, /*                Thai_khokhai ข THAI CHARACTER KHO KHAI */
-  { 0x0da3, 0x0e03 }, /*               Thai_khokhuat ฃ THAI CHARACTER KHO KHUAT */
-  { 0x0da4, 0x0e04 }, /*               Thai_khokhwai ค THAI CHARACTER KHO KHWAI */
-  { 0x0da5, 0x0e05 }, /*                Thai_khokhon ฅ THAI CHARACTER KHO KHON */
-  { 0x0da6, 0x0e06 }, /*             Thai_khorakhang ฆ THAI CHARACTER KHO RAKHANG */
-  { 0x0da7, 0x0e07 }, /*                 Thai_ngongu ง THAI CHARACTER NGO NGU */
-  { 0x0da8, 0x0e08 }, /*                Thai_chochan จ THAI CHARACTER CHO CHAN */
-  { 0x0da9, 0x0e09 }, /*               Thai_choching ฉ THAI CHARACTER CHO CHING */
-  { 0x0daa, 0x0e0a }, /*               Thai_chochang ช THAI CHARACTER CHO CHANG */
-  { 0x0dab, 0x0e0b }, /*                   Thai_soso ซ THAI CHARACTER SO SO */
-  { 0x0dac, 0x0e0c }, /*                Thai_chochoe ฌ THAI CHARACTER CHO CHOE */
-  { 0x0dad, 0x0e0d }, /*                 Thai_yoying ญ THAI CHARACTER YO YING */
-  { 0x0dae, 0x0e0e }, /*                Thai_dochada ฎ THAI CHARACTER DO CHADA */
-  { 0x0daf, 0x0e0f }, /*                Thai_topatak ฏ THAI CHARACTER TO PATAK */
-  { 0x0db0, 0x0e10 }, /*                Thai_thothan ฐ THAI CHARACTER THO THAN */
-  { 0x0db1, 0x0e11 }, /*          Thai_thonangmontho ฑ THAI CHARACTER THO NANGMONTHO */
-  { 0x0db2, 0x0e12 }, /*             Thai_thophuthao ฒ THAI CHARACTER THO PHUTHAO */
-  { 0x0db3, 0x0e13 }, /*                  Thai_nonen ณ THAI CHARACTER NO NEN */
-  { 0x0db4, 0x0e14 }, /*                  Thai_dodek ด THAI CHARACTER DO DEK */
-  { 0x0db5, 0x0e15 }, /*                  Thai_totao ต THAI CHARACTER TO TAO */
-  { 0x0db6, 0x0e16 }, /*               Thai_thothung ถ THAI CHARACTER THO THUNG */
-  { 0x0db7, 0x0e17 }, /*              Thai_thothahan ท THAI CHARACTER THO THAHAN */
-  { 0x0db8, 0x0e18 }, /*               Thai_thothong ธ THAI CHARACTER THO THONG */
-  { 0x0db9, 0x0e19 }, /*                   Thai_nonu น THAI CHARACTER NO NU */
-  { 0x0dba, 0x0e1a }, /*               Thai_bobaimai บ THAI CHARACTER BO BAIMAI */
-  { 0x0dbb, 0x0e1b }, /*                  Thai_popla ป THAI CHARACTER PO PLA */
-  { 0x0dbc, 0x0e1c }, /*               Thai_phophung ผ THAI CHARACTER PHO PHUNG */
-  { 0x0dbd, 0x0e1d }, /*                   Thai_fofa ฝ THAI CHARACTER FO FA */
-  { 0x0dbe, 0x0e1e }, /*                Thai_phophan พ THAI CHARACTER PHO PHAN */
-  { 0x0dbf, 0x0e1f }, /*                  Thai_fofan ฟ THAI CHARACTER FO FAN */
-  { 0x0dc0, 0x0e20 }, /*             Thai_phosamphao ภ THAI CHARACTER PHO SAMPHAO */
-  { 0x0dc1, 0x0e21 }, /*                   Thai_moma ม THAI CHARACTER MO MA */
-  { 0x0dc2, 0x0e22 }, /*                  Thai_yoyak ย THAI CHARACTER YO YAK */
-  { 0x0dc3, 0x0e23 }, /*                  Thai_rorua ร THAI CHARACTER RO RUA */
-  { 0x0dc4, 0x0e24 }, /*                     Thai_ru ฤ THAI CHARACTER RU */
-  { 0x0dc5, 0x0e25 }, /*                 Thai_loling ล THAI CHARACTER LO LING */
-  { 0x0dc6, 0x0e26 }, /*                     Thai_lu ฦ THAI CHARACTER LU */
-  { 0x0dc7, 0x0e27 }, /*                 Thai_wowaen ว THAI CHARACTER WO WAEN */
-  { 0x0dc8, 0x0e28 }, /*                 Thai_sosala ศ THAI CHARACTER SO SALA */
-  { 0x0dc9, 0x0e29 }, /*                 Thai_sorusi ษ THAI CHARACTER SO RUSI */
-  { 0x0dca, 0x0e2a }, /*                  Thai_sosua ส THAI CHARACTER SO SUA */
-  { 0x0dcb, 0x0e2b }, /*                  Thai_hohip ห THAI CHARACTER HO HIP */
-  { 0x0dcc, 0x0e2c }, /*                Thai_lochula ฬ THAI CHARACTER LO CHULA */
-  { 0x0dcd, 0x0e2d }, /*                   Thai_oang อ THAI CHARACTER O ANG */
-  { 0x0dce, 0x0e2e }, /*               Thai_honokhuk ฮ THAI CHARACTER HO NOKHUK */
-  { 0x0dcf, 0x0e2f }, /*              Thai_paiyannoi ฯ THAI CHARACTER PAIYANNOI */
-  { 0x0dd0, 0x0e30 }, /*                  Thai_saraa ะ THAI CHARACTER SARA A */
-  { 0x0dd1, 0x0e31 }, /*             Thai_maihanakat ั THAI CHARACTER MAI HAN-AKAT */
-  { 0x0dd2, 0x0e32 }, /*                 Thai_saraaa า THAI CHARACTER SARA AA */
-  { 0x0dd3, 0x0e33 }, /*                 Thai_saraam ำ THAI CHARACTER SARA AM */
-  { 0x0dd4, 0x0e34 }, /*                  Thai_sarai ิ THAI CHARACTER SARA I */
-  { 0x0dd5, 0x0e35 }, /*                 Thai_saraii ี THAI CHARACTER SARA II */
-  { 0x0dd6, 0x0e36 }, /*                 Thai_saraue ึ THAI CHARACTER SARA UE */
-  { 0x0dd7, 0x0e37 }, /*                Thai_sarauee ื THAI CHARACTER SARA UEE */
-  { 0x0dd8, 0x0e38 }, /*                  Thai_sarau ุ THAI CHARACTER SARA U */
-  { 0x0dd9, 0x0e39 }, /*                 Thai_sarauu ู THAI CHARACTER SARA UU */
-  { 0x0dda, 0x0e3a }, /*                Thai_phinthu ฺ THAI CHARACTER PHINTHU */
-  { 0x0dde, 0x0e3e }, /*      Thai_maihanakat_maitho ฾ ??? */
-  { 0x0ddf, 0x0e3f }, /*                   Thai_baht ฿ THAI CURRENCY SYMBOL BAHT */
-  { 0x0de0, 0x0e40 }, /*                  Thai_sarae เ THAI CHARACTER SARA E */
-  { 0x0de1, 0x0e41 }, /*                 Thai_saraae แ THAI CHARACTER SARA AE */
-  { 0x0de2, 0x0e42 }, /*                  Thai_sarao โ THAI CHARACTER SARA O */
-  { 0x0de3, 0x0e43 }, /*          Thai_saraaimaimuan ใ THAI CHARACTER SARA AI MAIMUAN */
-  { 0x0de4, 0x0e44 }, /*         Thai_saraaimaimalai ไ THAI CHARACTER SARA AI MAIMALAI */
-  { 0x0de5, 0x0e45 }, /*            Thai_lakkhangyao ๅ THAI CHARACTER LAKKHANGYAO */
-  { 0x0de6, 0x0e46 }, /*               Thai_maiyamok ๆ THAI CHARACTER MAIYAMOK */
-  { 0x0de7, 0x0e47 }, /*              Thai_maitaikhu ็ THAI CHARACTER MAITAIKHU */
-  { 0x0de8, 0x0e48 }, /*                  Thai_maiek ่ THAI CHARACTER MAI EK */
-  { 0x0de9, 0x0e49 }, /*                 Thai_maitho ้ THAI CHARACTER MAI THO */
-  { 0x0dea, 0x0e4a }, /*                 Thai_maitri ๊ THAI CHARACTER MAI TRI */
-  { 0x0deb, 0x0e4b }, /*            Thai_maichattawa ๋ THAI CHARACTER MAI CHATTAWA */
-  { 0x0dec, 0x0e4c }, /*            Thai_thanthakhat ์ THAI CHARACTER THANTHAKHAT */
-  { 0x0ded, 0x0e4d }, /*               Thai_nikhahit ํ THAI CHARACTER NIKHAHIT */
-  { 0x0df0, 0x0e50 }, /*                 Thai_leksun ๐ THAI DIGIT ZERO */
-  { 0x0df1, 0x0e51 }, /*                Thai_leknung ๑ THAI DIGIT ONE */
-  { 0x0df2, 0x0e52 }, /*                Thai_leksong ๒ THAI DIGIT TWO */
-  { 0x0df3, 0x0e53 }, /*                 Thai_leksam ๓ THAI DIGIT THREE */
-  { 0x0df4, 0x0e54 }, /*                  Thai_leksi ๔ THAI DIGIT FOUR */
-  { 0x0df5, 0x0e55 }, /*                  Thai_lekha ๕ THAI DIGIT FIVE */
-  { 0x0df6, 0x0e56 }, /*                 Thai_lekhok ๖ THAI DIGIT SIX */
-  { 0x0df7, 0x0e57 }, /*                Thai_lekchet ๗ THAI DIGIT SEVEN */
-  { 0x0df8, 0x0e58 }, /*                Thai_lekpaet ๘ THAI DIGIT EIGHT */
-  { 0x0df9, 0x0e59 }, /*                 Thai_lekkao ๙ THAI DIGIT NINE */
-  { 0x0ea1, 0x3131 }, /*               Hangul_Kiyeog ㄱ HANGUL LETTER KIYEOK */
-  { 0x0ea2, 0x3132 }, /*          Hangul_SsangKiyeog ㄲ HANGUL LETTER SSANGKIYEOK */
-  { 0x0ea3, 0x3133 }, /*           Hangul_KiyeogSios ㄳ HANGUL LETTER KIYEOK-SIOS */
-  { 0x0ea4, 0x3134 }, /*                Hangul_Nieun ㄴ HANGUL LETTER NIEUN */
-  { 0x0ea5, 0x3135 }, /*           Hangul_NieunJieuj ㄵ HANGUL LETTER NIEUN-CIEUC */
-  { 0x0ea6, 0x3136 }, /*           Hangul_NieunHieuh ㄶ HANGUL LETTER NIEUN-HIEUH */
-  { 0x0ea7, 0x3137 }, /*               Hangul_Dikeud ㄷ HANGUL LETTER TIKEUT */
-  { 0x0ea8, 0x3138 }, /*          Hangul_SsangDikeud ㄸ HANGUL LETTER SSANGTIKEUT */
-  { 0x0ea9, 0x3139 }, /*                Hangul_Rieul ㄹ HANGUL LETTER RIEUL */
-  { 0x0eaa, 0x313a }, /*          Hangul_RieulKiyeog ㄺ HANGUL LETTER RIEUL-KIYEOK */
-  { 0x0eab, 0x313b }, /*           Hangul_RieulMieum ㄻ HANGUL LETTER RIEUL-MIEUM */
-  { 0x0eac, 0x313c }, /*           Hangul_RieulPieub ㄼ HANGUL LETTER RIEUL-PIEUP */
-  { 0x0ead, 0x313d }, /*            Hangul_RieulSios ㄽ HANGUL LETTER RIEUL-SIOS */
-  { 0x0eae, 0x313e }, /*           Hangul_RieulTieut ㄾ HANGUL LETTER RIEUL-THIEUTH */
-  { 0x0eaf, 0x313f }, /*          Hangul_RieulPhieuf ㄿ HANGUL LETTER RIEUL-PHIEUPH */
-  { 0x0eb0, 0x3140 }, /*           Hangul_RieulHieuh ㅀ HANGUL LETTER RIEUL-HIEUH */
-  { 0x0eb1, 0x3141 }, /*                Hangul_Mieum ㅁ HANGUL LETTER MIEUM */
-  { 0x0eb2, 0x3142 }, /*                Hangul_Pieub ㅂ HANGUL LETTER PIEUP */
-  { 0x0eb3, 0x3143 }, /*           Hangul_SsangPieub ㅃ HANGUL LETTER SSANGPIEUP */
-  { 0x0eb4, 0x3144 }, /*            Hangul_PieubSios ㅄ HANGUL LETTER PIEUP-SIOS */
-  { 0x0eb5, 0x3145 }, /*                 Hangul_Sios ㅅ HANGUL LETTER SIOS */
-  { 0x0eb6, 0x3146 }, /*            Hangul_SsangSios ㅆ HANGUL LETTER SSANGSIOS */
-  { 0x0eb7, 0x3147 }, /*                Hangul_Ieung ㅇ HANGUL LETTER IEUNG */
-  { 0x0eb8, 0x3148 }, /*                Hangul_Jieuj ㅈ HANGUL LETTER CIEUC */
-  { 0x0eb9, 0x3149 }, /*           Hangul_SsangJieuj ㅉ HANGUL LETTER SSANGCIEUC */
-  { 0x0eba, 0x314a }, /*                Hangul_Cieuc ㅊ HANGUL LETTER CHIEUCH */
-  { 0x0ebb, 0x314b }, /*               Hangul_Khieuq ㅋ HANGUL LETTER KHIEUKH */
-  { 0x0ebc, 0x314c }, /*                Hangul_Tieut ㅌ HANGUL LETTER THIEUTH */
-  { 0x0ebd, 0x314d }, /*               Hangul_Phieuf ㅍ HANGUL LETTER PHIEUPH */
-  { 0x0ebe, 0x314e }, /*                Hangul_Hieuh ㅎ HANGUL LETTER HIEUH */
-  { 0x0ebf, 0x314f }, /*                    Hangul_A ㅏ HANGUL LETTER A */
-  { 0x0ec0, 0x3150 }, /*                   Hangul_AE ㅐ HANGUL LETTER AE */
-  { 0x0ec1, 0x3151 }, /*                   Hangul_YA ㅑ HANGUL LETTER YA */
-  { 0x0ec2, 0x3152 }, /*                  Hangul_YAE ㅒ HANGUL LETTER YAE */
-  { 0x0ec3, 0x3153 }, /*                   Hangul_EO ㅓ HANGUL LETTER EO */
-  { 0x0ec4, 0x3154 }, /*                    Hangul_E ㅔ HANGUL LETTER E */
-  { 0x0ec5, 0x3155 }, /*                  Hangul_YEO ㅕ HANGUL LETTER YEO */
-  { 0x0ec6, 0x3156 }, /*                   Hangul_YE ㅖ HANGUL LETTER YE */
-  { 0x0ec7, 0x3157 }, /*                    Hangul_O ㅗ HANGUL LETTER O */
-  { 0x0ec8, 0x3158 }, /*                   Hangul_WA ㅘ HANGUL LETTER WA */
-  { 0x0ec9, 0x3159 }, /*                  Hangul_WAE ㅙ HANGUL LETTER WAE */
-  { 0x0eca, 0x315a }, /*                   Hangul_OE ㅚ HANGUL LETTER OE */
-  { 0x0ecb, 0x315b }, /*                   Hangul_YO ㅛ HANGUL LETTER YO */
-  { 0x0ecc, 0x315c }, /*                    Hangul_U ㅜ HANGUL LETTER U */
-  { 0x0ecd, 0x315d }, /*                  Hangul_WEO ㅝ HANGUL LETTER WEO */
-  { 0x0ece, 0x315e }, /*                   Hangul_WE ㅞ HANGUL LETTER WE */
-  { 0x0ecf, 0x315f }, /*                   Hangul_WI ㅟ HANGUL LETTER WI */
-  { 0x0ed0, 0x3160 }, /*                   Hangul_YU ㅠ HANGUL LETTER YU */
-  { 0x0ed1, 0x3161 }, /*                   Hangul_EU ㅡ HANGUL LETTER EU */
-  { 0x0ed2, 0x3162 }, /*                   Hangul_YI ㅢ HANGUL LETTER YI */
-  { 0x0ed3, 0x3163 }, /*                    Hangul_I ㅣ HANGUL LETTER I */
-  { 0x0ed4, 0x11a8 }, /*             Hangul_J_Kiyeog ᆨ HANGUL JONGSEONG KIYEOK */
-  { 0x0ed5, 0x11a9 }, /*        Hangul_J_SsangKiyeog ᆩ HANGUL JONGSEONG SSANGKIYEOK */
-  { 0x0ed6, 0x11aa }, /*         Hangul_J_KiyeogSios ᆪ HANGUL JONGSEONG KIYEOK-SIOS */
-  { 0x0ed7, 0x11ab }, /*              Hangul_J_Nieun ᆫ HANGUL JONGSEONG NIEUN */
-  { 0x0ed8, 0x11ac }, /*         Hangul_J_NieunJieuj ᆬ HANGUL JONGSEONG NIEUN-CIEUC */
-  { 0x0ed9, 0x11ad }, /*         Hangul_J_NieunHieuh ᆭ HANGUL JONGSEONG NIEUN-HIEUH */
-  { 0x0eda, 0x11ae }, /*             Hangul_J_Dikeud ᆮ HANGUL JONGSEONG TIKEUT */
-  { 0x0edb, 0x11af }, /*              Hangul_J_Rieul ᆯ HANGUL JONGSEONG RIEUL */
-  { 0x0edc, 0x11b0 }, /*        Hangul_J_RieulKiyeog ᆰ HANGUL JONGSEONG RIEUL-KIYEOK */
-  { 0x0edd, 0x11b1 }, /*         Hangul_J_RieulMieum ᆱ HANGUL JONGSEONG RIEUL-MIEUM */
-  { 0x0ede, 0x11b2 }, /*         Hangul_J_RieulPieub ᆲ HANGUL JONGSEONG RIEUL-PIEUP */
-  { 0x0edf, 0x11b3 }, /*          Hangul_J_RieulSios ᆳ HANGUL JONGSEONG RIEUL-SIOS */
-  { 0x0ee0, 0x11b4 }, /*         Hangul_J_RieulTieut ᆴ HANGUL JONGSEONG RIEUL-THIEUTH */
-  { 0x0ee1, 0x11b5 }, /*        Hangul_J_RieulPhieuf ᆵ HANGUL JONGSEONG RIEUL-PHIEUPH */
-  { 0x0ee2, 0x11b6 }, /*         Hangul_J_RieulHieuh ᆶ HANGUL JONGSEONG RIEUL-HIEUH */
-  { 0x0ee3, 0x11b7 }, /*              Hangul_J_Mieum ᆷ HANGUL JONGSEONG MIEUM */
-  { 0x0ee4, 0x11b8 }, /*              Hangul_J_Pieub ᆸ HANGUL JONGSEONG PIEUP */
-  { 0x0ee5, 0x11b9 }, /*          Hangul_J_PieubSios ᆹ HANGUL JONGSEONG PIEUP-SIOS */
-  { 0x0ee6, 0x11ba }, /*               Hangul_J_Sios ᆺ HANGUL JONGSEONG SIOS */
-  { 0x0ee7, 0x11bb }, /*          Hangul_J_SsangSios ᆻ HANGUL JONGSEONG SSANGSIOS */
-  { 0x0ee8, 0x11bc }, /*              Hangul_J_Ieung ᆼ HANGUL JONGSEONG IEUNG */
-  { 0x0ee9, 0x11bd }, /*              Hangul_J_Jieuj ᆽ HANGUL JONGSEONG CIEUC */
-  { 0x0eea, 0x11be }, /*              Hangul_J_Cieuc ᆾ HANGUL JONGSEONG CHIEUCH */
-  { 0x0eeb, 0x11bf }, /*             Hangul_J_Khieuq ᆿ HANGUL JONGSEONG KHIEUKH */
-  { 0x0eec, 0x11c0 }, /*              Hangul_J_Tieut ᇀ HANGUL JONGSEONG THIEUTH */
-  { 0x0eed, 0x11c1 }, /*             Hangul_J_Phieuf ᇁ HANGUL JONGSEONG PHIEUPH */
-  { 0x0eee, 0x11c2 }, /*              Hangul_J_Hieuh ᇂ HANGUL JONGSEONG HIEUH */
-  { 0x0eef, 0x316d }, /*     Hangul_RieulYeorinHieuh ㅭ HANGUL LETTER RIEUL-YEORINHIEUH */
-  { 0x0ef0, 0x3171 }, /*    Hangul_SunkyeongeumMieum ㅱ HANGUL LETTER KAPYEOUNMIEUM */
-  { 0x0ef1, 0x3178 }, /*    Hangul_SunkyeongeumPieub ㅸ HANGUL LETTER KAPYEOUNPIEUP */
-  { 0x0ef2, 0x317f }, /*              Hangul_PanSios ㅿ HANGUL LETTER PANSIOS */
-/*  0x0ef3                  Hangul_KkogjiDalrinIeung ? ??? */
-  { 0x0ef4, 0x3184 }, /*   Hangul_SunkyeongeumPhieuf ㆄ HANGUL LETTER KAPYEOUNPHIEUPH */
-  { 0x0ef5, 0x3186 }, /*          Hangul_YeorinHieuh ㆆ HANGUL LETTER YEORINHIEUH */
-  { 0x0ef6, 0x318d }, /*                Hangul_AraeA ㆍ HANGUL LETTER ARAEA */
-  { 0x0ef7, 0x318e }, /*               Hangul_AraeAE ㆎ HANGUL LETTER ARAEAE */
-  { 0x0ef8, 0x11eb }, /*            Hangul_J_PanSios ᇫ HANGUL JONGSEONG PANSIOS */
-/*  0x0ef9                Hangul_J_KkogjiDalrinIeung ? ??? */
-  { 0x0efa, 0x11f9 }, /*        Hangul_J_YeorinHieuh ᇹ HANGUL JONGSEONG YEORINHIEUH */
-  { 0x0eff, 0x20a9 }, /*                  Korean_Won ₩ WON SIGN */
-  { 0x13bc, 0x0152 }, /*                          OE ΠLATIN CAPITAL LIGATURE OE */
-  { 0x13bd, 0x0153 }, /*                          oe œ LATIN SMALL LIGATURE OE */
-  { 0x13be, 0x0178 }, /*                  Ydiaeresis Ÿ LATIN CAPITAL LETTER Y WITH DIAERESIS */
-  { 0x20a0, 0x20a0 }, /*                     EcuSign ₠ EURO-CURRENCY SIGN */
-  { 0x20a1, 0x20a1 }, /*                   ColonSign ₡ COLON SIGN */
-  { 0x20a2, 0x20a2 }, /*                CruzeiroSign ₢ CRUZEIRO SIGN */
-  { 0x20a3, 0x20a3 }, /*                  FFrancSign ₣ FRENCH FRANC SIGN */
-  { 0x20a4, 0x20a4 }, /*                    LiraSign ₤ LIRA SIGN */
-  { 0x20a5, 0x20a5 }, /*                    MillSign ₥ MILL SIGN */
-  { 0x20a6, 0x20a6 }, /*                   NairaSign ₦ NAIRA SIGN */
-  { 0x20a7, 0x20a7 }, /*                  PesetaSign ₧ PESETA SIGN */
-  { 0x20a8, 0x20a8 }, /*                   RupeeSign ₨ RUPEE SIGN */
-  { 0x20a9, 0x20a9 }, /*                     WonSign ₩ WON SIGN */
-  { 0x20aa, 0x20aa }, /*               NewSheqelSign ₪ NEW SHEQEL SIGN */
-  { 0x20ab, 0x20ab }, /*                    DongSign ₫ DONG SIGN */
-  { 0x20ac, 0x20ac }, /*                    EuroSign € EURO SIGN */
-};
-
-/**
- * gdk_keyval_to_unicode:
- * @keysym: a GDK key symbol 
- * 
- * Convert from a GDK key symbol to the corresponding ISO10646 (Unicode)
- * character.
- * 
- * Return value: the corresponding unicode character, or 0 if there
- *               is no corresponding character.
- **/
-
-guint32
-gdk_keyval_to_unicode (guint keysym)
-{
-  int min = 0;
-  int max = sizeof (gdk_keysym_to_unicode_tab) / sizeof (gdk_keysym_to_unicode_tab[0]) - 1;
-  int mid;
-
-  /* First check for Latin-1 characters (1:1 mapping) */
-  if ((keysym >= 0x0020 && keysym <= 0x007e) ||
-      (keysym >= 0x00a0 && keysym <= 0x00ff))
-    return keysym;
-
-  /* Also check for directly encoded 24-bit UCS characters:
-   */
-  if ((keysym & 0xff000000) == 0x01000000)
-    return keysym & 0x00ffffff;
-
-  /* binary search in table */
-  while (max >= min) {
-    mid = (min + max) / 2;
-    if (gdk_keysym_to_unicode_tab[mid].keysym < keysym)
-      min = mid + 1;
-    else if (gdk_keysym_to_unicode_tab[mid].keysym > keysym)
-      max = mid - 1;
-    else {
-      /* found it */
-      return gdk_keysym_to_unicode_tab[mid].ucs;
-    }
-  }
-  
-  /* No matching Unicode value found */
-  return 0;
-}
-
-/*
- * Canonical decomposition
- *
- * It is copied here from libunicode, because we do not want malloc
- *
- */
-
-typedef struct
-{
-  unsigned short ch;
-  unsigned char *expansion;
-} e_decomposition;
-
-static e_decomposition e_decomp_table[] =
-{
-  { 0x00c0, "\x00\x41\x03\x00\0" },
-  { 0x00c1, "\x00\x41\x03\x01\0" },
-  { 0x00c2, "\x00\x41\x03\x02\0" },
-  { 0x00c3, "\x00\x41\x03\x03\0" },
-  { 0x00c4, "\x00\x41\x03\x08\0" },
-  { 0x00c5, "\x00\x41\x03\x0a\0" },
-  { 0x00c7, "\x00\x43\x03\x27\0" },
-  { 0x00c8, "\x00\x45\x03\x00\0" },
-  { 0x00c9, "\x00\x45\x03\x01\0" },
-  { 0x00ca, "\x00\x45\x03\x02\0" },
-  { 0x00cb, "\x00\x45\x03\x08\0" },
-  { 0x00cc, "\x00\x49\x03\x00\0" },
-  { 0x00cd, "\x00\x49\x03\x01\0" },
-  { 0x00ce, "\x00\x49\x03\x02\0" },
-  { 0x00cf, "\x00\x49\x03\x08\0" },
-  { 0x00d1, "\x00\x4e\x03\x03\0" },
-  { 0x00d2, "\x00\x4f\x03\x00\0" },
-  { 0x00d3, "\x00\x4f\x03\x01\0" },
-  { 0x00d4, "\x00\x4f\x03\x02\0" },
-  { 0x00d5, "\x00\x4f\x03\x03\0" },
-  { 0x00d6, "\x00\x4f\x03\x08\0" },
-  { 0x00d9, "\x00\x55\x03\x00\0" },
-  { 0x00da, "\x00\x55\x03\x01\0" },
-  { 0x00db, "\x00\x55\x03\x02\0" },
-  { 0x00dc, "\x00\x55\x03\x08\0" },
-  { 0x00dd, "\x00\x59\x03\x01\0" },
-  { 0x00e0, "\x00\x61\x03\x00\0" },
-  { 0x00e1, "\x00\x61\x03\x01\0" },
-  { 0x00e2, "\x00\x61\x03\x02\0" },
-  { 0x00e3, "\x00\x61\x03\x03\0" },
-  { 0x00e4, "\x00\x61\x03\x08\0" },
-  { 0x00e5, "\x00\x61\x03\x0a\0" },
-  { 0x00e7, "\x00\x63\x03\x27\0" },
-  { 0x00e8, "\x00\x65\x03\x00\0" },
-  { 0x00e9, "\x00\x65\x03\x01\0" },
-  { 0x00ea, "\x00\x65\x03\x02\0" },
-  { 0x00eb, "\x00\x65\x03\x08\0" },
-  { 0x00ec, "\x00\x69\x03\x00\0" },
-  { 0x00ed, "\x00\x69\x03\x01\0" },
-  { 0x00ee, "\x00\x69\x03\x02\0" },
-  { 0x00ef, "\x00\x69\x03\x08\0" },
-  { 0x00f1, "\x00\x6e\x03\x03\0" },
-  { 0x00f2, "\x00\x6f\x03\x00\0" },
-  { 0x00f3, "\x00\x6f\x03\x01\0" },
-  { 0x00f4, "\x00\x6f\x03\x02\0" },
-  { 0x00f5, "\x00\x6f\x03\x03\0" },
-  { 0x00f6, "\x00\x6f\x03\x08\0" },
-  { 0x00f9, "\x00\x75\x03\x00\0" },
-  { 0x00fa, "\x00\x75\x03\x01\0" },
-  { 0x00fb, "\x00\x75\x03\x02\0" },
-  { 0x00fc, "\x00\x75\x03\x08\0" },
-  { 0x00fd, "\x00\x79\x03\x01\0" },
-  { 0x00ff, "\x00\x79\x03\x08\0" },
-  { 0x0100, "\x00\x41\x03\x04\0" },
-  { 0x0101, "\x00\x61\x03\x04\0" },
-  { 0x0102, "\x00\x41\x03\x06\0" },
-  { 0x0103, "\x00\x61\x03\x06\0" },
-  { 0x0104, "\x00\x41\x03\x28\0" },
-  { 0x0105, "\x00\x61\x03\x28\0" },
-  { 0x0106, "\x00\x43\x03\x01\0" },
-  { 0x0107, "\x00\x63\x03\x01\0" },
-  { 0x0108, "\x00\x43\x03\x02\0" },
-  { 0x0109, "\x00\x63\x03\x02\0" },
-  { 0x010a, "\x00\x43\x03\x07\0" },
-  { 0x010b, "\x00\x63\x03\x07\0" },
-  { 0x010c, "\x00\x43\x03\x0c\0" },
-  { 0x010d, "\x00\x63\x03\x0c\0" },
-  { 0x010e, "\x00\x44\x03\x0c\0" },
-  { 0x010f, "\x00\x64\x03\x0c\0" },
-  { 0x0112, "\x00\x45\x03\x04\0" },
-  { 0x0113, "\x00\x65\x03\x04\0" },
-  { 0x0114, "\x00\x45\x03\x06\0" },
-  { 0x0115, "\x00\x65\x03\x06\0" },
-  { 0x0116, "\x00\x45\x03\x07\0" },
-  { 0x0117, "\x00\x65\x03\x07\0" },
-  { 0x0118, "\x00\x45\x03\x28\0" },
-  { 0x0119, "\x00\x65\x03\x28\0" },
-  { 0x011a, "\x00\x45\x03\x0c\0" },
-  { 0x011b, "\x00\x65\x03\x0c\0" },
-  { 0x011c, "\x00\x47\x03\x02\0" },
-  { 0x011d, "\x00\x67\x03\x02\0" },
-  { 0x011e, "\x00\x47\x03\x06\0" },
-  { 0x011f, "\x00\x67\x03\x06\0" },
-  { 0x0120, "\x00\x47\x03\x07\0" },
-  { 0x0121, "\x00\x67\x03\x07\0" },
-  { 0x0122, "\x00\x47\x03\x27\0" },
-  { 0x0123, "\x00\x67\x03\x27\0" },
-  { 0x0124, "\x00\x48\x03\x02\0" },
-  { 0x0125, "\x00\x68\x03\x02\0" },
-  { 0x0128, "\x00\x49\x03\x03\0" },
-  { 0x0129, "\x00\x69\x03\x03\0" },
-  { 0x012a, "\x00\x49\x03\x04\0" },
-  { 0x012b, "\x00\x69\x03\x04\0" },
-  { 0x012c, "\x00\x49\x03\x06\0" },
-  { 0x012d, "\x00\x69\x03\x06\0" },
-  { 0x012e, "\x00\x49\x03\x28\0" },
-  { 0x012f, "\x00\x69\x03\x28\0" },
-  { 0x0130, "\x00\x49\x03\x07\0" },
-  { 0x0134, "\x00\x4a\x03\x02\0" },
-  { 0x0135, "\x00\x6a\x03\x02\0" },
-  { 0x0136, "\x00\x4b\x03\x27\0" },
-  { 0x0137, "\x00\x6b\x03\x27\0" },
-  { 0x0139, "\x00\x4c\x03\x01\0" },
-  { 0x013a, "\x00\x6c\x03\x01\0" },
-  { 0x013b, "\x00\x4c\x03\x27\0" },
-  { 0x013c, "\x00\x6c\x03\x27\0" },
-  { 0x013d, "\x00\x4c\x03\x0c\0" },
-  { 0x013e, "\x00\x6c\x03\x0c\0" },
-  { 0x0143, "\x00\x4e\x03\x01\0" },
-  { 0x0144, "\x00\x6e\x03\x01\0" },
-  { 0x0145, "\x00\x4e\x03\x27\0" },
-  { 0x0146, "\x00\x6e\x03\x27\0" },
-  { 0x0147, "\x00\x4e\x03\x0c\0" },
-  { 0x0148, "\x00\x6e\x03\x0c\0" },
-  { 0x014c, "\x00\x4f\x03\x04\0" },
-  { 0x014d, "\x00\x6f\x03\x04\0" },
-  { 0x014e, "\x00\x4f\x03\x06\0" },
-  { 0x014f, "\x00\x6f\x03\x06\0" },
-  { 0x0150, "\x00\x4f\x03\x0b\0" },
-  { 0x0151, "\x00\x6f\x03\x0b\0" },
-  { 0x0154, "\x00\x52\x03\x01\0" },
-  { 0x0155, "\x00\x72\x03\x01\0" },
-  { 0x0156, "\x00\x52\x03\x27\0" },
-  { 0x0157, "\x00\x72\x03\x27\0" },
-  { 0x0158, "\x00\x52\x03\x0c\0" },
-  { 0x0159, "\x00\x72\x03\x0c\0" },
-  { 0x015a, "\x00\x53\x03\x01\0" },
-  { 0x015b, "\x00\x73\x03\x01\0" },
-  { 0x015c, "\x00\x53\x03\x02\0" },
-  { 0x015d, "\x00\x73\x03\x02\0" },
-  { 0x015e, "\x00\x53\x03\x27\0" },
-  { 0x015f, "\x00\x73\x03\x27\0" },
-  { 0x0160, "\x00\x53\x03\x0c\0" },
-  { 0x0161, "\x00\x73\x03\x0c\0" },
-  { 0x0162, "\x00\x54\x03\x27\0" },
-  { 0x0163, "\x00\x74\x03\x27\0" },
-  { 0x0164, "\x00\x54\x03\x0c\0" },
-  { 0x0165, "\x00\x74\x03\x0c\0" },
-  { 0x0168, "\x00\x55\x03\x03\0" },
-  { 0x0169, "\x00\x75\x03\x03\0" },
-  { 0x016a, "\x00\x55\x03\x04\0" },
-  { 0x016b, "\x00\x75\x03\x04\0" },
-  { 0x016c, "\x00\x55\x03\x06\0" },
-  { 0x016d, "\x00\x75\x03\x06\0" },
-  { 0x016e, "\x00\x55\x03\x0a\0" },
-  { 0x016f, "\x00\x75\x03\x0a\0" },
-  { 0x0170, "\x00\x55\x03\x0b\0" },
-  { 0x0171, "\x00\x75\x03\x0b\0" },
-  { 0x0172, "\x00\x55\x03\x28\0" },
-  { 0x0173, "\x00\x75\x03\x28\0" },
-  { 0x0174, "\x00\x57\x03\x02\0" },
-  { 0x0175, "\x00\x77\x03\x02\0" },
-  { 0x0176, "\x00\x59\x03\x02\0" },
-  { 0x0177, "\x00\x79\x03\x02\0" },
-  { 0x0178, "\x00\x59\x03\x08\0" },
-  { 0x0179, "\x00\x5a\x03\x01\0" },
-  { 0x017a, "\x00\x7a\x03\x01\0" },
-  { 0x017b, "\x00\x5a\x03\x07\0" },
-  { 0x017c, "\x00\x7a\x03\x07\0" },
-  { 0x017d, "\x00\x5a\x03\x0c\0" },
-  { 0x017e, "\x00\x7a\x03\x0c\0" },
-  { 0x01a0, "\x00\x4f\x03\x1b\0" },
-  { 0x01a1, "\x00\x6f\x03\x1b\0" },
-  { 0x01af, "\x00\x55\x03\x1b\0" },
-  { 0x01b0, "\x00\x75\x03\x1b\0" },
-  { 0x01cd, "\x00\x41\x03\x0c\0" },
-  { 0x01ce, "\x00\x61\x03\x0c\0" },
-  { 0x01cf, "\x00\x49\x03\x0c\0" },
-  { 0x01d0, "\x00\x69\x03\x0c\0" },
-  { 0x01d1, "\x00\x4f\x03\x0c\0" },
-  { 0x01d2, "\x00\x6f\x03\x0c\0" },
-  { 0x01d3, "\x00\x55\x03\x0c\0" },
-  { 0x01d4, "\x00\x75\x03\x0c\0" },
-  { 0x01d5, "\x00\x55\x03\x08\x03\x04\0" },
-  { 0x01d6, "\x00\x75\x03\x08\x03\x04\0" },
-  { 0x01d7, "\x00\x55\x03\x08\x03\x01\0" },
-  { 0x01d8, "\x00\x75\x03\x08\x03\x01\0" },
-  { 0x01d9, "\x00\x55\x03\x08\x03\x0c\0" },
-  { 0x01da, "\x00\x75\x03\x08\x03\x0c\0" },
-  { 0x01db, "\x00\x55\x03\x08\x03\x00\0" },
-  { 0x01dc, "\x00\x75\x03\x08\x03\x00\0" },
-  { 0x01de, "\x00\x41\x03\x08\x03\x04\0" },
-  { 0x01df, "\x00\x61\x03\x08\x03\x04\0" },
-  { 0x01e0, "\x00\x41\x03\x07\x03\x04\0" },
-  { 0x01e1, "\x00\x61\x03\x07\x03\x04\0" },
-  { 0x01e2, "\x00\xc6\x03\x04\0" },
-  { 0x01e3, "\x00\xe6\x03\x04\0" },
-  { 0x01e6, "\x00\x47\x03\x0c\0" },
-  { 0x01e7, "\x00\x67\x03\x0c\0" },
-  { 0x01e8, "\x00\x4b\x03\x0c\0" },
-  { 0x01e9, "\x00\x6b\x03\x0c\0" },
-  { 0x01ea, "\x00\x4f\x03\x28\0" },
-  { 0x01eb, "\x00\x6f\x03\x28\0" },
-  { 0x01ec, "\x00\x4f\x03\x28\x03\x04\0" },
-  { 0x01ed, "\x00\x6f\x03\x28\x03\x04\0" },
-  { 0x01ee, "\x01\xb7\x03\x0c\0" },
-  { 0x01ef, "\x02\x92\x03\x0c\0" },
-  { 0x01f0, "\x00\x6a\x03\x0c\0" },
-  { 0x01f4, "\x00\x47\x03\x01\0" },
-  { 0x01f5, "\x00\x67\x03\x01\0" },
-  { 0x01fa, "\x00\x41\x03\x0a\x03\x01\0" },
-  { 0x01fb, "\x00\x61\x03\x0a\x03\x01\0" },
-  { 0x01fc, "\x00\xc6\x03\x01\0" },
-  { 0x01fd, "\x00\xe6\x03\x01\0" },
-  { 0x01fe, "\x00\xd8\x03\x01\0" },
-  { 0x01ff, "\x00\xf8\x03\x01\0" },
-  { 0x0200, "\x00\x41\x03\x0f\0" },
-  { 0x0201, "\x00\x61\x03\x0f\0" },
-  { 0x0202, "\x00\x41\x03\x11\0" },
-  { 0x0203, "\x00\x61\x03\x11\0" },
-  { 0x0204, "\x00\x45\x03\x0f\0" },
-  { 0x0205, "\x00\x65\x03\x0f\0" },
-  { 0x0206, "\x00\x45\x03\x11\0" },
-  { 0x0207, "\x00\x65\x03\x11\0" },
-  { 0x0208, "\x00\x49\x03\x0f\0" },
-  { 0x0209, "\x00\x69\x03\x0f\0" },
-  { 0x020a, "\x00\x49\x03\x11\0" },
-  { 0x020b, "\x00\x69\x03\x11\0" },
-  { 0x020c, "\x00\x4f\x03\x0f\0" },
-  { 0x020d, "\x00\x6f\x03\x0f\0" },
-  { 0x020e, "\x00\x4f\x03\x11\0" },
-  { 0x020f, "\x00\x6f\x03\x11\0" },
-  { 0x0210, "\x00\x52\x03\x0f\0" },
-  { 0x0211, "\x00\x72\x03\x0f\0" },
-  { 0x0212, "\x00\x52\x03\x11\0" },
-  { 0x0213, "\x00\x72\x03\x11\0" },
-  { 0x0214, "\x00\x55\x03\x0f\0" },
-  { 0x0215, "\x00\x75\x03\x0f\0" },
-  { 0x0216, "\x00\x55\x03\x11\0" },
-  { 0x0217, "\x00\x75\x03\x11\0" },
-  { 0x0340, "\x03\x00\0" },
-  { 0x0341, "\x03\x01\0" },
-  { 0x0343, "\x03\x13\0" },
-  { 0x0344, "\x03\x08\x03\x01\0" },
-  { 0x0374, "\x02\xb9\0" },
-  { 0x037e, "\x00\x3b\0" },
-  { 0x0385, "\x00\xa8\x03\x01\0" },
-  { 0x0386, "\x03\x91\x03\x01\0" },
-  { 0x0387, "\x00\xb7\0" },
-  { 0x0388, "\x03\x95\x03\x01\0" },
-  { 0x0389, "\x03\x97\x03\x01\0" },
-  { 0x038a, "\x03\x99\x03\x01\0" },
-  { 0x038c, "\x03\x9f\x03\x01\0" },
-  { 0x038e, "\x03\xa5\x03\x01\0" },
-  { 0x038f, "\x03\xa9\x03\x01\0" },
-  { 0x0390, "\x03\xb9\x03\x08\x03\x01\0" },
-  { 0x03aa, "\x03\x99\x03\x08\0" },
-  { 0x03ab, "\x03\xa5\x03\x08\0" },
-  { 0x03ac, "\x03\xb1\x03\x01\0" },
-  { 0x03ad, "\x03\xb5\x03\x01\0" },
-  { 0x03ae, "\x03\xb7\x03\x01\0" },
-  { 0x03af, "\x03\xb9\x03\x01\0" },
-  { 0x03b0, "\x03\xc5\x03\x08\x03\x01\0" },
-  { 0x03ca, "\x03\xb9\x03\x08\0" },
-  { 0x03cb, "\x03\xc5\x03\x08\0" },
-  { 0x03cc, "\x03\xbf\x03\x01\0" },
-  { 0x03cd, "\x03\xc5\x03\x01\0" },
-  { 0x03ce, "\x03\xc9\x03\x01\0" },
-  { 0x03d3, "\x03\xd2\x03\x01\0" },
-  { 0x03d4, "\x03\xd2\x03\x08\0" },
-  { 0x0401, "\x04\x15\x03\x08\0" },
-  { 0x0403, "\x04\x13\x03\x01\0" },
-  { 0x0407, "\x04\x06\x03\x08\0" },
-  { 0x040c, "\x04\x1a\x03\x01\0" },
-  { 0x040e, "\x04\x23\x03\x06\0" },
-  { 0x0419, "\x04\x18\x03\x06\0" },
-  { 0x0439, "\x04\x38\x03\x06\0" },
-  { 0x0451, "\x04\x35\x03\x08\0" },
-  { 0x0453, "\x04\x33\x03\x01\0" },
-  { 0x0457, "\x04\x56\x03\x08\0" },
-  { 0x045c, "\x04\x3a\x03\x01\0" },
-  { 0x045e, "\x04\x43\x03\x06\0" },
-  { 0x0476, "\x04\x74\x03\x0f\0" },
-  { 0x0477, "\x04\x75\x03\x0f\0" },
-  { 0x04c1, "\x04\x16\x03\x06\0" },
-  { 0x04c2, "\x04\x36\x03\x06\0" },
-  { 0x04d0, "\x04\x10\x03\x06\0" },
-  { 0x04d1, "\x04\x30\x03\x06\0" },
-  { 0x04d2, "\x04\x10\x03\x08\0" },
-  { 0x04d3, "\x04\x30\x03\x08\0" },
-  { 0x04d6, "\x04\x15\x03\x06\0" },
-  { 0x04d7, "\x04\x35\x03\x06\0" },
-  { 0x04da, "\x04\xd8\x03\x08\0" },
-  { 0x04db, "\x04\xd9\x03\x08\0" },
-  { 0x04dc, "\x04\x16\x03\x08\0" },
-  { 0x04dd, "\x04\x36\x03\x08\0" },
-  { 0x04de, "\x04\x17\x03\x08\0" },
-  { 0x04df, "\x04\x37\x03\x08\0" },
-  { 0x04e2, "\x04\x18\x03\x04\0" },
-  { 0x04e3, "\x04\x38\x03\x04\0" },
-  { 0x04e4, "\x04\x18\x03\x08\0" },
-  { 0x04e5, "\x04\x38\x03\x08\0" },
-  { 0x04e6, "\x04\x1e\x03\x08\0" },
-  { 0x04e7, "\x04\x3e\x03\x08\0" },
-  { 0x04ea, "\x04\xe8\x03\x08\0" },
-  { 0x04eb, "\x04\xe9\x03\x08\0" },
-  { 0x04ee, "\x04\x23\x03\x04\0" },
-  { 0x04ef, "\x04\x43\x03\x04\0" },
-  { 0x04f0, "\x04\x23\x03\x08\0" },
-  { 0x04f1, "\x04\x43\x03\x08\0" },
-  { 0x04f2, "\x04\x23\x03\x0b\0" },
-  { 0x04f3, "\x04\x43\x03\x0b\0" },
-  { 0x04f4, "\x04\x27\x03\x08\0" },
-  { 0x04f5, "\x04\x47\x03\x08\0" },
-  { 0x04f8, "\x04\x2b\x03\x08\0" },
-  { 0x04f9, "\x04\x4b\x03\x08\0" },
-  { 0x0929, "\x09\x28\x09\x3c\0" },
-  { 0x0931, "\x09\x30\x09\x3c\0" },
-  { 0x0934, "\x09\x33\x09\x3c\0" },
-  { 0x0958, "\x09\x15\x09\x3c\0" },
-  { 0x0959, "\x09\x16\x09\x3c\0" },
-  { 0x095a, "\x09\x17\x09\x3c\0" },
-  { 0x095b, "\x09\x1c\x09\x3c\0" },
-  { 0x095c, "\x09\x21\x09\x3c\0" },
-  { 0x095d, "\x09\x22\x09\x3c\0" },
-  { 0x095e, "\x09\x2b\x09\x3c\0" },
-  { 0x095f, "\x09\x2f\x09\x3c\0" },
-  { 0x09b0, "\x09\xac\x09\xbc\0" },
-  { 0x09cb, "\x09\xc7\x09\xbe\0" },
-  { 0x09cc, "\x09\xc7\x09\xd7\0" },
-  { 0x09dc, "\x09\xa1\x09\xbc\0" },
-  { 0x09dd, "\x09\xa2\x09\xbc\0" },
-  { 0x09df, "\x09\xaf\x09\xbc\0" },
-  { 0x0a59, "\x0a\x16\x0a\x3c\0" },
-  { 0x0a5a, "\x0a\x17\x0a\x3c\0" },
-  { 0x0a5b, "\x0a\x1c\x0a\x3c\0" },
-  { 0x0a5c, "\x0a\x21\x0a\x3c\0" },
-  { 0x0a5e, "\x0a\x2b\x0a\x3c\0" },
-  { 0x0b48, "\x0b\x47\x0b\x56\0" },
-  { 0x0b4b, "\x0b\x47\x0b\x3e\0" },
-  { 0x0b4c, "\x0b\x47\x0b\x57\0" },
-  { 0x0b5c, "\x0b\x21\x0b\x3c\0" },
-  { 0x0b5d, "\x0b\x22\x0b\x3c\0" },
-  { 0x0b5f, "\x0b\x2f\x0b\x3c\0" },
-  { 0x0b94, "\x0b\x92\x0b\xd7\0" },
-  { 0x0bca, "\x0b\xc6\x0b\xbe\0" },
-  { 0x0bcb, "\x0b\xc7\x0b\xbe\0" },
-  { 0x0bcc, "\x0b\xc6\x0b\xd7\0" },
-  { 0x0c48, "\x0c\x46\x0c\x56\0" },
-  { 0x0cc0, "\x0c\xbf\x0c\xd5\0" },
-  { 0x0cc7, "\x0c\xc6\x0c\xd5\0" },
-  { 0x0cc8, "\x0c\xc6\x0c\xd6\0" },
-  { 0x0cca, "\x0c\xc6\x0c\xc2\0" },
-  { 0x0ccb, "\x0c\xc6\x0c\xc2\x0c\xd5\0" },
-  { 0x0d4a, "\x0d\x46\x0d\x3e\0" },
-  { 0x0d4b, "\x0d\x47\x0d\x3e\0" },
-  { 0x0d4c, "\x0d\x46\x0d\x57\0" },
-  { 0x0e33, "\x0e\x4d\x0e\x32\0" },
-  { 0x0eb3, "\x0e\xcd\x0e\xb2\0" },
-  { 0x0f43, "\x0f\x42\x0f\xb7\0" },
-  { 0x0f4d, "\x0f\x4c\x0f\xb7\0" },
-  { 0x0f52, "\x0f\x51\x0f\xb7\0" },
-  { 0x0f57, "\x0f\x56\x0f\xb7\0" },
-  { 0x0f5c, "\x0f\x5b\x0f\xb7\0" },
-  { 0x0f69, "\x0f\x40\x0f\xb5\0" },
-  { 0x0f73, "\x0f\x71\x0f\x72\0" },
-  { 0x0f75, "\x0f\x71\x0f\x74\0" },
-  { 0x0f76, "\x0f\xb2\x0f\x80\0" },
-  { 0x0f78, "\x0f\xb3\x0f\x80\0" },
-  { 0x0f81, "\x0f\x71\x0f\x80\0" },
-  { 0x0f93, "\x0f\x92\x0f\xb7\0" },
-  { 0x0f9d, "\x0f\x9c\x0f\xb7\0" },
-  { 0x0fa2, "\x0f\xa1\x0f\xb7\0" },
-  { 0x0fa7, "\x0f\xa6\x0f\xb7\0" },
-  { 0x0fac, "\x0f\xab\x0f\xb7\0" },
-  { 0x0fb9, "\x0f\x90\x0f\xb5\0" },
-  { 0x1e00, "\x00\x41\x03\x25\0" },
-  { 0x1e01, "\x00\x61\x03\x25\0" },
-  { 0x1e02, "\x00\x42\x03\x07\0" },
-  { 0x1e03, "\x00\x62\x03\x07\0" },
-  { 0x1e04, "\x00\x42\x03\x23\0" },
-  { 0x1e05, "\x00\x62\x03\x23\0" },
-  { 0x1e06, "\x00\x42\x03\x31\0" },
-  { 0x1e07, "\x00\x62\x03\x31\0" },
-  { 0x1e08, "\x00\x43\x03\x27\x03\x01\0" },
-  { 0x1e09, "\x00\x63\x03\x27\x03\x01\0" },
-  { 0x1e0a, "\x00\x44\x03\x07\0" },
-  { 0x1e0b, "\x00\x64\x03\x07\0" },
-  { 0x1e0c, "\x00\x44\x03\x23\0" },
-  { 0x1e0d, "\x00\x64\x03\x23\0" },
-  { 0x1e0e, "\x00\x44\x03\x31\0" },
-  { 0x1e0f, "\x00\x64\x03\x31\0" },
-  { 0x1e10, "\x00\x44\x03\x27\0" },
-  { 0x1e11, "\x00\x64\x03\x27\0" },
-  { 0x1e12, "\x00\x44\x03\x2d\0" },
-  { 0x1e13, "\x00\x64\x03\x2d\0" },
-  { 0x1e14, "\x00\x45\x03\x04\x03\x00\0" },
-  { 0x1e15, "\x00\x65\x03\x04\x03\x00\0" },
-  { 0x1e16, "\x00\x45\x03\x04\x03\x01\0" },
-  { 0x1e17, "\x00\x65\x03\x04\x03\x01\0" },
-  { 0x1e18, "\x00\x45\x03\x2d\0" },
-  { 0x1e19, "\x00\x65\x03\x2d\0" },
-  { 0x1e1a, "\x00\x45\x03\x30\0" },
-  { 0x1e1b, "\x00\x65\x03\x30\0" },
-  { 0x1e1c, "\x00\x45\x03\x27\x03\x06\0" },
-  { 0x1e1d, "\x00\x65\x03\x27\x03\x06\0" },
-  { 0x1e1e, "\x00\x46\x03\x07\0" },
-  { 0x1e1f, "\x00\x66\x03\x07\0" },
-  { 0x1e20, "\x00\x47\x03\x04\0" },
-  { 0x1e21, "\x00\x67\x03\x04\0" },
-  { 0x1e22, "\x00\x48\x03\x07\0" },
-  { 0x1e23, "\x00\x68\x03\x07\0" },
-  { 0x1e24, "\x00\x48\x03\x23\0" },
-  { 0x1e25, "\x00\x68\x03\x23\0" },
-  { 0x1e26, "\x00\x48\x03\x08\0" },
-  { 0x1e27, "\x00\x68\x03\x08\0" },
-  { 0x1e28, "\x00\x48\x03\x27\0" },
-  { 0x1e29, "\x00\x68\x03\x27\0" },
-  { 0x1e2a, "\x00\x48\x03\x2e\0" },
-  { 0x1e2b, "\x00\x68\x03\x2e\0" },
-  { 0x1e2c, "\x00\x49\x03\x30\0" },
-  { 0x1e2d, "\x00\x69\x03\x30\0" },
-  { 0x1e2e, "\x00\x49\x03\x08\x03\x01\0" },
-  { 0x1e2f, "\x00\x69\x03\x08\x03\x01\0" },
-  { 0x1e30, "\x00\x4b\x03\x01\0" },
-  { 0x1e31, "\x00\x6b\x03\x01\0" },
-  { 0x1e32, "\x00\x4b\x03\x23\0" },
-  { 0x1e33, "\x00\x6b\x03\x23\0" },
-  { 0x1e34, "\x00\x4b\x03\x31\0" },
-  { 0x1e35, "\x00\x6b\x03\x31\0" },
-  { 0x1e36, "\x00\x4c\x03\x23\0" },
-  { 0x1e37, "\x00\x6c\x03\x23\0" },
-  { 0x1e38, "\x00\x4c\x03\x23\x03\x04\0" },
-  { 0x1e39, "\x00\x6c\x03\x23\x03\x04\0" },
-  { 0x1e3a, "\x00\x4c\x03\x31\0" },
-  { 0x1e3b, "\x00\x6c\x03\x31\0" },
-  { 0x1e3c, "\x00\x4c\x03\x2d\0" },
-  { 0x1e3d, "\x00\x6c\x03\x2d\0" },
-  { 0x1e3e, "\x00\x4d\x03\x01\0" },
-  { 0x1e3f, "\x00\x6d\x03\x01\0" },
-  { 0x1e40, "\x00\x4d\x03\x07\0" },
-  { 0x1e41, "\x00\x6d\x03\x07\0" },
-  { 0x1e42, "\x00\x4d\x03\x23\0" },
-  { 0x1e43, "\x00\x6d\x03\x23\0" },
-  { 0x1e44, "\x00\x4e\x03\x07\0" },
-  { 0x1e45, "\x00\x6e\x03\x07\0" },
-  { 0x1e46, "\x00\x4e\x03\x23\0" },
-  { 0x1e47, "\x00\x6e\x03\x23\0" },
-  { 0x1e48, "\x00\x4e\x03\x31\0" },
-  { 0x1e49, "\x00\x6e\x03\x31\0" },
-  { 0x1e4a, "\x00\x4e\x03\x2d\0" },
-  { 0x1e4b, "\x00\x6e\x03\x2d\0" },
-  { 0x1e4c, "\x00\x4f\x03\x03\x03\x01\0" },
-  { 0x1e4d, "\x00\x6f\x03\x03\x03\x01\0" },
-  { 0x1e4e, "\x00\x4f\x03\x03\x03\x08\0" },
-  { 0x1e4f, "\x00\x6f\x03\x03\x03\x08\0" },
-  { 0x1e50, "\x00\x4f\x03\x04\x03\x00\0" },
-  { 0x1e51, "\x00\x6f\x03\x04\x03\x00\0" },
-  { 0x1e52, "\x00\x4f\x03\x04\x03\x01\0" },
-  { 0x1e53, "\x00\x6f\x03\x04\x03\x01\0" },
-  { 0x1e54, "\x00\x50\x03\x01\0" },
-  { 0x1e55, "\x00\x70\x03\x01\0" },
-  { 0x1e56, "\x00\x50\x03\x07\0" },
-  { 0x1e57, "\x00\x70\x03\x07\0" },
-  { 0x1e58, "\x00\x52\x03\x07\0" },
-  { 0x1e59, "\x00\x72\x03\x07\0" },
-  { 0x1e5a, "\x00\x52\x03\x23\0" },
-  { 0x1e5b, "\x00\x72\x03\x23\0" },
-  { 0x1e5c, "\x00\x52\x03\x23\x03\x04\0" },
-  { 0x1e5d, "\x00\x72\x03\x23\x03\x04\0" },
-  { 0x1e5e, "\x00\x52\x03\x31\0" },
-  { 0x1e5f, "\x00\x72\x03\x31\0" },
-  { 0x1e60, "\x00\x53\x03\x07\0" },
-  { 0x1e61, "\x00\x73\x03\x07\0" },
-  { 0x1e62, "\x00\x53\x03\x23\0" },
-  { 0x1e63, "\x00\x73\x03\x23\0" },
-  { 0x1e64, "\x00\x53\x03\x01\x03\x07\0" },
-  { 0x1e65, "\x00\x73\x03\x01\x03\x07\0" },
-  { 0x1e66, "\x00\x53\x03\x0c\x03\x07\0" },
-  { 0x1e67, "\x00\x73\x03\x0c\x03\x07\0" },
-  { 0x1e68, "\x00\x53\x03\x23\x03\x07\0" },
-  { 0x1e69, "\x00\x73\x03\x23\x03\x07\0" },
-  { 0x1e6a, "\x00\x54\x03\x07\0" },
-  { 0x1e6b, "\x00\x74\x03\x07\0" },
-  { 0x1e6c, "\x00\x54\x03\x23\0" },
-  { 0x1e6d, "\x00\x74\x03\x23\0" },
-  { 0x1e6e, "\x00\x54\x03\x31\0" },
-  { 0x1e6f, "\x00\x74\x03\x31\0" },
-  { 0x1e70, "\x00\x54\x03\x2d\0" },
-  { 0x1e71, "\x00\x74\x03\x2d\0" },
-  { 0x1e72, "\x00\x55\x03\x24\0" },
-  { 0x1e73, "\x00\x75\x03\x24\0" },
-  { 0x1e74, "\x00\x55\x03\x30\0" },
-  { 0x1e75, "\x00\x75\x03\x30\0" },
-  { 0x1e76, "\x00\x55\x03\x2d\0" },
-  { 0x1e77, "\x00\x75\x03\x2d\0" },
-  { 0x1e78, "\x00\x55\x03\x03\x03\x01\0" },
-  { 0x1e79, "\x00\x75\x03\x03\x03\x01\0" },
-  { 0x1e7a, "\x00\x55\x03\x04\x03\x08\0" },
-  { 0x1e7b, "\x00\x75\x03\x04\x03\x08\0" },
-  { 0x1e7c, "\x00\x56\x03\x03\0" },
-  { 0x1e7d, "\x00\x76\x03\x03\0" },
-  { 0x1e7e, "\x00\x56\x03\x23\0" },
-  { 0x1e7f, "\x00\x76\x03\x23\0" },
-  { 0x1e80, "\x00\x57\x03\x00\0" },
-  { 0x1e81, "\x00\x77\x03\x00\0" },
-  { 0x1e82, "\x00\x57\x03\x01\0" },
-  { 0x1e83, "\x00\x77\x03\x01\0" },
-  { 0x1e84, "\x00\x57\x03\x08\0" },
-  { 0x1e85, "\x00\x77\x03\x08\0" },
-  { 0x1e86, "\x00\x57\x03\x07\0" },
-  { 0x1e87, "\x00\x77\x03\x07\0" },
-  { 0x1e88, "\x00\x57\x03\x23\0" },
-  { 0x1e89, "\x00\x77\x03\x23\0" },
-  { 0x1e8a, "\x00\x58\x03\x07\0" },
-  { 0x1e8b, "\x00\x78\x03\x07\0" },
-  { 0x1e8c, "\x00\x58\x03\x08\0" },
-  { 0x1e8d, "\x00\x78\x03\x08\0" },
-  { 0x1e8e, "\x00\x59\x03\x07\0" },
-  { 0x1e8f, "\x00\x79\x03\x07\0" },
-  { 0x1e90, "\x00\x5a\x03\x02\0" },
-  { 0x1e91, "\x00\x7a\x03\x02\0" },
-  { 0x1e92, "\x00\x5a\x03\x23\0" },
-  { 0x1e93, "\x00\x7a\x03\x23\0" },
-  { 0x1e94, "\x00\x5a\x03\x31\0" },
-  { 0x1e95, "\x00\x7a\x03\x31\0" },
-  { 0x1e96, "\x00\x68\x03\x31\0" },
-  { 0x1e97, "\x00\x74\x03\x08\0" },
-  { 0x1e98, "\x00\x77\x03\x0a\0" },
-  { 0x1e99, "\x00\x79\x03\x0a\0" },
-  { 0x1e9b, "\x01\x7f\x03\x07\0" },
-  { 0x1ea0, "\x00\x41\x03\x23\0" },
-  { 0x1ea1, "\x00\x61\x03\x23\0" },
-  { 0x1ea2, "\x00\x41\x03\x09\0" },
-  { 0x1ea3, "\x00\x61\x03\x09\0" },
-  { 0x1ea4, "\x00\x41\x03\x02\x03\x01\0" },
-  { 0x1ea5, "\x00\x61\x03\x02\x03\x01\0" },
-  { 0x1ea6, "\x00\x41\x03\x02\x03\x00\0" },
-  { 0x1ea7, "\x00\x61\x03\x02\x03\x00\0" },
-  { 0x1ea8, "\x00\x41\x03\x02\x03\x09\0" },
-  { 0x1ea9, "\x00\x61\x03\x02\x03\x09\0" },
-  { 0x1eaa, "\x00\x41\x03\x02\x03\x03\0" },
-  { 0x1eab, "\x00\x61\x03\x02\x03\x03\0" },
-  { 0x1eac, "\x00\x41\x03\x23\x03\x02\0" },
-  { 0x1ead, "\x00\x61\x03\x23\x03\x02\0" },
-  { 0x1eae, "\x00\x41\x03\x06\x03\x01\0" },
-  { 0x1eaf, "\x00\x61\x03\x06\x03\x01\0" },
-  { 0x1eb0, "\x00\x41\x03\x06\x03\x00\0" },
-  { 0x1eb1, "\x00\x61\x03\x06\x03\x00\0" },
-  { 0x1eb2, "\x00\x41\x03\x06\x03\x09\0" },
-  { 0x1eb3, "\x00\x61\x03\x06\x03\x09\0" },
-  { 0x1eb4, "\x00\x41\x03\x06\x03\x03\0" },
-  { 0x1eb5, "\x00\x61\x03\x06\x03\x03\0" },
-  { 0x1eb6, "\x00\x41\x03\x23\x03\x06\0" },
-  { 0x1eb7, "\x00\x61\x03\x23\x03\x06\0" },
-  { 0x1eb8, "\x00\x45\x03\x23\0" },
-  { 0x1eb9, "\x00\x65\x03\x23\0" },
-  { 0x1eba, "\x00\x45\x03\x09\0" },
-  { 0x1ebb, "\x00\x65\x03\x09\0" },
-  { 0x1ebc, "\x00\x45\x03\x03\0" },
-  { 0x1ebd, "\x00\x65\x03\x03\0" },
-  { 0x1ebe, "\x00\x45\x03\x02\x03\x01\0" },
-  { 0x1ebf, "\x00\x65\x03\x02\x03\x01\0" },
-  { 0x1ec0, "\x00\x45\x03\x02\x03\x00\0" },
-  { 0x1ec1, "\x00\x65\x03\x02\x03\x00\0" },
-  { 0x1ec2, "\x00\x45\x03\x02\x03\x09\0" },
-  { 0x1ec3, "\x00\x65\x03\x02\x03\x09\0" },
-  { 0x1ec4, "\x00\x45\x03\x02\x03\x03\0" },
-  { 0x1ec5, "\x00\x65\x03\x02\x03\x03\0" },
-  { 0x1ec6, "\x00\x45\x03\x23\x03\x02\0" },
-  { 0x1ec7, "\x00\x65\x03\x23\x03\x02\0" },
-  { 0x1ec8, "\x00\x49\x03\x09\0" },
-  { 0x1ec9, "\x00\x69\x03\x09\0" },
-  { 0x1eca, "\x00\x49\x03\x23\0" },
-  { 0x1ecb, "\x00\x69\x03\x23\0" },
-  { 0x1ecc, "\x00\x4f\x03\x23\0" },
-  { 0x1ecd, "\x00\x6f\x03\x23\0" },
-  { 0x1ece, "\x00\x4f\x03\x09\0" },
-  { 0x1ecf, "\x00\x6f\x03\x09\0" },
-  { 0x1ed0, "\x00\x4f\x03\x02\x03\x01\0" },
-  { 0x1ed1, "\x00\x6f\x03\x02\x03\x01\0" },
-  { 0x1ed2, "\x00\x4f\x03\x02\x03\x00\0" },
-  { 0x1ed3, "\x00\x6f\x03\x02\x03\x00\0" },
-  { 0x1ed4, "\x00\x4f\x03\x02\x03\x09\0" },
-  { 0x1ed5, "\x00\x6f\x03\x02\x03\x09\0" },
-  { 0x1ed6, "\x00\x4f\x03\x02\x03\x03\0" },
-  { 0x1ed7, "\x00\x6f\x03\x02\x03\x03\0" },
-  { 0x1ed8, "\x00\x4f\x03\x23\x03\x02\0" },
-  { 0x1ed9, "\x00\x6f\x03\x23\x03\x02\0" },
-  { 0x1eda, "\x00\x4f\x03\x1b\x03\x01\0" },
-  { 0x1edb, "\x00\x6f\x03\x1b\x03\x01\0" },
-  { 0x1edc, "\x00\x4f\x03\x1b\x03\x00\0" },
-  { 0x1edd, "\x00\x6f\x03\x1b\x03\x00\0" },
-  { 0x1ede, "\x00\x4f\x03\x1b\x03\x09\0" },
-  { 0x1edf, "\x00\x6f\x03\x1b\x03\x09\0" },
-  { 0x1ee0, "\x00\x4f\x03\x1b\x03\x03\0" },
-  { 0x1ee1, "\x00\x6f\x03\x1b\x03\x03\0" },
-  { 0x1ee2, "\x00\x4f\x03\x1b\x03\x23\0" },
-  { 0x1ee3, "\x00\x6f\x03\x1b\x03\x23\0" },
-  { 0x1ee4, "\x00\x55\x03\x23\0" },
-  { 0x1ee5, "\x00\x75\x03\x23\0" },
-  { 0x1ee6, "\x00\x55\x03\x09\0" },
-  { 0x1ee7, "\x00\x75\x03\x09\0" },
-  { 0x1ee8, "\x00\x55\x03\x1b\x03\x01\0" },
-  { 0x1ee9, "\x00\x75\x03\x1b\x03\x01\0" },
-  { 0x1eea, "\x00\x55\x03\x1b\x03\x00\0" },
-  { 0x1eeb, "\x00\x75\x03\x1b\x03\x00\0" },
-  { 0x1eec, "\x00\x55\x03\x1b\x03\x09\0" },
-  { 0x1eed, "\x00\x75\x03\x1b\x03\x09\0" },
-  { 0x1eee, "\x00\x55\x03\x1b\x03\x03\0" },
-  { 0x1eef, "\x00\x75\x03\x1b\x03\x03\0" },
-  { 0x1ef0, "\x00\x55\x03\x1b\x03\x23\0" },
-  { 0x1ef1, "\x00\x75\x03\x1b\x03\x23\0" },
-  { 0x1ef2, "\x00\x59\x03\x00\0" },
-  { 0x1ef3, "\x00\x79\x03\x00\0" },
-  { 0x1ef4, "\x00\x59\x03\x23\0" },
-  { 0x1ef5, "\x00\x79\x03\x23\0" },
-  { 0x1ef6, "\x00\x59\x03\x09\0" },
-  { 0x1ef7, "\x00\x79\x03\x09\0" },
-  { 0x1ef8, "\x00\x59\x03\x03\0" },
-  { 0x1ef9, "\x00\x79\x03\x03\0" },
-  { 0x1f00, "\x03\xb1\x03\x13\0" },
-  { 0x1f01, "\x03\xb1\x03\x14\0" },
-  { 0x1f02, "\x03\xb1\x03\x13\x03\x00\0" },
-  { 0x1f03, "\x03\xb1\x03\x14\x03\x00\0" },
-  { 0x1f04, "\x03\xb1\x03\x13\x03\x01\0" },
-  { 0x1f05, "\x03\xb1\x03\x14\x03\x01\0" },
-  { 0x1f06, "\x03\xb1\x03\x13\x03\x42\0" },
-  { 0x1f07, "\x03\xb1\x03\x14\x03\x42\0" },
-  { 0x1f08, "\x03\x91\x03\x13\0" },
-  { 0x1f09, "\x03\x91\x03\x14\0" },
-  { 0x1f0a, "\x03\x91\x03\x13\x03\x00\0" },
-  { 0x1f0b, "\x03\x91\x03\x14\x03\x00\0" },
-  { 0x1f0c, "\x03\x91\x03\x13\x03\x01\0" },
-  { 0x1f0d, "\x03\x91\x03\x14\x03\x01\0" },
-  { 0x1f0e, "\x03\x91\x03\x13\x03\x42\0" },
-  { 0x1f0f, "\x03\x91\x03\x14\x03\x42\0" },
-  { 0x1f10, "\x03\xb5\x03\x13\0" },
-  { 0x1f11, "\x03\xb5\x03\x14\0" },
-  { 0x1f12, "\x03\xb5\x03\x13\x03\x00\0" },
-  { 0x1f13, "\x03\xb5\x03\x14\x03\x00\0" },
-  { 0x1f14, "\x03\xb5\x03\x13\x03\x01\0" },
-  { 0x1f15, "\x03\xb5\x03\x14\x03\x01\0" },
-  { 0x1f18, "\x03\x95\x03\x13\0" },
-  { 0x1f19, "\x03\x95\x03\x14\0" },
-  { 0x1f1a, "\x03\x95\x03\x13\x03\x00\0" },
-  { 0x1f1b, "\x03\x95\x03\x14\x03\x00\0" },
-  { 0x1f1c, "\x03\x95\x03\x13\x03\x01\0" },
-  { 0x1f1d, "\x03\x95\x03\x14\x03\x01\0" },
-  { 0x1f20, "\x03\xb7\x03\x13\0" },
-  { 0x1f21, "\x03\xb7\x03\x14\0" },
-  { 0x1f22, "\x03\xb7\x03\x13\x03\x00\0" },
-  { 0x1f23, "\x03\xb7\x03\x14\x03\x00\0" },
-  { 0x1f24, "\x03\xb7\x03\x13\x03\x01\0" },
-  { 0x1f25, "\x03\xb7\x03\x14\x03\x01\0" },
-  { 0x1f26, "\x03\xb7\x03\x13\x03\x42\0" },
-  { 0x1f27, "\x03\xb7\x03\x14\x03\x42\0" },
-  { 0x1f28, "\x03\x97\x03\x13\0" },
-  { 0x1f29, "\x03\x97\x03\x14\0" },
-  { 0x1f2a, "\x03\x97\x03\x13\x03\x00\0" },
-  { 0x1f2b, "\x03\x97\x03\x14\x03\x00\0" },
-  { 0x1f2c, "\x03\x97\x03\x13\x03\x01\0" },
-  { 0x1f2d, "\x03\x97\x03\x14\x03\x01\0" },
-  { 0x1f2e, "\x03\x97\x03\x13\x03\x42\0" },
-  { 0x1f2f, "\x03\x97\x03\x14\x03\x42\0" },
-  { 0x1f30, "\x03\xb9\x03\x13\0" },
-  { 0x1f31, "\x03\xb9\x03\x14\0" },
-  { 0x1f32, "\x03\xb9\x03\x13\x03\x00\0" },
-  { 0x1f33, "\x03\xb9\x03\x14\x03\x00\0" },
-  { 0x1f34, "\x03\xb9\x03\x13\x03\x01\0" },
-  { 0x1f35, "\x03\xb9\x03\x14\x03\x01\0" },
-  { 0x1f36, "\x03\xb9\x03\x13\x03\x42\0" },
-  { 0x1f37, "\x03\xb9\x03\x14\x03\x42\0" },
-  { 0x1f38, "\x03\x99\x03\x13\0" },
-  { 0x1f39, "\x03\x99\x03\x14\0" },
-  { 0x1f3a, "\x03\x99\x03\x13\x03\x00\0" },
-  { 0x1f3b, "\x03\x99\x03\x14\x03\x00\0" },
-  { 0x1f3c, "\x03\x99\x03\x13\x03\x01\0" },
-  { 0x1f3d, "\x03\x99\x03\x14\x03\x01\0" },
-  { 0x1f3e, "\x03\x99\x03\x13\x03\x42\0" },
-  { 0x1f3f, "\x03\x99\x03\x14\x03\x42\0" },
-  { 0x1f40, "\x03\xbf\x03\x13\0" },
-  { 0x1f41, "\x03\xbf\x03\x14\0" },
-  { 0x1f42, "\x03\xbf\x03\x13\x03\x00\0" },
-  { 0x1f43, "\x03\xbf\x03\x14\x03\x00\0" },
-  { 0x1f44, "\x03\xbf\x03\x13\x03\x01\0" },
-  { 0x1f45, "\x03\xbf\x03\x14\x03\x01\0" },
-  { 0x1f48, "\x03\x9f\x03\x13\0" },
-  { 0x1f49, "\x03\x9f\x03\x14\0" },
-  { 0x1f4a, "\x03\x9f\x03\x13\x03\x00\0" },
-  { 0x1f4b, "\x03\x9f\x03\x14\x03\x00\0" },
-  { 0x1f4c, "\x03\x9f\x03\x13\x03\x01\0" },
-  { 0x1f4d, "\x03\x9f\x03\x14\x03\x01\0" },
-  { 0x1f50, "\x03\xc5\x03\x13\0" },
-  { 0x1f51, "\x03\xc5\x03\x14\0" },
-  { 0x1f52, "\x03\xc5\x03\x13\x03\x00\0" },
-  { 0x1f53, "\x03\xc5\x03\x14\x03\x00\0" },
-  { 0x1f54, "\x03\xc5\x03\x13\x03\x01\0" },
-  { 0x1f55, "\x03\xc5\x03\x14\x03\x01\0" },
-  { 0x1f56, "\x03\xc5\x03\x13\x03\x42\0" },
-  { 0x1f57, "\x03\xc5\x03\x14\x03\x42\0" },
-  { 0x1f59, "\x03\xa5\x03\x14\0" },
-  { 0x1f5b, "\x03\xa5\x03\x14\x03\x00\0" },
-  { 0x1f5d, "\x03\xa5\x03\x14\x03\x01\0" },
-  { 0x1f5f, "\x03\xa5\x03\x14\x03\x42\0" },
-  { 0x1f60, "\x03\xc9\x03\x13\0" },
-  { 0x1f61, "\x03\xc9\x03\x14\0" },
-  { 0x1f62, "\x03\xc9\x03\x13\x03\x00\0" },
-  { 0x1f63, "\x03\xc9\x03\x14\x03\x00\0" },
-  { 0x1f64, "\x03\xc9\x03\x13\x03\x01\0" },
-  { 0x1f65, "\x03\xc9\x03\x14\x03\x01\0" },
-  { 0x1f66, "\x03\xc9\x03\x13\x03\x42\0" },
-  { 0x1f67, "\x03\xc9\x03\x14\x03\x42\0" },
-  { 0x1f68, "\x03\xa9\x03\x13\0" },
-  { 0x1f69, "\x03\xa9\x03\x14\0" },
-  { 0x1f6a, "\x03\xa9\x03\x13\x03\x00\0" },
-  { 0x1f6b, "\x03\xa9\x03\x14\x03\x00\0" },
-  { 0x1f6c, "\x03\xa9\x03\x13\x03\x01\0" },
-  { 0x1f6d, "\x03\xa9\x03\x14\x03\x01\0" },
-  { 0x1f6e, "\x03\xa9\x03\x13\x03\x42\0" },
-  { 0x1f6f, "\x03\xa9\x03\x14\x03\x42\0" },
-  { 0x1f70, "\x03\xb1\x03\x00\0" },
-  { 0x1f71, "\x03\xb1\x03\x01\0" },
-  { 0x1f72, "\x03\xb5\x03\x00\0" },
-  { 0x1f73, "\x03\xb5\x03\x01\0" },
-  { 0x1f74, "\x03\xb7\x03\x00\0" },
-  { 0x1f75, "\x03\xb7\x03\x01\0" },
-  { 0x1f76, "\x03\xb9\x03\x00\0" },
-  { 0x1f77, "\x03\xb9\x03\x01\0" },
-  { 0x1f78, "\x03\xbf\x03\x00\0" },
-  { 0x1f79, "\x03\xbf\x03\x01\0" },
-  { 0x1f7a, "\x03\xc5\x03\x00\0" },
-  { 0x1f7b, "\x03\xc5\x03\x01\0" },
-  { 0x1f7c, "\x03\xc9\x03\x00\0" },
-  { 0x1f7d, "\x03\xc9\x03\x01\0" },
-  { 0x1f80, "\x03\xb1\x03\x13\x03\x45\0" },
-  { 0x1f81, "\x03\xb1\x03\x14\x03\x45\0" },
-  { 0x1f82, "\x03\xb1\x03\x13\x03\x00\x03\x45\0" },
-  { 0x1f83, "\x03\xb1\x03\x14\x03\x00\x03\x45\0" },
-  { 0x1f84, "\x03\xb1\x03\x13\x03\x01\x03\x45\0" },
-  { 0x1f85, "\x03\xb1\x03\x14\x03\x01\x03\x45\0" },
-  { 0x1f86, "\x03\xb1\x03\x13\x03\x42\x03\x45\0" },
-  { 0x1f87, "\x03\xb1\x03\x14\x03\x42\x03\x45\0" },
-  { 0x1f88, "\x03\x91\x03\x13\x03\x45\0" },
-  { 0x1f89, "\x03\x91\x03\x14\x03\x45\0" },
-  { 0x1f8a, "\x03\x91\x03\x13\x03\x00\x03\x45\0" },
-  { 0x1f8b, "\x03\x91\x03\x14\x03\x00\x03\x45\0" },
-  { 0x1f8c, "\x03\x91\x03\x13\x03\x01\x03\x45\0" },
-  { 0x1f8d, "\x03\x91\x03\x14\x03\x01\x03\x45\0" },
-  { 0x1f8e, "\x03\x91\x03\x13\x03\x42\x03\x45\0" },
-  { 0x1f8f, "\x03\x91\x03\x14\x03\x42\x03\x45\0" },
-  { 0x1f90, "\x03\xb7\x03\x13\x03\x45\0" },
-  { 0x1f91, "\x03\xb7\x03\x14\x03\x45\0" },
-  { 0x1f92, "\x03\xb7\x03\x13\x03\x00\x03\x45\0" },
-  { 0x1f93, "\x03\xb7\x03\x14\x03\x00\x03\x45\0" },
-  { 0x1f94, "\x03\xb7\x03\x13\x03\x01\x03\x45\0" },
-  { 0x1f95, "\x03\xb7\x03\x14\x03\x01\x03\x45\0" },
-  { 0x1f96, "\x03\xb7\x03\x13\x03\x42\x03\x45\0" },
-  { 0x1f97, "\x03\xb7\x03\x14\x03\x42\x03\x45\0" },
-  { 0x1f98, "\x03\x97\x03\x13\x03\x45\0" },
-  { 0x1f99, "\x03\x97\x03\x14\x03\x45\0" },
-  { 0x1f9a, "\x03\x97\x03\x13\x03\x00\x03\x45\0" },
-  { 0x1f9b, "\x03\x97\x03\x14\x03\x00\x03\x45\0" },
-  { 0x1f9c, "\x03\x97\x03\x13\x03\x01\x03\x45\0" },
-  { 0x1f9d, "\x03\x97\x03\x14\x03\x01\x03\x45\0" },
-  { 0x1f9e, "\x03\x97\x03\x13\x03\x42\x03\x45\0" },
-  { 0x1f9f, "\x03\x97\x03\x14\x03\x42\x03\x45\0" },
-  { 0x1fa0, "\x03\xc9\x03\x13\x03\x45\0" },
-  { 0x1fa1, "\x03\xc9\x03\x14\x03\x45\0" },
-  { 0x1fa2, "\x03\xc9\x03\x13\x03\x00\x03\x45\0" },
-  { 0x1fa3, "\x03\xc9\x03\x14\x03\x00\x03\x45\0" },
-  { 0x1fa4, "\x03\xc9\x03\x13\x03\x01\x03\x45\0" },
-  { 0x1fa5, "\x03\xc9\x03\x14\x03\x01\x03\x45\0" },
-  { 0x1fa6, "\x03\xc9\x03\x13\x03\x42\x03\x45\0" },
-  { 0x1fa7, "\x03\xc9\x03\x14\x03\x42\x03\x45\0" },
-  { 0x1fa8, "\x03\xa9\x03\x13\x03\x45\0" },
-  { 0x1fa9, "\x03\xa9\x03\x14\x03\x45\0" },
-  { 0x1faa, "\x03\xa9\x03\x13\x03\x00\x03\x45\0" },
-  { 0x1fab, "\x03\xa9\x03\x14\x03\x00\x03\x45\0" },
-  { 0x1fac, "\x03\xa9\x03\x13\x03\x01\x03\x45\0" },
-  { 0x1fad, "\x03\xa9\x03\x14\x03\x01\x03\x45\0" },
-  { 0x1fae, "\x03\xa9\x03\x13\x03\x42\x03\x45\0" },
-  { 0x1faf, "\x03\xa9\x03\x14\x03\x42\x03\x45\0" },
-  { 0x1fb0, "\x03\xb1\x03\x06\0" },
-  { 0x1fb1, "\x03\xb1\x03\x04\0" },
-  { 0x1fb2, "\x03\xb1\x03\x00\x03\x45\0" },
-  { 0x1fb3, "\x03\xb1\x03\x45\0" },
-  { 0x1fb4, "\x03\xb1\x03\x01\x03\x45\0" },
-  { 0x1fb6, "\x03\xb1\x03\x42\0" },
-  { 0x1fb7, "\x03\xb1\x03\x42\x03\x45\0" },
-  { 0x1fb8, "\x03\x91\x03\x06\0" },
-  { 0x1fb9, "\x03\x91\x03\x04\0" },
-  { 0x1fba, "\x03\x91\x03\x00\0" },
-  { 0x1fbb, "\x03\x91\x03\x01\0" },
-  { 0x1fbc, "\x03\x91\x03\x45\0" },
-  { 0x1fbe, "\x03\xb9\0" },
-  { 0x1fc1, "\x00\xa8\x03\x42\0" },
-  { 0x1fc2, "\x03\xb7\x03\x00\x03\x45\0" },
-  { 0x1fc3, "\x03\xb7\x03\x45\0" },
-  { 0x1fc4, "\x03\xb7\x03\x01\x03\x45\0" },
-  { 0x1fc6, "\x03\xb7\x03\x42\0" },
-  { 0x1fc7, "\x03\xb7\x03\x42\x03\x45\0" },
-  { 0x1fc8, "\x03\x95\x03\x00\0" },
-  { 0x1fc9, "\x03\x95\x03\x01\0" },
-  { 0x1fca, "\x03\x97\x03\x00\0" },
-  { 0x1fcb, "\x03\x97\x03\x01\0" },
-  { 0x1fcc, "\x03\x97\x03\x45\0" },
-  { 0x1fcd, "\x1f\xbf\x03\x00\0" },
-  { 0x1fce, "\x1f\xbf\x03\x01\0" },
-  { 0x1fcf, "\x1f\xbf\x03\x42\0" },
-  { 0x1fd0, "\x03\xb9\x03\x06\0" },
-  { 0x1fd1, "\x03\xb9\x03\x04\0" },
-  { 0x1fd2, "\x03\xb9\x03\x08\x03\x00\0" },
-  { 0x1fd3, "\x03\xb9\x03\x08\x03\x01\0" },
-  { 0x1fd6, "\x03\xb9\x03\x42\0" },
-  { 0x1fd7, "\x03\xb9\x03\x08\x03\x42\0" },
-  { 0x1fd8, "\x03\x99\x03\x06\0" },
-  { 0x1fd9, "\x03\x99\x03\x04\0" },
-  { 0x1fda, "\x03\x99\x03\x00\0" },
-  { 0x1fdb, "\x03\x99\x03\x01\0" },
-  { 0x1fdd, "\x1f\xfe\x03\x00\0" },
-  { 0x1fde, "\x1f\xfe\x03\x01\0" },
-  { 0x1fdf, "\x1f\xfe\x03\x42\0" },
-  { 0x1fe0, "\x03\xc5\x03\x06\0" },
-  { 0x1fe1, "\x03\xc5\x03\x04\0" },
-  { 0x1fe2, "\x03\xc5\x03\x08\x03\x00\0" },
-  { 0x1fe3, "\x03\xc5\x03\x08\x03\x01\0" },
-  { 0x1fe4, "\x03\xc1\x03\x13\0" },
-  { 0x1fe5, "\x03\xc1\x03\x14\0" },
-  { 0x1fe6, "\x03\xc5\x03\x42\0" },
-  { 0x1fe7, "\x03\xc5\x03\x08\x03\x42\0" },
-  { 0x1fe8, "\x03\xa5\x03\x06\0" },
-  { 0x1fe9, "\x03\xa5\x03\x04\0" },
-  { 0x1fea, "\x03\xa5\x03\x00\0" },
-  { 0x1feb, "\x03\xa5\x03\x01\0" },
-  { 0x1fec, "\x03\xa1\x03\x14\0" },
-  { 0x1fed, "\x00\xa8\x03\x00\0" },
-  { 0x1fee, "\x00\xa8\x03\x01\0" },
-  { 0x1fef, "\x00\x60\0" },
-  { 0x1ff2, "\x03\xc9\x03\x00\x03\x45\0" },
-  { 0x1ff3, "\x03\xc9\x03\x45\0" },
-  { 0x1ff4, "\x03\xc9\x03\x01\x03\x45\0" },
-  { 0x1ff6, "\x03\xc9\x03\x42\0" },
-  { 0x1ff7, "\x03\xc9\x03\x42\x03\x45\0" },
-  { 0x1ff8, "\x03\x9f\x03\x00\0" },
-  { 0x1ff9, "\x03\x9f\x03\x01\0" },
-  { 0x1ffa, "\x03\xa9\x03\x00\0" },
-  { 0x1ffb, "\x03\xa9\x03\x01\0" },
-  { 0x1ffc, "\x03\xa9\x03\x45\0" },
-  { 0x1ffd, "\x00\xb4\0" },
-  { 0x2000, "\x20\x02\0" },
-  { 0x2001, "\x20\x03\0" },
-  { 0x2126, "\x03\xa9\0" },
-  { 0x212a, "\x00\x4b\0" },
-  { 0x212b, "\x00\x41\x03\x0a\0" },
-  { 0x2204, "\x22\x03\x03\x38\0" },
-  { 0x2209, "\x22\x08\x03\x38\0" },
-  { 0x220c, "\x22\x0b\x03\x38\0" },
-  { 0x2224, "\x22\x23\x03\x38\0" },
-  { 0x2226, "\x22\x25\x03\x38\0" },
-  { 0x2241, "\x00\x7e\x03\x38\0" },
-  { 0x2244, "\x22\x43\x03\x38\0" },
-  { 0x2247, "\x22\x45\x03\x38\0" },
-  { 0x2249, "\x22\x48\x03\x38\0" },
-  { 0x2260, "\x00\x3d\x03\x38\0" },
-  { 0x2262, "\x22\x61\x03\x38\0" },
-  { 0x226d, "\x22\x4d\x03\x38\0" },
-  { 0x226e, "\x00\x3c\x03\x38\0" },
-  { 0x226f, "\x00\x3e\x03\x38\0" },
-  { 0x2270, "\x22\x64\x03\x38\0" },
-  { 0x2271, "\x22\x65\x03\x38\0" },
-  { 0x2274, "\x22\x72\x03\x38\0" },
-  { 0x2275, "\x22\x73\x03\x38\0" },
-  { 0x2278, "\x22\x76\x03\x38\0" },
-  { 0x2279, "\x22\x77\x03\x38\0" },
-  { 0x2280, "\x22\x7a\x03\x38\0" },
-  { 0x2281, "\x22\x7b\x03\x38\0" },
-  { 0x2284, "\x22\x82\x03\x38\0" },
-  { 0x2285, "\x22\x83\x03\x38\0" },
-  { 0x2288, "\x22\x86\x03\x38\0" },
-  { 0x2289, "\x22\x87\x03\x38\0" },
-  { 0x22ac, "\x22\xa2\x03\x38\0" },
-  { 0x22ad, "\x22\xa8\x03\x38\0" },
-  { 0x22ae, "\x22\xa9\x03\x38\0" },
-  { 0x22af, "\x22\xab\x03\x38\0" },
-  { 0x22e0, "\x22\x7c\x03\x38\0" },
-  { 0x22e1, "\x22\x7d\x03\x38\0" },
-  { 0x22e2, "\x22\x91\x03\x38\0" },
-  { 0x22e3, "\x22\x92\x03\x38\0" },
-  { 0x22ea, "\x22\xb2\x03\x38\0" },
-  { 0x22eb, "\x22\xb3\x03\x38\0" },
-  { 0x22ec, "\x22\xb4\x03\x38\0" },
-  { 0x22ed, "\x22\xb5\x03\x38\0" },
-  { 0x2329, "\x30\x08\0" },
-  { 0x232a, "\x30\x09\0" },
-  { 0x304c, "\x30\x4b\x30\x99\0" },
-  { 0x304e, "\x30\x4d\x30\x99\0" },
-  { 0x3050, "\x30\x4f\x30\x99\0" },
-  { 0x3052, "\x30\x51\x30\x99\0" },
-  { 0x3054, "\x30\x53\x30\x99\0" },
-  { 0x3056, "\x30\x55\x30\x99\0" },
-  { 0x3058, "\x30\x57\x30\x99\0" },
-  { 0x305a, "\x30\x59\x30\x99\0" },
-  { 0x305c, "\x30\x5b\x30\x99\0" },
-  { 0x305e, "\x30\x5d\x30\x99\0" },
-  { 0x3060, "\x30\x5f\x30\x99\0" },
-  { 0x3062, "\x30\x61\x30\x99\0" },
-  { 0x3065, "\x30\x64\x30\x99\0" },
-  { 0x3067, "\x30\x66\x30\x99\0" },
-  { 0x3069, "\x30\x68\x30\x99\0" },
-  { 0x3070, "\x30\x6f\x30\x99\0" },
-  { 0x3071, "\x30\x6f\x30\x9a\0" },
-  { 0x3073, "\x30\x72\x30\x99\0" },
-  { 0x3074, "\x30\x72\x30\x9a\0" },
-  { 0x3076, "\x30\x75\x30\x99\0" },
-  { 0x3077, "\x30\x75\x30\x9a\0" },
-  { 0x3079, "\x30\x78\x30\x99\0" },
-  { 0x307a, "\x30\x78\x30\x9a\0" },
-  { 0x307c, "\x30\x7b\x30\x99\0" },
-  { 0x307d, "\x30\x7b\x30\x9a\0" },
-  { 0x3094, "\x30\x46\x30\x99\0" },
-  { 0x309e, "\x30\x9d\x30\x99\0" },
-  { 0x30ac, "\x30\xab\x30\x99\0" },
-  { 0x30ae, "\x30\xad\x30\x99\0" },
-  { 0x30b0, "\x30\xaf\x30\x99\0" },
-  { 0x30b2, "\x30\xb1\x30\x99\0" },
-  { 0x30b4, "\x30\xb3\x30\x99\0" },
-  { 0x30b6, "\x30\xb5\x30\x99\0" },
-  { 0x30b8, "\x30\xb7\x30\x99\0" },
-  { 0x30ba, "\x30\xb9\x30\x99\0" },
-  { 0x30bc, "\x30\xbb\x30\x99\0" },
-  { 0x30be, "\x30\xbd\x30\x99\0" },
-  { 0x30c0, "\x30\xbf\x30\x99\0" },
-  { 0x30c2, "\x30\xc1\x30\x99\0" },
-  { 0x30c5, "\x30\xc4\x30\x99\0" },
-  { 0x30c7, "\x30\xc6\x30\x99\0" },
-  { 0x30c9, "\x30\xc8\x30\x99\0" },
-  { 0x30d0, "\x30\xcf\x30\x99\0" },
-  { 0x30d1, "\x30\xcf\x30\x9a\0" },
-  { 0x30d3, "\x30\xd2\x30\x99\0" },
-  { 0x30d4, "\x30\xd2\x30\x9a\0" },
-  { 0x30d6, "\x30\xd5\x30\x99\0" },
-  { 0x30d7, "\x30\xd5\x30\x9a\0" },
-  { 0x30d9, "\x30\xd8\x30\x99\0" },
-  { 0x30da, "\x30\xd8\x30\x9a\0" },
-  { 0x30dc, "\x30\xdb\x30\x99\0" },
-  { 0x30dd, "\x30\xdb\x30\x9a\0" },
-  { 0x30f4, "\x30\xa6\x30\x99\0" },
-  { 0x30f7, "\x30\xef\x30\x99\0" },
-  { 0x30f8, "\x30\xf0\x30\x99\0" },
-  { 0x30f9, "\x30\xf1\x30\x99\0" },
-  { 0x30fa, "\x30\xf2\x30\x99\0" },
-  { 0x30fe, "\x30\xfd\x30\x99\0" },
-  { 0xf900, "\x8c\x48\0" },
-  { 0xf901, "\x66\xf4\0" },
-  { 0xf902, "\x8e\xca\0" },
-  { 0xf903, "\x8c\xc8\0" },
-  { 0xf904, "\x6e\xd1\0" },
-  { 0xf905, "\x4e\x32\0" },
-  { 0xf906, "\x53\xe5\0" },
-  { 0xf907, "\x9f\x9c\0" },
-  { 0xf908, "\x9f\x9c\0" },
-  { 0xf909, "\x59\x51\0" },
-  { 0xf90a, "\x91\xd1\0" },
-  { 0xf90b, "\x55\x87\0" },
-  { 0xf90c, "\x59\x48\0" },
-  { 0xf90d, "\x61\xf6\0" },
-  { 0xf90e, "\x76\x69\0" },
-  { 0xf90f, "\x7f\x85\0" },
-  { 0xf910, "\x86\x3f\0" },
-  { 0xf911, "\x87\xba\0" },
-  { 0xf912, "\x88\xf8\0" },
-  { 0xf913, "\x90\x8f\0" },
-  { 0xf914, "\x6a\x02\0" },
-  { 0xf915, "\x6d\x1b\0" },
-  { 0xf916, "\x70\xd9\0" },
-  { 0xf917, "\x73\xde\0" },
-  { 0xf918, "\x84\x3d\0" },
-  { 0xf919, "\x91\x6a\0" },
-  { 0xf91a, "\x99\xf1\0" },
-  { 0xf91b, "\x4e\x82\0" },
-  { 0xf91c, "\x53\x75\0" },
-  { 0xf91d, "\x6b\x04\0" },
-  { 0xf91e, "\x72\x1b\0" },
-  { 0xf91f, "\x86\x2d\0" },
-  { 0xf920, "\x9e\x1e\0" },
-  { 0xf921, "\x5d\x50\0" },
-  { 0xf922, "\x6f\xeb\0" },
-  { 0xf923, "\x85\xcd\0" },
-  { 0xf924, "\x89\x64\0" },
-  { 0xf925, "\x62\xc9\0" },
-  { 0xf926, "\x81\xd8\0" },
-  { 0xf927, "\x88\x1f\0" },
-  { 0xf928, "\x5e\xca\0" },
-  { 0xf929, "\x67\x17\0" },
-  { 0xf92a, "\x6d\x6a\0" },
-  { 0xf92b, "\x72\xfc\0" },
-  { 0xf92c, "\x90\xce\0" },
-  { 0xf92d, "\x4f\x86\0" },
-  { 0xf92e, "\x51\xb7\0" },
-  { 0xf92f, "\x52\xde\0" },
-  { 0xf930, "\x64\xc4\0" },
-  { 0xf931, "\x6a\xd3\0" },
-  { 0xf932, "\x72\x10\0" },
-  { 0xf933, "\x76\xe7\0" },
-  { 0xf934, "\x80\x01\0" },
-  { 0xf935, "\x86\x06\0" },
-  { 0xf936, "\x86\x5c\0" },
-  { 0xf937, "\x8d\xef\0" },
-  { 0xf938, "\x97\x32\0" },
-  { 0xf939, "\x9b\x6f\0" },
-  { 0xf93a, "\x9d\xfa\0" },
-  { 0xf93b, "\x78\x8c\0" },
-  { 0xf93c, "\x79\x7f\0" },
-  { 0xf93d, "\x7d\xa0\0" },
-  { 0xf93e, "\x83\xc9\0" },
-  { 0xf93f, "\x93\x04\0" },
-  { 0xf940, "\x9e\x7f\0" },
-  { 0xf941, "\x8a\xd6\0" },
-  { 0xf942, "\x58\xdf\0" },
-  { 0xf943, "\x5f\x04\0" },
-  { 0xf944, "\x7c\x60\0" },
-  { 0xf945, "\x80\x7e\0" },
-  { 0xf946, "\x72\x62\0" },
-  { 0xf947, "\x78\xca\0" },
-  { 0xf948, "\x8c\xc2\0" },
-  { 0xf949, "\x96\xf7\0" },
-  { 0xf94a, "\x58\xd8\0" },
-  { 0xf94b, "\x5c\x62\0" },
-  { 0xf94c, "\x6a\x13\0" },
-  { 0xf94d, "\x6d\xda\0" },
-  { 0xf94e, "\x6f\x0f\0" },
-  { 0xf94f, "\x7d\x2f\0" },
-  { 0xf950, "\x7e\x37\0" },
-  { 0xf951, "\x96\xfb\0" },
-  { 0xf952, "\x52\xd2\0" },
-  { 0xf953, "\x80\x8b\0" },
-  { 0xf954, "\x51\xdc\0" },
-  { 0xf955, "\x51\xcc\0" },
-  { 0xf956, "\x7a\x1c\0" },
-  { 0xf957, "\x7d\xbe\0" },
-  { 0xf958, "\x83\xf1\0" },
-  { 0xf959, "\x96\x75\0" },
-  { 0xf95a, "\x8b\x80\0" },
-  { 0xf95b, "\x62\xcf\0" },
-  { 0xf95c, "\x6a\x02\0" },
-  { 0xf95d, "\x8a\xfe\0" },
-  { 0xf95e, "\x4e\x39\0" },
-  { 0xf95f, "\x5b\xe7\0" },
-  { 0xf960, "\x60\x12\0" },
-  { 0xf961, "\x73\x87\0" },
-  { 0xf962, "\x75\x70\0" },
-  { 0xf963, "\x53\x17\0" },
-  { 0xf964, "\x78\xfb\0" },
-  { 0xf965, "\x4f\xbf\0" },
-  { 0xf966, "\x5f\xa9\0" },
-  { 0xf967, "\x4e\x0d\0" },
-  { 0xf968, "\x6c\xcc\0" },
-  { 0xf969, "\x65\x78\0" },
-  { 0xf96a, "\x7d\x22\0" },
-  { 0xf96b, "\x53\xc3\0" },
-  { 0xf96c, "\x58\x5e\0" },
-  { 0xf96d, "\x77\x01\0" },
-  { 0xf96e, "\x84\x49\0" },
-  { 0xf96f, "\x8a\xaa\0" },
-  { 0xf970, "\x6b\xba\0" },
-  { 0xf971, "\x8f\xb0\0" },
-  { 0xf972, "\x6c\x88\0" },
-  { 0xf973, "\x62\xfe\0" },
-  { 0xf974, "\x82\xe5\0" },
-  { 0xf975, "\x63\xa0\0" },
-  { 0xf976, "\x75\x65\0" },
-  { 0xf977, "\x4e\xae\0" },
-  { 0xf978, "\x51\x69\0" },
-  { 0xf979, "\x51\xc9\0" },
-  { 0xf97a, "\x68\x81\0" },
-  { 0xf97b, "\x7c\xe7\0" },
-  { 0xf97c, "\x82\x6f\0" },
-  { 0xf97d, "\x8a\xd2\0" },
-  { 0xf97e, "\x91\xcf\0" },
-  { 0xf97f, "\x52\xf5\0" },
-  { 0xf980, "\x54\x42\0" },
-  { 0xf981, "\x59\x73\0" },
-  { 0xf982, "\x5e\xec\0" },
-  { 0xf983, "\x65\xc5\0" },
-  { 0xf984, "\x6f\xfe\0" },
-  { 0xf985, "\x79\x2a\0" },
-  { 0xf986, "\x95\xad\0" },
-  { 0xf987, "\x9a\x6a\0" },
-  { 0xf988, "\x9e\x97\0" },
-  { 0xf989, "\x9e\xce\0" },
-  { 0xf98a, "\x52\x9b\0" },
-  { 0xf98b, "\x66\xc6\0" },
-  { 0xf98c, "\x6b\x77\0" },
-  { 0xf98d, "\x8f\x62\0" },
-  { 0xf98e, "\x5e\x74\0" },
-  { 0xf98f, "\x61\x90\0" },
-  { 0xf990, "\x62\x00\0" },
-  { 0xf991, "\x64\x9a\0" },
-  { 0xf992, "\x6f\x23\0" },
-  { 0xf993, "\x71\x49\0" },
-  { 0xf994, "\x74\x89\0" },
-  { 0xf995, "\x79\xca\0" },
-  { 0xf996, "\x7d\xf4\0" },
-  { 0xf997, "\x80\x6f\0" },
-  { 0xf998, "\x8f\x26\0" },
-  { 0xf999, "\x84\xee\0" },
-  { 0xf99a, "\x90\x23\0" },
-  { 0xf99b, "\x93\x4a\0" },
-  { 0xf99c, "\x52\x17\0" },
-  { 0xf99d, "\x52\xa3\0" },
-  { 0xf99e, "\x54\xbd\0" },
-  { 0xf99f, "\x70\xc8\0" },
-  { 0xf9a0, "\x88\xc2\0" },
-  { 0xf9a1, "\x8a\xaa\0" },
-  { 0xf9a2, "\x5e\xc9\0" },
-  { 0xf9a3, "\x5f\xf5\0" },
-  { 0xf9a4, "\x63\x7b\0" },
-  { 0xf9a5, "\x6b\xae\0" },
-  { 0xf9a6, "\x7c\x3e\0" },
-  { 0xf9a7, "\x73\x75\0" },
-  { 0xf9a8, "\x4e\xe4\0" },
-  { 0xf9a9, "\x56\xf9\0" },
-  { 0xf9aa, "\x5b\xe7\0" },
-  { 0xf9ab, "\x5d\xba\0" },
-  { 0xf9ac, "\x60\x1c\0" },
-  { 0xf9ad, "\x73\xb2\0" },
-  { 0xf9ae, "\x74\x69\0" },
-  { 0xf9af, "\x7f\x9a\0" },
-  { 0xf9b0, "\x80\x46\0" },
-  { 0xf9b1, "\x92\x34\0" },
-  { 0xf9b2, "\x96\xf6\0" },
-  { 0xf9b3, "\x97\x48\0" },
-  { 0xf9b4, "\x98\x18\0" },
-  { 0xf9b5, "\x4f\x8b\0" },
-  { 0xf9b6, "\x79\xae\0" },
-  { 0xf9b7, "\x91\xb4\0" },
-  { 0xf9b8, "\x96\xb8\0" },
-  { 0xf9b9, "\x60\xe1\0" },
-  { 0xf9ba, "\x4e\x86\0" },
-  { 0xf9bb, "\x50\xda\0" },
-  { 0xf9bc, "\x5b\xee\0" },
-  { 0xf9bd, "\x5c\x3f\0" },
-  { 0xf9be, "\x65\x99\0" },
-  { 0xf9bf, "\x6a\x02\0" },
-  { 0xf9c0, "\x71\xce\0" },
-  { 0xf9c1, "\x76\x42\0" },
-  { 0xf9c2, "\x84\xfc\0" },
-  { 0xf9c3, "\x90\x7c\0" },
-  { 0xf9c4, "\x9f\x8d\0" },
-  { 0xf9c5, "\x66\x88\0" },
-  { 0xf9c6, "\x96\x2e\0" },
-  { 0xf9c7, "\x52\x89\0" },
-  { 0xf9c8, "\x67\x7b\0" },
-  { 0xf9c9, "\x67\xf3\0" },
-  { 0xf9ca, "\x6d\x41\0" },
-  { 0xf9cb, "\x6e\x9c\0" },
-  { 0xf9cc, "\x74\x09\0" },
-  { 0xf9cd, "\x75\x59\0" },
-  { 0xf9ce, "\x78\x6b\0" },
-  { 0xf9cf, "\x7d\x10\0" },
-  { 0xf9d0, "\x98\x5e\0" },
-  { 0xf9d1, "\x51\x6d\0" },
-  { 0xf9d2, "\x62\x2e\0" },
-  { 0xf9d3, "\x96\x78\0" },
-  { 0xf9d4, "\x50\x2b\0" },
-  { 0xf9d5, "\x5d\x19\0" },
-  { 0xf9d6, "\x6d\xea\0" },
-  { 0xf9d7, "\x8f\x2a\0" },
-  { 0xf9d8, "\x5f\x8b\0" },
-  { 0xf9d9, "\x61\x44\0" },
-  { 0xf9da, "\x68\x17\0" },
-  { 0xf9db, "\x73\x87\0" },
-  { 0xf9dc, "\x96\x86\0" },
-  { 0xf9dd, "\x52\x29\0" },
-  { 0xf9de, "\x54\x0f\0" },
-  { 0xf9df, "\x5c\x65\0" },
-  { 0xf9e0, "\x66\x13\0" },
-  { 0xf9e1, "\x67\x4e\0" },
-  { 0xf9e2, "\x68\xa8\0" },
-  { 0xf9e3, "\x6c\xe5\0" },
-  { 0xf9e4, "\x74\x06\0" },
-  { 0xf9e5, "\x75\xe2\0" },
-  { 0xf9e6, "\x7f\x79\0" },
-  { 0xf9e7, "\x88\xcf\0" },
-  { 0xf9e8, "\x88\xe1\0" },
-  { 0xf9e9, "\x91\xcc\0" },
-  { 0xf9ea, "\x96\xe2\0" },
-  { 0xf9eb, "\x53\x3f\0" },
-  { 0xf9ec, "\x6e\xba\0" },
-  { 0xf9ed, "\x54\x1d\0" },
-  { 0xf9ee, "\x71\xd0\0" },
-  { 0xf9ef, "\x74\x98\0" },
-  { 0xf9f0, "\x85\xfa\0" },
-  { 0xf9f1, "\x96\xa3\0" },
-  { 0xf9f2, "\x9c\x57\0" },
-  { 0xf9f3, "\x9e\x9f\0" },
-  { 0xf9f4, "\x67\x97\0" },
-  { 0xf9f5, "\x6d\xcb\0" },
-  { 0xf9f6, "\x81\xe8\0" },
-  { 0xf9f7, "\x7a\xcb\0" },
-  { 0xf9f8, "\x7b\x20\0" },
-  { 0xf9f9, "\x7c\x92\0" },
-  { 0xf9fa, "\x72\xc0\0" },
-  { 0xf9fb, "\x70\x99\0" },
-  { 0xf9fc, "\x8b\x58\0" },
-  { 0xf9fd, "\x4e\xc0\0" },
-  { 0xf9fe, "\x83\x36\0" },
-  { 0xf9ff, "\x52\x3a\0" },
-  { 0xfa00, "\x52\x07\0" },
-  { 0xfa01, "\x5e\xa6\0" },
-  { 0xfa02, "\x62\xd3\0" },
-  { 0xfa03, "\x7c\xd6\0" },
-  { 0xfa04, "\x5b\x85\0" },
-  { 0xfa05, "\x6d\x1e\0" },
-  { 0xfa06, "\x66\xb4\0" },
-  { 0xfa07, "\x8f\x3b\0" },
-  { 0xfa08, "\x88\x4c\0" },
-  { 0xfa09, "\x96\x4d\0" },
-  { 0xfa0a, "\x89\x8b\0" },
-  { 0xfa0b, "\x5e\xd3\0" },
-  { 0xfa0c, "\x51\x40\0" },
-  { 0xfa0d, "\x55\xc0\0" },
-  { 0xfa10, "\x58\x5a\0" },
-  { 0xfa12, "\x66\x74\0" },
-  { 0xfa15, "\x51\xde\0" },
-  { 0xfa16, "\x73\x2a\0" },
-  { 0xfa17, "\x76\xca\0" },
-  { 0xfa18, "\x79\x3c\0" },
-  { 0xfa19, "\x79\x5e\0" },
-  { 0xfa1a, "\x79\x65\0" },
-  { 0xfa1b, "\x79\x8f\0" },
-  { 0xfa1c, "\x97\x56\0" },
-  { 0xfa1d, "\x7c\xbe\0" },
-  { 0xfa1e, "\x7f\xbd\0" },
-  { 0xfa20, "\x86\x12\0" },
-  { 0xfa22, "\x8a\xf8\0" },
-  { 0xfa25, "\x90\x38\0" },
-  { 0xfa26, "\x90\xfd\0" },
-  { 0xfa2a, "\x98\xef\0" },
-  { 0xfa2b, "\x98\xfc\0" },
-  { 0xfa2c, "\x99\x28\0" },
-  { 0xfa2d, "\x9d\xb4\0" },
-  { 0xfb1f, "\x05\xf2\x05\xb7\0" },
-  { 0xfb2a, "\x05\xe9\x05\xc1\0" },
-  { 0xfb2b, "\x05\xe9\x05\xc2\0" },
-  { 0xfb2c, "\x05\xe9\x05\xbc\x05\xc1\0" },
-  { 0xfb2d, "\x05\xe9\x05\xbc\x05\xc2\0" },
-  { 0xfb2e, "\x05\xd0\x05\xb7\0" },
-  { 0xfb2f, "\x05\xd0\x05\xb8\0" },
-  { 0xfb30, "\x05\xd0\x05\xbc\0" },
-  { 0xfb31, "\x05\xd1\x05\xbc\0" },
-  { 0xfb32, "\x05\xd2\x05\xbc\0" },
-  { 0xfb33, "\x05\xd3\x05\xbc\0" },
-  { 0xfb34, "\x05\xd4\x05\xbc\0" },
-  { 0xfb35, "\x05\xd5\x05\xbc\0" },
-  { 0xfb36, "\x05\xd6\x05\xbc\0" },
-  { 0xfb38, "\x05\xd8\x05\xbc\0" },
-  { 0xfb39, "\x05\xd9\x05\xbc\0" },
-  { 0xfb3a, "\x05\xda\x05\xbc\0" },
-  { 0xfb3b, "\x05\xdb\x05\xbc\0" },
-  { 0xfb3c, "\x05\xdc\x05\xbc\0" },
-  { 0xfb3e, "\x05\xde\x05\xbc\0" },
-  { 0xfb40, "\x05\xe0\x05\xbc\0" },
-  { 0xfb41, "\x05\xe1\x05\xbc\0" },
-  { 0xfb43, "\x05\xe3\x05\xbc\0" },
-  { 0xfb44, "\x05\xe4\x05\xbc\0" },
-  { 0xfb46, "\x05\xe6\x05\xbc\0" },
-  { 0xfb47, "\x05\xe7\x05\xbc\0" },
-  { 0xfb48, "\x05\xe8\x05\xbc\0" },
-  { 0xfb49, "\x05\xe9\x05\xbc\0" },
-  { 0xfb4a, "\x05\xea\x05\xbc\0" },
-  { 0xfb4b, "\x05\xd5\x05\xb9\0" },
-  { 0xfb4c, "\x05\xd1\x05\xbf\0" },
-  { 0xfb4d, "\x05\xdb\x05\xbf\0" },
-  { 0xfb4e, "\x05\xe4\x05\xbf\0" }
-};
-
-/*
- * WARNING!
- *
- * NO BUFFER CHECKING AHEAD!
- *
- */
-
-static gint
-e_canonical_decomposition (gunichar ch, gunichar * buf)
-{
-  gint len = 0;
-
-  if (ch <= 0xffff)
-    {
-      int start = 0;
-      int end = sizeof (e_decomp_table) / sizeof (e_decomp_table[0]);
-      while (start != end)
-	{
-	  int half = (start + end) / 2;
-	  if (ch == e_decomp_table[half].ch) {
-	      /* Found it.  */
-	      int i;
-	      /* We store as a double-nul terminated string.  */
-	      for (len = 0; (e_decomp_table[half].expansion[len] || e_decomp_table[half].expansion[len + 1]); len += 2) ;
-
-	      /* We've counted twice as many bytes as there are
-		 characters.  */
-	      len /= 2;
-
-	      for (i = 0; i < len; i ++) {
-			buf[i] = (e_decomp_table[half].expansion[2 * i] << 8) | e_decomp_table[half].expansion[2 * i + 1];
-	      }
-	      break;
-	  } else if (ch > e_decomp_table[half].ch) {
-		  if (start == half) break;
-		  start = half;
-	  } else {
-		  if (end == half) break;
-		  end = half;
-	  }
-	}
-    }
-
-  if (len == 0)
-    {
-      /* Not in our table.  */
-      *buf = ch;
-      len = 1;
-    }
-
-  /* Supposedly following the Unicode 2.1.9 table means that the
-     decompositions come out in canonical order.  I haven't tested
-     this, but we rely on it here.  */
-  return len;
-}
-
-static gunichar
-e_stripped_char (gunichar ch)
-{
-	gunichar decomp[MAX_DECOMP];
-	GUnicodeType utype;
-	gint dlen;
-
-	utype = g_unichar_type (ch);
-
-	switch (utype) {
-	case G_UNICODE_CONTROL:
-	case G_UNICODE_FORMAT:
-	case G_UNICODE_UNASSIGNED:
-	case G_UNICODE_COMBINING_MARK:
-		/* Ignore those */
-		return 0;
-		break;
-	default:
-		/* Convert to lowercase, fall through */
-		ch = g_unichar_tolower (ch);
-	case G_UNICODE_LOWERCASE_LETTER:
-		dlen = e_canonical_decomposition (ch, decomp);
-		if (dlen > 0) return *decomp;
-		break;
-	}
-
-	return 0;
-}
-
-gchar *
-e_xml_get_translated_utf8_string_prop_by_name (const xmlNode *parent, const xmlChar *prop_name)
-{
-	xmlChar *prop;
-	gchar *ret_val = NULL;
-	gchar *combined_name;
-
-	g_return_val_if_fail (parent != NULL, 0);
-	g_return_val_if_fail (prop_name != NULL, 0);
-
-	prop = xmlGetProp ((xmlNode *) parent, prop_name);
-	if (prop != NULL) {
-		ret_val = g_strdup (prop);
-		xmlFree (prop);
-		return ret_val;
-	}
-
-	combined_name = g_strdup_printf("_%s", prop_name);
-	prop = xmlGetProp ((xmlNode *) parent, combined_name);
-	if (prop != NULL) {
-		ret_val = e_utf8_from_locale_string (gettext (prop));
-		xmlFree (prop);
-	}
-	g_free(combined_name);
-
-	return ret_val;
-}
diff --git a/widgets/misc/e-unicode.h b/widgets/misc/e-unicode.h
deleted file mode 100644
index 019505948f..0000000000
--- a/widgets/misc/e-unicode.h
+++ /dev/null
@@ -1,86 +0,0 @@
-#ifndef _E_UNICODE_H_
-#define _E_UNICODE_H_
-
-/*
- * UTF-8 support functions for gal
- *
- * Authors:
- *   Lauris Kaplinski <lauris@helixcode.com>
- *
- * Copyright (C) 2000-2001 Helix Code, Inc.
- *
- */
-
-#include <sys/types.h>
-#include <glib.h>
-#include <gtk/gtkclist.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkwidget.h>
-#include <libgnome/gnome-defs.h>
-#include <gnome-xml/tree.h>
-#include <gal/unicode/gunicode.h>
-
-BEGIN_GNOME_DECLS
-
-#define G_UTF8_IN_GAL
-
-/*
- * UTF-8 searching implementations
- *
- * e_utf8_strstrcase - case insensitive search
- * e_utf8_strstrcasedecomp - case insensitive and decompositing search (i.e. accented
- *   letters are treated equal to their base letters, explicit accent marks (unicode
- *   not ascii/iso ones) are ignored).
- */
-
-const gchar *e_utf8_strstrcase (const gchar *haystack, const gchar *needle);
-const gchar *e_utf8_strstrcasedecomp (const gchar *haystack, const gchar *needle);
-
-gchar *e_utf8_from_gtk_event_key (GtkWidget *widget, guint keyval, const gchar *string);
-
-gchar *e_utf8_from_gtk_string (GtkWidget *widget, const gchar *string);
-gchar *e_utf8_from_gtk_string_sized (GtkWidget *widget, const gchar *string, gint bytes);
-
-gchar *e_utf8_to_gtk_string (GtkWidget *widget, const gchar *string);
-gchar *e_utf8_to_gtk_string_sized (GtkWidget *widget, const gchar *string, gint bytes);
-
-gchar *e_utf8_from_locale_string (const gchar *string);
-gchar *e_utf8_from_locale_string_sized (const gchar *string, gint bytes);
-
-gchar *e_utf8_to_locale_string (const gchar *string);
-gchar *e_utf8_to_locale_string_sized (const gchar *string, gint bytes);
-/*
- * These are simple wrappers that save us some typing
- */
-
-/* NB! This return newly allocated string, not const as gtk+ one */
-
-gchar *e_utf8_gtk_entry_get_text (GtkEntry *entry);
-void e_utf8_gtk_entry_set_text (GtkEntry *entry, const gchar *text);
-
-gchar *e_utf8_gtk_editable_get_text (GtkEditable *editable);
-void e_utf8_gtk_editable_set_text (GtkEditable *editable, const gchar *text);
-gchar *e_utf8_gtk_editable_get_chars (GtkEditable *editable, gint start, gint end);
-void e_utf8_gtk_editable_insert_text (GtkEditable *editable, const gchar *text, gint length, gint *position);
-
-GtkWidget *e_utf8_gtk_menu_item_new_with_label (GtkMenu *menu, const gchar *label);
-
-void e_utf8_gtk_clist_set_text (GtkCList *clist, gint row, gint col, const gchar *text);
-gint e_utf8_gtk_clist_append (GtkCList *clist, gchar *text[]);
-
-gchar * e_utf8_xml1_decode (const gchar *text);
-gchar * e_utf8_xml1_encode (const gchar *text);
-
-gint e_unichar_to_utf8 (gint c, gchar *outbuf);
-gchar *e_unicode_get_utf8 (const gchar *text, gunichar *out);
-guint32 gdk_keyval_to_unicode (guint keysym);
-
-gchar    *e_xml_get_translated_utf8_string_prop_by_name   (const xmlNode *parent,
-							   const xmlChar *prop_name);
-
-END_GNOME_DECLS
-
-#endif
-
-
diff --git a/widgets/misc/gal-categories.glade b/widgets/misc/gal-categories.glade
deleted file mode 100644
index 42141d466d..0000000000
--- a/widgets/misc/gal-categories.glade
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>categories</name>
-  <program_name>categories</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>False</gettext_support>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <backup_source_files>False</backup_source_files>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>gal-categories.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>categories</name>
-  <visible>False</visible>
-  <title>categories</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button4</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table-categories</name>
-      <rows>5</rows>
-      <columns>1</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>0</row_spacing>
-      <column_spacing>0</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-categories</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label-header</name>
-	<label>Item(s) belong to these _categories:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-categories</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label2</name>
-	<label>_Available Categories:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button-ecmld</name>
-	<can_focus>True</can_focus>
-	<label>Edit Master Category List...</label>
-	<relief>GTK_RELIEF_NORMAL</relief>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>4</top_attach>
-	  <bottom_attach>5</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/widgets/misc/pixmaps/.cvsignore b/widgets/misc/pixmaps/.cvsignore
deleted file mode 100644
index 3dda72986f..0000000000
--- a/widgets/misc/pixmaps/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile.in
-Makefile
diff --git a/widgets/misc/pixmaps/cursor_cross.xpm b/widgets/misc/pixmaps/cursor_cross.xpm
deleted file mode 100644
index cf9d0aca33..0000000000
--- a/widgets/misc/pixmaps/cursor_cross.xpm
+++ /dev/null
@@ -1,38 +0,0 @@
-/* XPM */
-static char * cursor_cross_xpm[] = {
-"32 32 3 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"             .......            ",
-"             .+++++..           ",
-"             .+++++..           ",
-"             .+++++..           ",
-"             .+++++..           ",
-"        ......+++++......       ",
-"        .+++++++++++++++..      ",
-"        .+++++++++++++++..      ",
-"        .+++++++++++++++..      ",
-"        .+++++++++++++++..      ",
-"        .+++++++++++++++..      ",
-"        ......+++++.......      ",
-"         .....+++++.......      ",
-"             .+++++..           ",
-"             .+++++..           ",
-"             .+++++..           ",
-"             ........           ",
-"              .......           ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                "};
diff --git a/widgets/misc/pixmaps/cursor_hand_closed.xpm b/widgets/misc/pixmaps/cursor_hand_closed.xpm
deleted file mode 100644
index 61a6de4b88..0000000000
--- a/widgets/misc/pixmaps/cursor_hand_closed.xpm
+++ /dev/null
@@ -1,38 +0,0 @@
-/* XPM */
-static char * cursor_hand_closed_xpm[] = {
-"32 32 3 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"         ..                     ",
-"       ..++...                  ",
-"      .+++++++..                ",
-"      .+++++++++.               ",
-"    ...+++++++++.               ",
-"   .++.+++++++++.               ",
-"   .++++++++++++.               ",
-"    .+++++++++++.               ",
-"    .++++++++++.                ",
-"     .+++++++++.                ",
-"      .+++++++.                 ",
-"       .++++++.                 ",
-"       .++++++.                 ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                "};
diff --git a/widgets/misc/pixmaps/cursor_hand_open.xpm b/widgets/misc/pixmaps/cursor_hand_open.xpm
deleted file mode 100644
index 048acc8054..0000000000
--- a/widgets/misc/pixmaps/cursor_hand_open.xpm
+++ /dev/null
@@ -1,38 +0,0 @@
-/* XPM */
-static char * cursor_hand_open_xpm[] = {
-"32 32 3 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"                                ",
-"                                ",
-"         ..                     ",
-"     .. .++...                  ",
-"    .++..++.++.                 ",
-"    .++..++.++. .               ",
-"     .++.++.++..+.              ",
-"     .++.++.++.++.              ",
-"   .. .+++++++.++.              ",
-"  .++..++++++++++.              ",
-"  .+++.+++++++++.               ",
-"   .++++++++++++.               ",
-"    .+++++++++++.               ",
-"    .++++++++++.                ",
-"     .+++++++++.                ",
-"      .+++++++.                 ",
-"       .++++++.                 ",
-"       .++++++.                 ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                "};
diff --git a/widgets/misc/pixmaps/cursor_zoom_in.xpm b/widgets/misc/pixmaps/cursor_zoom_in.xpm
deleted file mode 100644
index 1caf9e3e2a..0000000000
--- a/widgets/misc/pixmaps/cursor_zoom_in.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * cursor_zoom_in_xpm[] = {
-"32 32 2 1",
-" 	c None",
-".	c #000000",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"        ......                  ",
-"       ..     ..                ",
-"      ..       ..               ",
-"      .         .               ",
-"     .    ...    .              ",
-"     .    ...    .              ",
-"     .  .......  .              ",
-"     .  .......  .              ",
-"     .    ...    .              ",
-"      .   ...   ..              ",
-"      ..       . .              ",
-"       ..     . . .             ",
-"        ........ . .            ",
-"         .....  . . .           ",
-"                 . . .          ",
-"                  . . .         ",
-"                   . . .        ",
-"                    . . .       ",
-"                     .   .      ",
-"                      .  .      ",
-"                       ..       ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                "};
diff --git a/widgets/misc/pixmaps/cursor_zoom_out.xpm b/widgets/misc/pixmaps/cursor_zoom_out.xpm
deleted file mode 100644
index af1b698521..0000000000
--- a/widgets/misc/pixmaps/cursor_zoom_out.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * cursor_zoom_out_xpm[] = {
-"32 32 2 1",
-" 	c None",
-".	c #000000",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"        ......                  ",
-"       ..     ..                ",
-"      ..       ..               ",
-"      .         .               ",
-"     .           .              ",
-"     .           .              ",
-"     .  .......  .              ",
-"     .  .......  .              ",
-"     .           .              ",
-"      .         ..              ",
-"      ..       . .              ",
-"       ..     . . .             ",
-"        ........ . .            ",
-"         .....  . . .           ",
-"                 . . .          ",
-"                  . . .         ",
-"                   . . .        ",
-"                    . . .       ",
-"                     .   .      ",
-"                      .  .      ",
-"                       ..       ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                "};
diff --git a/widgets/misc/test-calendar.c b/widgets/misc/test-calendar.c
deleted file mode 100644
index ac18889617..0000000000
--- a/widgets/misc/test-calendar.c
+++ /dev/null
@@ -1,220 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2000, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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
- */
-
-/*
- * test-calendar - tests the ECalendar widget.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkvbox.h>
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-init.h>
-#include "e-calendar.h"
-
-/* Drag and Drop stuff. */
-enum {
-	TARGET_SHORTCUT
-};
-static GtkTargetEntry target_table[] = {
-	{ "E-SHORTCUT",     0, TARGET_SHORTCUT }
-};
-static guint n_targets = sizeof(target_table) / sizeof(target_table[0]);
-
-
-static void on_date_range_changed	(ECalendarItem *calitem);
-static void on_selection_changed	(ECalendarItem *calitem);
-static void get_day_style		(ECalendarItem	*calitem,
-					 gint		 year,
-					 gint		 month,
-					 gint		 day,
-					 gint		 day_style,
-					 gboolean	 today,
-					 gboolean	 prev_or_next_month,
-					 gboolean	 selected,
-					 gboolean	 has_focus,
-					 gboolean	 drop_target,
-					 GdkColor      **bg_color,
-					 GdkColor      **fg_color,
-					 GdkColor      **box_color,
-					 gboolean	*bold,
-					 gpointer	 data);
-
-static void
-delete_event_cb (GtkWidget *widget,
-		 GdkEventAny *event,
-		 gpointer data)
-{
-	gtk_main_quit ();
-}
-
-int
-main (int argc, char **argv)
-{
-	GtkWidget *app;
-	GtkWidget *cal;
-	GtkWidget *vbox;
-	ECalendarItem *calitem;
-
-	gnome_init ("test-calendar", "0.0", argc, argv);
-
-	app = gnome_app_new ("Test", "Test");
-	gtk_window_set_default_size (GTK_WINDOW (app), 400, 400);
-	gtk_window_set_policy (GTK_WINDOW (app), FALSE, TRUE, FALSE);
-	gtk_container_set_border_width (GTK_CONTAINER (app), 8);
-
-	gtk_signal_connect (GTK_OBJECT (app), "delete_event",
-			    GTK_SIGNAL_FUNC (delete_event_cb), NULL);
-
-	cal = e_calendar_new ();
-	e_calendar_set_minimum_size (E_CALENDAR (cal), 1, 1);
-	calitem = E_CALENDAR (cal)->calitem;
-	gtk_widget_show (cal);
-	e_calendar_item_set_style_callback (calitem, get_day_style,
-					    NULL, NULL);
-
-	gtk_signal_connect (GTK_OBJECT (calitem), "date_range_changed",
-			    GTK_SIGNAL_FUNC (on_date_range_changed), NULL);
-	gtk_signal_connect (GTK_OBJECT (calitem), "selection_changed",
-			    GTK_SIGNAL_FUNC (on_selection_changed), NULL);
-
-
-	gtk_drag_dest_set (cal,
-			   GTK_DEST_DEFAULT_ALL,
-			   target_table, n_targets,
-			   GDK_ACTION_COPY | GDK_ACTION_MOVE);
-
-
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), cal, TRUE, TRUE, 0);
-	gtk_widget_show (vbox);
-
-	gnome_app_set_contents (GNOME_APP (app), vbox);
-	gtk_widget_show (app);
-
-	gtk_main ();
-
-	return 0;
-}
-
-
-static void
-on_date_range_changed (ECalendarItem *calitem)
-{
-	gint start_year, start_month, start_day;
-	gint end_year, end_month, end_day;
-
-	e_calendar_item_get_date_range	(calitem,
-					 &start_year, &start_month, &start_day,
-					 &end_year, &end_month, &end_day);
-
-	g_print ("Date range changed (D/M/Y): %i/%i/%i - %i/%i/%i\n",
-		 start_day, start_month + 1, start_year,
-		 end_day, end_month + 1, end_year);
-
-	/* These days should appear bold. Remember month is 0 to 11. */
-	e_calendar_item_mark_day (calitem, 2000, 7, 26, /* 26th Aug 2000. */
-				  E_CALENDAR_ITEM_MARK_BOLD);
-	e_calendar_item_mark_day (calitem, 2000, 8, 13, /* 13th Sep 2000. */
-				  E_CALENDAR_ITEM_MARK_BOLD);
-}
-
-
-static void
-on_selection_changed (ECalendarItem *calitem)
-{
-	GDate start_date, end_date;
-
-	e_calendar_item_get_selection	(calitem, &start_date, &end_date);
-
-	g_print ("Selection changed (D/M/Y): %i/%i/%i - %i/%i/%i\n",
-		 g_date_day (&start_date),
-		 g_date_month (&start_date),
-		 g_date_year (&start_date),
-		 g_date_day (&end_date),
-		 g_date_month (&end_date),
-		 g_date_year (&end_date));
-}
-
-
-static void
-get_day_style		(ECalendarItem	*calitem,
-			 gint		 year,
-			 gint		 month,
-			 gint		 day,
-			 gint		 day_style,
-			 gboolean	 today,
-			 gboolean	 prev_or_next_month,
-			 gboolean	 selected,
-			 gboolean	 has_focus,
-			 gboolean	 drop_target,
-			 GdkColor      **bg_color,
-			 GdkColor      **fg_color,
-			 GdkColor      **box_color,
-			 gboolean	*bold,
-			 gpointer	 data)
-{
-	*bg_color = NULL;
-	*fg_color = NULL;
-	*box_color = NULL;
-	*bold = FALSE;
-
-#if 1
-
-	if (day_style == 1)
-		*bold = TRUE;
-
-	if (today)
-		*box_color = &calitem->colors[E_CALENDAR_ITEM_COLOR_TODAY_BOX];
-
-	if (prev_or_next_month)
-		*fg_color = &calitem->colors[E_CALENDAR_ITEM_COLOR_PREV_OR_NEXT_MONTH_FG];
-
-	if (selected) {
-		*fg_color = &calitem->colors[E_CALENDAR_ITEM_COLOR_SELECTION_FG];
-		*bg_color = &calitem->colors[E_CALENDAR_ITEM_COLOR_SELECTION_BG];
-	}
-
-#else
-
-	if (day_style == 1)
-		*bold = TRUE;
-
-	if (today)
-		*box_color = &calitem->colors[E_CALENDAR_ITEM_COLOR_PREV_OR_NEXT_MONTH_FG];
-
-	if (prev_or_next_month)
-		*fg_color = &calitem->colors[E_CALENDAR_ITEM_COLOR_TODAY_BOX];
-
-	if (selected) {
-		*fg_color = &calitem->colors[E_CALENDAR_ITEM_COLOR_SELECTION_FG];
-		*bg_color = &calitem->colors[E_CALENDAR_ITEM_COLOR_PREV_OR_NEXT_MONTH_FG];
-	}
-
-#endif
-}
diff --git a/widgets/misc/test-charset-picker.c b/widgets/misc/test-charset-picker.c
deleted file mode 100644
index 889bba2600..0000000000
--- a/widgets/misc/test-charset-picker.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <gnome.h>
-#include "e-charset-picker.h"
-
-int
-main (int argc, char **argv)
-{
-	char *charset;
-
-	gnome_init ("test-charset-picker", "1.0", argc, argv);
-
-	charset = e_charset_picker_dialog ("test-charset-picker",
-					   "Pick a charset, any charset",
-					   NULL, NULL);
-	if (charset)
-		printf ("You picked: %s\n", charset);
-
-	return 0;
-}
diff --git a/widgets/misc/test-color.c b/widgets/misc/test-color.c
deleted file mode 100644
index 2e6df9cb17..0000000000
--- a/widgets/misc/test-color.c
+++ /dev/null
@@ -1,47 +0,0 @@
-#include <gnome.h>
-#include "widget-color-combo.h"
-#include "color-palette.h"
-#include "e-colors.h"
-#include "pixmaps/cursor_hand_open.xpm"
-
-/* To compile (from src/widgets):
-
-gcc -I..  -I../.. -L. -Wall -o tester tester.c ../color.c `gnome-config --cflags --libs gnome gnomeui` -lwidgets
-
-*/
-
-gint
-main ( gint argc, gchar* argv[] )
-{
-	GtkWidget * dialog;
-	GtkWidget * T;
-	ColorGroup *cg;
-
-	gnome_init ("tester", "1.0", argc, argv);
-
-	dialog = gnome_dialog_new ("TESTER", GNOME_STOCK_BUTTON_OK,
-				   GNOME_STOCK_BUTTON_CANCEL, NULL);
-	cg = color_group_fetch ("fore_color_group", dialog);
-	T = color_palette_new ("Color Palette", NULL, cg);
-
-	gtk_box_pack_start(GTK_BOX (GNOME_DIALOG (dialog)-> vbox ),
-			   T, TRUE, TRUE, 5);
-	gtk_widget_show_all (T);
-
-	cg = color_group_fetch ("fore_color_group", dialog);
-	T = color_combo_new (cursor_hand_open_xpm, _("Automatic"),
-			     &e_black, cg);
-	gtk_box_pack_start(GTK_BOX (GNOME_DIALOG (dialog)-> vbox ),
-			   T, TRUE, TRUE, 5);
-	gtk_widget_show_all (T);
-
-	cg = color_group_fetch ("back_color_group", dialog);
-	T = color_combo_new (cursor_hand_open_xpm, _("Automatic"),
-			     &e_black, cg);
-	gtk_box_pack_start(GTK_BOX (GNOME_DIALOG (dialog)-> vbox ),
-			   T, TRUE, TRUE, 5);
-	gtk_widget_show_all (T);
-
-	gnome_dialog_run_and_close ( GNOME_DIALOG (dialog) );
-	return 0;
-}
diff --git a/widgets/misc/test-dateedit.c b/widgets/misc/test-dateedit.c
deleted file mode 100644
index b7cbbd5e93..0000000000
--- a/widgets/misc/test-dateedit.c
+++ /dev/null
@@ -1,284 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2000, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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
- */
-
-/*
- * test-dateedit - tests the EDateEdit widget.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkwindow.h>
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-init.h>
-#include "e-dateedit.h"
-
-static void delete_event_cb		(GtkWidget	*widget,
-					 GdkEventAny	*event,
-					 GtkWidget	*app);
-static void on_get_date_clicked		(GtkWidget	*button,
-					 EDateEdit	*dedit);
-static void on_toggle_24_hour_clicked	(GtkWidget	*button,
-					 EDateEdit	*dedit);
-static void on_changed			(EDateEdit	*dedit,
-					 gchar		*name);
-#if 0
-static void on_date_changed		(EDateEdit	*dedit,
-					 gchar		*name);
-static void on_time_changed		(EDateEdit	*dedit,
-					 gchar		*name);
-#endif
-
-int
-main (int argc, char **argv)
-{
-	GtkWidget *app;
-	EDateEdit *dedit;
-	GtkWidget *table, *button;
-
-	gnome_init ("test-dateedit", "0.0", argc, argv);
-
-	app = gnome_app_new ("Test", "Test");
-	gtk_window_set_default_size (GTK_WINDOW (app), 300, 200);
-	gtk_window_set_policy (GTK_WINDOW (app), FALSE, TRUE, TRUE);
-	gtk_container_set_border_width (GTK_CONTAINER (app), 8);
-
-	gtk_signal_connect (GTK_OBJECT (app), "delete_event",
-			    GTK_SIGNAL_FUNC (delete_event_cb), app);
-
-	table = gtk_table_new (3, 3, FALSE);
-	gtk_table_set_row_spacings (GTK_TABLE (table), 4);
-	gtk_table_set_col_spacings (GTK_TABLE (table), 4);
-	gtk_widget_show (table);
-	gnome_app_set_contents (GNOME_APP (app), table);
-
-	/* EDateEdit 1. */
-	dedit = E_DATE_EDIT (e_date_edit_new ());
-	gtk_table_attach (GTK_TABLE (table), (GtkWidget*) dedit,
-			  0, 1, 0, 1, GTK_FILL, GTK_EXPAND, 0, 0);
-	gtk_widget_show ((GtkWidget*) (dedit));
-
-#if 0
-	gtk_signal_connect (GTK_OBJECT (dedit), "date_changed",
-			    GTK_SIGNAL_FUNC (on_date_changed), "1");
-	gtk_signal_connect (GTK_OBJECT (dedit), "time_changed",
-			    GTK_SIGNAL_FUNC (on_time_changed), "1");
-#else
-	gtk_signal_connect (GTK_OBJECT (dedit), "changed",
-			    GTK_SIGNAL_FUNC (on_changed), "1");
-#endif
-
-	button = gtk_button_new_with_label ("Print Date");
-	gtk_table_attach (GTK_TABLE (table), button,
-			  1, 2, 0, 1, 0, 0, 0, 0);
-	gtk_widget_show (button);
-	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			    GTK_SIGNAL_FUNC (on_get_date_clicked), dedit);
-
-	/* EDateEdit 2. */
-	dedit = E_DATE_EDIT (e_date_edit_new ());
-	gtk_table_attach (GTK_TABLE (table), (GtkWidget*) dedit,
-			  0, 1, 1, 2, GTK_FILL, GTK_EXPAND, 0, 0);
-	gtk_widget_show ((GtkWidget*) (dedit));
-	e_date_edit_set_week_start_day (dedit, 1);
-	e_date_edit_set_show_week_numbers (dedit, TRUE);
-	e_date_edit_set_use_24_hour_format (dedit, FALSE);
-	e_date_edit_set_time_popup_range (dedit, 8, 18);
-	e_date_edit_set_show_time (dedit, FALSE);
-
-#if 0
-	gtk_signal_connect (GTK_OBJECT (dedit), "date_changed",
-			    GTK_SIGNAL_FUNC (on_date_changed), "2");
-	gtk_signal_connect (GTK_OBJECT (dedit), "time_changed",
-			    GTK_SIGNAL_FUNC (on_time_changed), "2");
-#else
-	gtk_signal_connect (GTK_OBJECT (dedit), "changed",
-			    GTK_SIGNAL_FUNC (on_changed), "2");
-#endif
-
-	button = gtk_button_new_with_label ("Print Date");
-	gtk_table_attach (GTK_TABLE (table), button,
-			  1, 2, 1, 2, 0, 0, 0, 0);
-	gtk_widget_show (button);
-	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			    GTK_SIGNAL_FUNC (on_get_date_clicked), dedit);
-
-	/* EDateEdit 3. */
-	dedit = E_DATE_EDIT (e_date_edit_new ());
-	gtk_table_attach (GTK_TABLE (table), (GtkWidget*) dedit,
-			  0, 1, 2, 3, GTK_FILL, GTK_EXPAND, 0, 0);
-	gtk_widget_show ((GtkWidget*) (dedit));
-	e_date_edit_set_week_start_day (dedit, 1);
-	e_date_edit_set_show_week_numbers (dedit, TRUE);
-	e_date_edit_set_use_24_hour_format (dedit, FALSE);
-	e_date_edit_set_time_popup_range (dedit, 8, 18);
-	e_date_edit_set_allow_no_date_set (dedit, TRUE);
-
-#if 0
-	gtk_signal_connect (GTK_OBJECT (dedit), "date_changed",
-			    GTK_SIGNAL_FUNC (on_date_changed), "3");
-	gtk_signal_connect (GTK_OBJECT (dedit), "time_changed",
-			    GTK_SIGNAL_FUNC (on_time_changed), "3");
-#else
-	gtk_signal_connect (GTK_OBJECT (dedit), "changed",
-			    GTK_SIGNAL_FUNC (on_changed), "3");
-#endif
-
-	button = gtk_button_new_with_label ("Print Date");
-	gtk_table_attach (GTK_TABLE (table), button,
-			  1, 2, 2, 3, 0, 0, 0, 0);
-	gtk_widget_show (button);
-	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			    GTK_SIGNAL_FUNC (on_get_date_clicked), dedit);
-
-	button = gtk_button_new_with_label ("Toggle 24-hour");
-	gtk_table_attach (GTK_TABLE (table), button,
-			  2, 3, 2, 3, 0, 0, 0, 0);
-	gtk_widget_show (button);
-	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			    GTK_SIGNAL_FUNC (on_toggle_24_hour_clicked),
-			    dedit);
-
-	gtk_widget_show (app);
-
-	gtk_main ();
-
-	return 0;
-}
-
-
-static void
-delete_event_cb		(GtkWidget	*widget,
-			 GdkEventAny	*event,
-			 GtkWidget	*app)
-{
-	gtk_widget_destroy (app);
-
-	gtk_main_quit ();
-}
-
-
-static void
-on_get_date_clicked	(GtkWidget	*button,
-			 EDateEdit	*dedit)
-{
-	time_t t;
-
-	t = e_date_edit_get_time (dedit);
-	if (t == -1)
-		g_print ("Time: None\n");
-	else
-		g_print ("Time: %s", ctime (&t));
-
-	if (!e_date_edit_date_is_valid (dedit))
-		g_print ("  Date invalid\n");
-
-	if (!e_date_edit_time_is_valid (dedit))
-		g_print ("  Time invalid\n");
-}
-
-
-static void
-on_toggle_24_hour_clicked	(GtkWidget	*button,
-				 EDateEdit	*dedit)
-{
-	e_date_edit_set_use_24_hour_format (dedit, !e_date_edit_get_use_24_hour_format (dedit));
-}
-
-
-#if 0
-static void
-on_date_changed		(EDateEdit	*dedit,
-			 gchar		*name)
-{
-	gint year, month, day;
-
-	if (e_date_edit_date_is_valid (dedit)) {
-		if (e_date_edit_get_date (dedit, &year, &month, &day)) {
-			g_print ("Date %s changed to: %i/%i/%i (M/D/Y)\n",
-				 name, month, day, year);
-		} else {
-			g_print ("Date %s changed to: None\n", name);
-		}
-	} else {
-		g_print ("Date %s changed to: Not Valid\n", name);
-	}
-}
-
-
-static void
-on_time_changed		(EDateEdit	*dedit,
-			 gchar		*name)
-{
-	gint hour, minute;
-
-	if (e_date_edit_time_is_valid (dedit)) {
-		if (e_date_edit_get_time_of_day (dedit, &hour, &minute)) {
-			g_print ("Time %s changed to: %02i:%02i\n", name,
-				 hour, minute);
-		} else {
-			g_print ("Time %s changed to: None\n", name);
-		}
-	} else {
-		g_print ("Time %s changed to: Not Valid\n", name);
-	}
-}
-#endif
-
-
-static void
-on_changed		(EDateEdit	*dedit,
-			 gchar		*name)
-{
-	gint year, month, day, hour, minute;
-
-	g_print ("Date %s changed ", name);
-
-	if (e_date_edit_date_is_valid (dedit)) {
-		if (e_date_edit_get_date (dedit, &year, &month, &day)) {
-			g_print ("M/D/Y: %i/%i/%i", month, day, year);
-		} else {
-			g_print ("None");
-		}
-	} else {
-		g_print ("Date Invalid");
-	}
-
-	if (e_date_edit_time_is_valid (dedit)) {
-		if (e_date_edit_get_time_of_day (dedit, &hour, &minute)) {
-			g_print (" %02i:%02i\n", hour, minute);
-		} else {
-			g_print (" None\n");
-		}
-	} else {
-		g_print (" Time Invalid\n");
-	}
-}
-
-
diff --git a/widgets/misc/test-dropdown-button.c b/widgets/misc/test-dropdown-button.c
deleted file mode 100644
index 259e344bcb..0000000000
--- a/widgets/misc/test-dropdown-button.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-dropdown-menu.c
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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.
- *
- * Authors:
- *   Ettore Perazzoli <ettore@ximian.com>
- *   Damon Chaplin <damon@ximian.com> 
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <glib.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkwindow.h>
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-app-helper.h>
-#include <libgnomeui/gnome-init.h>
-#include <libgnomeui/gnome-stock.h>
-#include "e-dropdown-button.h"
-
-
-/* (The following is shameless stolen from `testgnome.c'.  */
-
-static void
-item_activated (GtkWidget *widget,
-		void *data)
-{
-	printf ("%s activated.\n", (char *) data);
-}
-
-static GnomeUIInfo ui_info[] = {
-	{ GNOME_APP_UI_ITEM, "_New", "Create a new file", item_activated, "file/new", NULL,
-	  GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_NEW, 'n', GDK_CONTROL_MASK, NULL },
-	{ GNOME_APP_UI_ITEM, "_Open...", "Open an existing file", item_activated, "file/open", NULL,
-	  GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_OPEN, 'o', GDK_CONTROL_MASK, NULL },
-	{ GNOME_APP_UI_ITEM, "_Save", "Save the current file", item_activated, "file/save", NULL,
-	  GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_SAVE, 's', GDK_CONTROL_MASK, NULL },
-	{ GNOME_APP_UI_ITEM, "Save _as...", "Save the current file with a new name", item_activated, "file/save as", NULL,
-	  GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_SAVE_AS, 0, 0, NULL },
-
-	GNOMEUIINFO_SEPARATOR,
-
-	{ GNOME_APP_UI_ITEM, "_Print...", "Print the current file", item_activated, "file/print", NULL,
-	  GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_PRINT, 'p', GDK_CONTROL_MASK, NULL },
-
-	GNOMEUIINFO_SEPARATOR,
-
-	{ GNOME_APP_UI_ITEM, "_Close", "Close the current file", item_activated, "file/close", NULL,
-	  GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_CLOSE, 0, 0, NULL },
-	{ GNOME_APP_UI_ITEM, "E_xit", "Exit the program", item_activated, "file/exit", NULL,
-	  GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_EXIT, 'q', GDK_CONTROL_MASK, NULL },
-	GNOMEUIINFO_END
-};
-
-
-int
-main (int argc, char **argv)
-{
-	GtkWidget *window;
-	GtkWidget *menu;
-	GtkWidget *dropdown_button;
-
-	gnome_init ("test-dropdown-button", "0.0", argc, argv);
-
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_default_size (GTK_WINDOW (window), 1, 1);
-
-	menu = gtk_menu_new ();
-
-	gnome_app_fill_menu (GTK_MENU_SHELL (menu), ui_info, NULL, TRUE, 0);
-
-	dropdown_button = e_dropdown_button_new ("Me_nu", GTK_MENU (menu));
-	gtk_container_add (GTK_CONTAINER (window), dropdown_button);
-
-	gtk_widget_show (window);
-	gtk_widget_show (dropdown_button);
-
-	gtk_main ();
-
-	return 0;
-}
diff --git a/widgets/misc/test-title-bar.c b/widgets/misc/test-title-bar.c
deleted file mode 100644
index d46c679ae8..0000000000
--- a/widgets/misc/test-title-bar.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-title-bar.c
- *
- * Copyright (C) 2000 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtkbox.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtktext.h>
-#include <gtk/gtkvbox.h>
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-init.h>
-#include "e-title-bar.h"
-
-static void
-delete_event_cb (GtkWidget *widget,
-		 GdkEventAny *event,
-		 gpointer data)
-{
-	gtk_main_quit ();
-}
-
-int
-main (int argc, char **argv)
-{
-	GtkWidget *app;
-	GtkWidget *title_bar;
-	GtkWidget *text;
-	GtkWidget *vbox;
-
-	gnome_init ("test-title-bar", "0.0", argc, argv);
-
-	app = gnome_app_new ("Test", "Test");
-	gtk_window_set_default_size (GTK_WINDOW (app), 400, 400);
-	gtk_window_set_policy (GTK_WINDOW (app), FALSE, TRUE, FALSE);
-
-	gtk_signal_connect (GTK_OBJECT (app), "delete_event", GTK_SIGNAL_FUNC (delete_event_cb), NULL);
-
-	title_bar = e_title_bar_new ("This is a very annoyingly long title bar");
-	gtk_widget_show (title_bar);
-
-	text = gtk_text_new (NULL, NULL);
-	gtk_widget_show (text);
-
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), title_bar, FALSE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), text, TRUE, TRUE, 0);
-	gtk_widget_show (vbox);
-
-	gnome_app_set_contents (GNOME_APP (app), vbox);
-	gtk_widget_show (app);
-
-	gtk_main ();
-
-	return 0;
-}
diff --git a/widgets/table/.cvsignore b/widgets/table/.cvsignore
deleted file mode 100644
index b1004fee2c..0000000000
--- a/widgets/table/.cvsignore
+++ /dev/null
@@ -1,13 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-table-test
-table-example-1
-table-example-2
-table-size-test
-tree-example-1
-tree-example-2
diff --git a/widgets/table/add-col.xpm b/widgets/table/add-col.xpm
deleted file mode 100644
index 9c5f314c8e..0000000000
--- a/widgets/table/add-col.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * add_col_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"                ",
-"                ",
-"                ",
-"                ",
-" .............. ",
-" .++++++++++++. ",
-" .++++++++++++. ",
-" ....+++....... ",
-"     .+.        ",
-"      .         ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                "};
diff --git a/widgets/table/arrow-down.xpm b/widgets/table/arrow-down.xpm
deleted file mode 100644
index f1e6cb4b3c..0000000000
--- a/widgets/table/arrow-down.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static const char * arrow_down_xpm[] = {
-"13 16 2 1",
-" 	c None",
-".	c #FF0000",
-"     ...     ",
-"     ...     ",
-"     ...     ",
-"     ...     ",
-"     ...     ",
-"     ...     ",
-"     ...     ",
-"     ...     ",
-"     ...     ",
-".............",
-" ........... ",
-"  .........  ",
-"   .......   ",
-"    .....    ",
-"     ...     ",
-"      .      "};
diff --git a/widgets/table/arrow-up.xpm b/widgets/table/arrow-up.xpm
deleted file mode 100644
index 0cc5b9a00c..0000000000
--- a/widgets/table/arrow-up.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static const char * arrow_up_xpm[] = {
-"13 16 2 1",
-" 	c None",
-".	c #FF0000",
-"      .      ",
-"     ...     ",
-"    .....    ",
-"   .......   ",
-"  .........  ",
-" ........... ",
-".............",
-"     ...     ",
-"     ...     ",
-"     ...     ",
-"     ...     ",
-"     ...     ",
-"     ...     ",
-"     ...     ",
-"     ...     ",
-"     ...     "};
diff --git a/widgets/table/check-empty.xpm b/widgets/table/check-empty.xpm
deleted file mode 100644
index 746b20234e..0000000000
--- a/widgets/table/check-empty.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static const char * check_empty_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #000000",
-"                ",
-"                ",
-"  ............  ",
-"  .          .  ",
-"  .          .  ",
-"  .          .  ",
-"  .          .  ",
-"  .          .  ",
-"  .          .  ",
-"  .          .  ",
-"  .          .  ",
-"  .          .  ",
-"  .          .  ",
-"  ............  ",
-"                ",
-"                "};
diff --git a/widgets/table/check-filled.xpm b/widgets/table/check-filled.xpm
deleted file mode 100644
index c0468fc25b..0000000000
--- a/widgets/table/check-filled.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static const char * check_filled_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #000000",
-"                ",
-"                ",
-"  ............  ",
-"  .          .  ",
-"  .        . .  ",
-"  .       .. .  ",
-"  .      ... .  ",
-"  . .   ...  .  ",
-"  . .. ...   .  ",
-"  . .....    .  ",
-"  .  ...     .  ",
-"  .   .      .  ",
-"  .          .  ",
-"  ............  ",
-"                ",
-"                "};
diff --git a/widgets/table/clip.png b/widgets/table/clip.png
deleted file mode 100644
index 27aa5f072f..0000000000
--- a/widgets/table/clip.png
+++ /dev/null
diff --git a/widgets/table/e-cell-checkbox.c b/widgets/table/e-cell-checkbox.c
deleted file mode 100644
index 2857388cb6..0000000000
--- a/widgets/table/e-cell-checkbox.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * e-cell-checkbox.c: Checkbox cell renderer
- *
- * Author:
- *   Miguel de Icaza (miguel@kernel.org)
- *
- * (C) 1999, 2000 Ximian, Inc
- */
-#include <config.h>
-#include <gtk/gtkenums.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gdk/gdkkeysyms.h>
-#include <libgnomeui/gnome-canvas.h>
-#include "e-cell-checkbox.h"
-#include "gal/util/e-util.h"
-#include "e-table-item.h"
-
-#include "check-empty.xpm"
-#include "check-filled.xpm"
-
-#define PARENT_TYPE e_cell_toggle_get_type ()
-
-static GdkPixbuf *checks [2];
-
-static void
-e_cell_checkbox_class_init (GtkObjectClass *object_class)
-{
-	checks [0] = gdk_pixbuf_new_from_xpm_data (check_empty_xpm);
-	checks [1] = gdk_pixbuf_new_from_xpm_data (check_filled_xpm);
-}
-
-E_MAKE_TYPE(e_cell_checkbox, "ECellCheckbox", ECellCheckbox, e_cell_checkbox_class_init, NULL, PARENT_TYPE);
-
-/**
- * e_cell_checkbox_new:
- *
- * Creates a new ECell renderer that can be used to render check
- * boxes.  the data provided from the model is cast to an integer.
- * zero is used for the off display, and non-zero for checked status.
- * 
- * Returns: an ECell object that can be used to render checkboxes.
- */
-ECell *
-e_cell_checkbox_new (void)
-{
-	ECellCheckbox *eccb = gtk_type_new (e_cell_checkbox_get_type ());
-
-	e_cell_toggle_construct (E_CELL_TOGGLE (eccb), 2, 2, checks);
-      
-	return (ECell *) eccb;
-}
diff --git a/widgets/table/e-cell-checkbox.h b/widgets/table/e-cell-checkbox.h
deleted file mode 100644
index 60c0341fe7..0000000000
--- a/widgets/table/e-cell-checkbox.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef _E_CELL_CHECKBOX_H_
-#define _E_CELL_CHECKBOX_H_
-
-#include <gal/e-table/e-cell-toggle.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_CELL_CHECKBOX_TYPE        (e_cell_checkbox_get_type ())
-#define E_CELL_CHECKBOX(o)          (GTK_CHECK_CAST ((o), E_CELL_CHECKBOX_TYPE, ECellCheckbox))
-#define E_CELL_CHECKBOX_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CELL_CHECKBOX_TYPE, ECellCheckboxClass))
-#define E_IS_CELL_CHECKBOX(o)       (GTK_CHECK_TYPE ((o), E_CELL_CHECKBOX_TYPE))
-#define E_IS_CELL_CHECKBOX_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CELL_CHECKBOX_TYPE))
-
-typedef struct {
-	ECellToggle parent;
-} ECellCheckbox;
-
-typedef struct {
-	ECellToggleClass parent_class;
-} ECellCheckboxClass;
-
-GtkType    e_cell_checkbox_get_type (void);
-ECell     *e_cell_checkbox_new      (void);
-
-END_GNOME_DECLS
-
-#endif /* _E_CELL_CHECKBOX_H_ */
-
diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c
deleted file mode 100644
index 407420e14b..0000000000
--- a/widgets/table/e-cell-combo.c
+++ /dev/null
@@ -1,628 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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
- */
-
-/*
- * ECellCombo - a subclass of ECellPopup used to support popup lists like a
- * GtkCombo widget. It only supports a basic popup list of strings at present,
- * with no auto-completion.
- */
-
-/*
- * Notes: (handling pointer grabs and GTK+ grabs is a nightmare!)
- *
- * o We must grab the pointer when we show the popup, so that if any buttons
- *   are pressed outside the application we hide the popup.
- *
- * o We have to be careful when popping up any widgets which also grab the
- *   pointer at some point, since we will lose our own pointer grab.
- *   When we pop up a list it will grab the pointer itself when an item is
- *   selected, and release the grab when the button is released.
- *   Fortunately we hide the popup at this point, so it isn't a problem.
- *   But for other types of widgets in the popup it could cause trouble.
- *   - I think GTK+ should provide help for this (nested pointer grabs?).
- *
- * o We must set the 'owner_events' flag of the pointer grab to TRUE so that
- *   pointer events get reported to all the application windows as normal.
- *   If we don't do this then the widgets in the popup may not work properly.
- *
- * o We must do a gtk_grab_add() so that we only allow events to go to the
- *   widgets within the popup (though some special events still get reported
- *   to the widget owning the window). Doing th gtk_grab_add() on the toplevel
- *   popup window should be fine. We can then check for any events that should
- *   close the popup, like the Escape key, or a button press outside the popup.
- */
-
-#include <config.h>
-#include <string.h> /* strcmp() */
-#include <gdk/gdkkeysyms.h>
-#include "gal/util/e-util.h"
-#include "e-table-item.h"
-#include "e-cell-combo.h"
-
-
-/* The height to make the popup list if there aren't any items in it. */
-#define	E_CELL_COMBO_LIST_EMPTY_HEIGHT	15
-
-
-static void e_cell_combo_class_init	(GtkObjectClass	*object_class);
-static void e_cell_combo_init		(ECellCombo	*ecc);
-static void e_cell_combo_destroy	(GtkObject	*object);
-
-static gint e_cell_combo_do_popup	(ECellPopup	*ecp,
-					 GdkEvent	*event);
-static void e_cell_combo_select_matching_item	(ECellCombo	*ecc);
-static void e_cell_combo_show_popup	(ECellCombo	*ecc);
-static void e_cell_combo_get_popup_pos	(ECellCombo	*ecc,
-					 gint		*x,
-					 gint		*y,
-					 gint		*height,
-					 gint		*width);
-
-static gint e_cell_combo_button_press	(GtkWidget	*popup_window,
-					 GdkEvent	*event,
-					 ECellCombo	*ecc);
-static gint e_cell_combo_button_release	(GtkWidget	*popup_window,
-					 GdkEventButton	*event,
-					 ECellCombo	*ecc);
-static int e_cell_combo_key_press	(GtkWidget	*popup_window,
-					 GdkEventKey	*event,
-					 ECellCombo	*ecc);
-
-static void e_cell_combo_update_cell	(ECellCombo	*ecc);
-static void e_cell_combo_restart_edit	(ECellCombo	*ecc);
-
-
-static ECellPopupClass *parent_class;
-
-
-E_MAKE_TYPE (e_cell_combo, "ECellCombo", ECellCombo,
-	     e_cell_combo_class_init, e_cell_combo_init,
-	     e_cell_popup_get_type());
-
-
-static void
-e_cell_combo_class_init			(GtkObjectClass	*object_class)
-{
-	ECellPopupClass *ecpc = (ECellPopupClass *) object_class;
-
-	object_class->destroy = e_cell_combo_destroy;
-
-	ecpc->popup = e_cell_combo_do_popup;
-
-	parent_class = gtk_type_class (e_cell_popup_get_type ());
-}
-
-
-static void
-e_cell_combo_init			(ECellCombo	*ecc)
-{
-	GtkWidget *frame;
-
-	/* We create one popup window for the ECell, since there will only
-	   ever be one popup in use at a time. */
-	ecc->popup_window = gtk_window_new (GTK_WINDOW_POPUP);
-
-	gtk_window_set_policy (GTK_WINDOW (ecc->popup_window),
-			       TRUE, TRUE, FALSE);
-  
-	frame = gtk_frame_new (NULL);
-	gtk_container_add (GTK_CONTAINER (ecc->popup_window), frame);
-	gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
-	gtk_widget_show (frame);
-
-	ecc->popup_scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window),
-					GTK_POLICY_AUTOMATIC,
-					GTK_POLICY_AUTOMATIC);
-	GTK_WIDGET_UNSET_FLAGS (GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window)->hscrollbar, GTK_CAN_FOCUS);
-	GTK_WIDGET_UNSET_FLAGS (GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window)->vscrollbar, GTK_CAN_FOCUS);
-	gtk_container_add (GTK_CONTAINER (frame), ecc->popup_scrolled_window);
-	gtk_widget_show (ecc->popup_scrolled_window);
-
-	ecc->popup_list = gtk_list_new ();
-	gtk_list_set_selection_mode (GTK_LIST (ecc->popup_list),
-				     GTK_SELECTION_BROWSE);
-	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window), ecc->popup_list);
-	gtk_container_set_focus_vadjustment (GTK_CONTAINER (ecc->popup_list),
-					     gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window)));
-	gtk_container_set_focus_hadjustment (GTK_CONTAINER (ecc->popup_list),
-					     gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window)));
-	gtk_widget_show (ecc->popup_list);
-
-	gtk_signal_connect (GTK_OBJECT (ecc->popup_window),
-			    "button_press_event",
-			    GTK_SIGNAL_FUNC (e_cell_combo_button_press),
-			    ecc);
-	/* We use connect_after here so the list updates the selection before
-	   we hide the popup and update the cell. */
-	gtk_signal_connect_after (GTK_OBJECT (ecc->popup_window),
-				  "button_release_event",
-				  GTK_SIGNAL_FUNC (e_cell_combo_button_release),
-				  ecc);
-	gtk_signal_connect (GTK_OBJECT (ecc->popup_window),
-			    "key_press_event",
-			    GTK_SIGNAL_FUNC (e_cell_combo_key_press), ecc);
-}
-
-
-/**
- * e_cell_combo_new:
- *
- * Creates a new ECellCombo renderer.
- *
- * Returns: an ECellCombo object.
- */
-ECell *
-e_cell_combo_new			(void)
-{
-	ECellCombo *ecc = gtk_type_new (e_cell_combo_get_type ());
-
-	return (ECell*) ecc;
-}
-
-
-/*
- * GtkObject::destroy method
- */
-static void
-e_cell_combo_destroy			(GtkObject *object)
-{
-	ECellCombo *ecc = E_CELL_COMBO (object);
-
-	gtk_widget_unref (ecc->popup_window);
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-
-
-void
-e_cell_combo_set_popdown_strings	(ECellCombo	*ecc, 
-					 GList		*strings)
-{
-	GList *elem;
-	GtkWidget *listitem;
-
-	g_return_if_fail (E_IS_CELL_COMBO (ecc));
-	g_return_if_fail (strings != NULL);
-
-	gtk_list_clear_items (GTK_LIST (ecc->popup_list), 0, -1);
-	elem = strings;
-	while (elem) {
-		listitem = gtk_list_item_new_with_label ((gchar *) elem->data);
-		gtk_widget_show (listitem);
-		gtk_container_add (GTK_CONTAINER (ecc->popup_list), listitem);
-		elem = elem->next;
-	}
-}
-
-
-static gint
-e_cell_combo_do_popup			(ECellPopup	*ecp,
-					 GdkEvent	*event)
-{
-	ECellCombo *ecc = E_CELL_COMBO (ecp);
-	guint32 time;
-	gint error_code;
-
-	e_cell_combo_show_popup (ecc);
-	e_cell_combo_select_matching_item (ecc);
-
-	if (event->type == GDK_BUTTON_PRESS) {
-		GTK_LIST (ecc->popup_list)->drag_selection = TRUE;
-		time = event->button.time;
-	} else {
-		time = event->key.time;
-	}
-
-	error_code = gdk_pointer_grab (ecc->popup_list->window, TRUE,
-				       GDK_ENTER_NOTIFY_MASK |
-				       GDK_BUTTON_PRESS_MASK | 
-				       GDK_BUTTON_RELEASE_MASK |
-				       GDK_POINTER_MOTION_HINT_MASK |
-				       GDK_BUTTON1_MOTION_MASK,
-				       NULL, NULL, time);
-	if (error_code != 0)
-		g_warning ("Failed to get pointer grab (%i)", error_code);
-	gtk_grab_add (ecc->popup_window);
-
-	return TRUE;
-}
-
-
-static void
-e_cell_combo_select_matching_item	(ECellCombo	*ecc)
-{
-	ECellPopup *ecp = E_CELL_POPUP (ecc);
-	ECellView *ecv = (ECellView*) ecp->popup_cell_view;
-	ETableItem *eti = E_TABLE_ITEM (ecp->popup_cell_view->cell_view.e_table_item_view);
-	ETableCol *ecol;
-	GtkList *list;
-	GtkWidget *listitem, *label;
-	GList *elem;
-	gboolean found = FALSE;
-	char *cell_text, *list_item_text;
-
-	ecol = e_table_header_get_column (eti->header, ecp->popup_view_col);
-	cell_text = e_table_model_value_at (ecv->e_table_model,
-					    ecol->col_idx, ecp->popup_row);
-
-	list = GTK_LIST (ecc->popup_list);
-	elem = list->children;
-	while (elem) {
-		listitem = GTK_WIDGET (elem->data);
-		label = GTK_BIN (listitem)->child;
-		gtk_label_get (GTK_LABEL (label), &list_item_text);
-
-		if (!strcmp (list_item_text, cell_text)) {
-			found = TRUE;
-			gtk_list_select_child (list, listitem);
-			gtk_widget_grab_focus (listitem);
-			break;
-		}
-
-		elem = elem->next;
-	}
-
-	if (!found) {
-		gtk_list_unselect_all (list);
-		if (list->children)
-			gtk_widget_grab_focus (GTK_WIDGET (list->children->data));
-	}
-}
-
-
-static void
-e_cell_combo_show_popup			(ECellCombo	*ecc)
-{
-	gint x, y, width, height, old_width, old_height;
-
-	g_print ("In e_cell_popup_popup_list\n");
-
-	/* This code is practically copied from GtkCombo. */
-	old_width = ecc->popup_window->allocation.width;
-	old_height  = ecc->popup_window->allocation.height;
-
-	e_cell_combo_get_popup_pos (ecc, &x, &y, &height, &width);
-
-	/* workaround for gtk_scrolled_window_size_allocate bug */
-	if (old_width != width || old_height != height) {
-		gtk_widget_hide (GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window)->hscrollbar);
-		gtk_widget_hide (GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window)->vscrollbar);
-	}
-
-	gtk_widget_set_uposition (ecc->popup_window, x, y);
-	gtk_widget_set_usize (ecc->popup_window, width, height);
-	gtk_widget_realize (ecc->popup_window);
-	gdk_window_resize (ecc->popup_window->window, width, height);
-	gtk_widget_show (ecc->popup_window);
-
-	E_CELL_POPUP (ecc)->popup_shown = TRUE;
-}
-
-
-/* Calculates the size and position of the popup window (like GtkCombo). */
-static void
-e_cell_combo_get_popup_pos		(ECellCombo	*ecc,
-					 gint		*x,
-					 gint		*y,
-					 gint		*height,
-					 gint		*width)
-{
-	ECellPopup *ecp = E_CELL_POPUP (ecc);
-	ETableItem *eti = E_TABLE_ITEM (ecp->popup_cell_view->cell_view.e_table_item_view);
-	GtkWidget *canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (eti)->canvas);
-	GtkBin *popwin;
-	GtkScrolledWindow *popup;
-	GtkRequisition list_requisition;
-	gboolean show_vscroll = FALSE, show_hscroll = FALSE;
-	gint avail_height, avail_width, min_height, work_height, screen_width;
-	gint column_width, row_height, scrollbar_width;
-	double x1, y1;
-	double wx, wy;
-  
-	/* This code is practically copied from GtkCombo. */
-	popup  = GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window);
-	popwin = GTK_BIN (ecc->popup_window);
-  
-	gdk_window_get_origin (canvas->window, x, y);
-
-	x1 = e_table_header_col_diff (eti->header, 0, eti->editing_col + 1);
-	y1 = e_table_item_row_diff (eti, 0, eti->editing_row + 1);
-	column_width = e_table_header_col_diff (eti->header, eti->editing_col,
-						eti->editing_col + 1);
-	row_height = e_table_item_row_diff (eti, eti->editing_row,
-					    eti->editing_row + 1);
-	gnome_canvas_item_i2w (GNOME_CANVAS_ITEM (eti), &x1, &y1);
-
-	gnome_canvas_world_to_window (GNOME_CANVAS (canvas),
-				      x1,
-				      y1,
-				      &wx,
-				      &wy);
-	x1 = wx;
-	y1 = wy;
-	
-	*x += x1;
-	/* The ETable positions don't include the grid lines, I think, so we
-	   add 1. */
-	*y += y1 + 1;
-
-	scrollbar_width = popup->vscrollbar->requisition.width
-		+ GTK_SCROLLED_WINDOW_CLASS (GTK_OBJECT (popup)->klass)->scrollbar_spacing;
-
-	avail_height = gdk_screen_height () - *y;
-
-	/* We'll use the entire screen width if needed, but we save space for
-	   the vertical scrollbar in case we need to show that. */
-	screen_width = gdk_screen_width ();
-	avail_width = screen_width - scrollbar_width;
-  
-	gtk_widget_size_request (ecc->popup_list, &list_requisition);
-	min_height = MIN (list_requisition.height, 
-			  popup->vscrollbar->requisition.height);
-	if (!GTK_LIST (ecc->popup_list)->children)
-		list_requisition.height += E_CELL_COMBO_LIST_EMPTY_HEIGHT;
-  
-	/* Calculate the desired width. */
-	*width = list_requisition.width
-		+ 2 * popwin->child->style->klass->xthickness
-		+ 2 * GTK_CONTAINER (popwin->child)->border_width
-		+ 2 * GTK_CONTAINER (popup)->border_width
-		+ 2 * GTK_CONTAINER (GTK_BIN (popup)->child)->border_width
-		+ 2 * GTK_BIN (popup)->child->style->klass->xthickness;
-
-	/* Use at least the same width as the column. */
-	if (*width < column_width)
-		*width = column_width;
-
-	/* If it is larger than the available width, use that instead and show
-	   the horizontal scrollbar. */
-	if (*width > avail_width) {
-		*width = avail_width;
-		show_hscroll = TRUE;
-	}
-
-	/* Calculate all the borders etc. that we need to add to the height. */
-	work_height = (2 * popwin->child->style->klass->ythickness
-		       + 2 * GTK_CONTAINER (popwin->child)->border_width
-		       + 2 * GTK_CONTAINER (popup)->border_width
-		       + 2 * GTK_CONTAINER (GTK_BIN (popup)->child)->border_width
-		       + 2 * GTK_BIN (popup)->child->style->klass->xthickness);
-
-	/* Add on the height of the horizontal scrollbar if we need it. */
-	if (show_hscroll)
-		work_height += popup->hscrollbar->requisition.height +
-			GTK_SCROLLED_WINDOW_CLASS (GTK_OBJECT (popup)->klass)->scrollbar_spacing;
-
-	/* Check if it fits in the available height. */
-	if (work_height + list_requisition.height > avail_height) {
-		/* It doesn't fit, so we see if we have the minimum space
-		   needed. */
-		if (work_height + min_height > avail_height
-		    && *y - row_height > avail_height) {
-			/* We don't, so we show the popup above the cell
-			   instead of below it. */
-			avail_height = *y - row_height;
-			*y -= (work_height + list_requisition.height
-			       + row_height);
-			if (*y < 0)
-				*y = 0;
-		}
-	}
-
-	/* Check if we still need the vertical scrollbar. */
-	if (work_height + list_requisition.height > avail_height) {
-		*width += scrollbar_width;
-		show_vscroll = TRUE;
-	}
-
-	/* We try to line it up with the right edge of the column, but we don't
-	   want it to go off the edges of the screen. */
-	if (*x > screen_width)
-		*x = screen_width;
-	*x -= *width;
-	if (*x < 0)
-		*x = 0;
-
-	if (show_vscroll)
-		*height = avail_height;
-	else
-		*height = work_height + list_requisition.height;
-}
-
-
-
-
-
-
-/* This handles button press events in the popup window.
-   Note that since we have a pointer grab on this window, we also get button
-   press events for windows outside the application here, so we hide the popup
-   window if that happens. We also get propagated events from child widgets
-   which we ignore. */
-static gint
-e_cell_combo_button_press		(GtkWidget	*popup_window,
-					 GdkEvent	*event,
-					 ECellCombo	*ecc)
-{
-	GtkWidget *event_widget;
-
-	g_print ("In e_cell_combo_button_press\n");
-
-	event_widget = gtk_get_event_widget (event);
-
-	/* If the button press was for a widget inside the popup list, but
-	   not the popup window itself, then we ignore the event and return
-	   FALSE. Otherwise we will hide the popup.
-	   Note that since we have a pointer grab on the popup list, button
-	   presses outside the application will be reported to this window,
-	   which is why we hide the popup in this case. */
-	while (event_widget) {
-		event_widget = event_widget->parent;
-		if (event_widget == ecc->popup_list)
-			return FALSE;
-	}
-
-	gtk_grab_remove (ecc->popup_window);
-	gdk_pointer_ungrab (event->button.time);
-	gtk_widget_hide (ecc->popup_window);
-
-	E_CELL_POPUP (ecc)->popup_shown = FALSE;
-
-	/* We don't want to update the cell here. Since the list is in browse
-	   mode there will always be one item selected, so when we popup the
-	   list one item is selected even if it doesn't match the current text
-	   in the cell. So if you click outside the popup (which is what has
-	   happened here) it is better to not update the cell. */
-	/*e_cell_combo_update_cell (ecc);*/
-	e_cell_combo_restart_edit (ecc);
-
-	return TRUE;
-}
-
-
-/* This handles button release events in the popup window. If the button is
-   released inside the list, we want to hide the popup window and update the
-   cell with the new selection. */
-static gint
-e_cell_combo_button_release		(GtkWidget	*popup_window,
-					 GdkEventButton	*event,
-					 ECellCombo	*ecc)
-{
-	GtkWidget *event_widget;
-
-	event_widget = gtk_get_event_widget ((GdkEvent*) event);
-  
-	g_print ("In e_cell_popup_button_release event_widget:%s\n",
-		 gtk_widget_get_name (event_widget));
-
-	/* See if the button was released in the list (or its children). */
-	while (event_widget && event_widget != ecc->popup_list)
-		event_widget = event_widget->parent;
-
-	/* If it wasn't, then we just ignore the event. */
-	if (event_widget != ecc->popup_list)
-		return FALSE;
-
-	/* The button was released inside the list, so we hide the popup and
-	   update the cell to reflect the new selection. */
-	gtk_grab_remove (ecc->popup_window);
-	gdk_pointer_ungrab (event->time);
-	gtk_widget_hide (ecc->popup_window);
-
-	E_CELL_POPUP (ecc)->popup_shown = FALSE;
-
-	e_cell_combo_update_cell (ecc);
-	e_cell_combo_restart_edit (ecc);
-
-	return TRUE;
-}
-
-
-/* This handles key press events in the popup window. If the Escape key is
-   pressed we hide the popup, and do not change the cell contents. */
-static int
-e_cell_combo_key_press			(GtkWidget	*popup_window,
-					 GdkEventKey	*event,
-					 ECellCombo	*ecc)
-{
-	g_print ("In e_cell_popup_key_press\n");
-
-	/* If the Escape key is pressed we hide the popup. */
-	if (event->keyval != GDK_Escape
-	    && event->keyval != GDK_Return
-	    && event->keyval != GDK_KP_Enter
-	    && event->keyval != GDK_ISO_Enter
-	    && event->keyval != GDK_3270_Enter)
-		return FALSE;
-
-	gtk_grab_remove (ecc->popup_window);
-	gdk_pointer_ungrab (event->time);
-	gtk_widget_hide (ecc->popup_window);
-
-	E_CELL_POPUP (ecc)->popup_shown = FALSE;
-
-	if (event->keyval != GDK_Escape)
-		e_cell_combo_update_cell (ecc);
-
-	e_cell_combo_restart_edit (ecc);
-
-	return TRUE;
-}
-
-
-static void
-e_cell_combo_update_cell		(ECellCombo	*ecc)
-{
-	ECellPopup *ecp = E_CELL_POPUP (ecc);
-	ECellView *ecv = (ECellView*) ecp->popup_cell_view;
-	ETableItem *eti = E_TABLE_ITEM (ecv->e_table_item_view);
-	ETableCol *ecol;
-	GtkList *list = GTK_LIST (ecc->popup_list);
-	GtkListItem *listitem;
-	gchar *text, *old_text;
-
-	g_print ("In e_cell_popup_update_cell\n");
-
-	/* Return if no item is selected. */
-	if (list->selection == NULL)
-		return;
-
-	/* Get the text of the selected item. */
-	listitem = list->selection->data;
-	gtk_label_get (GTK_LABEL (GTK_BIN (listitem)->child), &text);
-
-	/* Compare it with the existing cell contents. */
-	ecol = e_table_header_get_column (eti->header, ecp->popup_view_col);
-	old_text = e_table_model_value_at (ecv->e_table_model,
-					   ecol->col_idx, ecp->popup_row);
-
-	g_print ("   Old text: %s New text: %s\n", old_text, text);
-
-	/* If they are different, update the cell contents. */
-	if (strcmp (old_text, text)) {
-		g_print ("  Setting cell text...\n");
-		e_table_model_set_value_at (ecv->e_table_model,
-					    ecol->col_idx, ecp->popup_row,
-					    text);
-		g_print ("  Set cell text.\n");
-	}
-}
-
-
-static void
-e_cell_combo_restart_edit		(ECellCombo	*ecc)
-{
-	/* This doesn't work. ETable stops the edit straight-away again. */
-#if 0
-	ECellView *ecv = (ECellView*) ecc->popup_cell_view;
-	ETableItem *eti = E_TABLE_ITEM (ecv->e_table_item_view);
-
-	e_table_item_enter_edit (eti, ecc->popup_view_col, ecc->popup_row);
-#endif
-}
-
-
-
diff --git a/widgets/table/e-cell-combo.h b/widgets/table/e-cell-combo.h
deleted file mode 100644
index 9f8833d029..0000000000
--- a/widgets/table/e-cell-combo.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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
- */
-
-/*
- * ECellCombo - a subclass of ECellPopup used to support popup lists like a
- * GtkCombo widget. It only supports a basic popup list of strings at present,
- * with no auto-completion.
- */
-
-#ifndef _E_CELL_COMBO_H_
-#define _E_CELL_COMBO_H_
-
-#include <gal/e-table/e-cell-popup.h>
-
-#define E_CELL_COMBO_TYPE        (e_cell_combo_get_type ())
-#define E_CELL_COMBO(o)          (GTK_CHECK_CAST ((o), E_CELL_COMBO_TYPE, ECellCombo))
-#define E_CELL_COMBO_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CELL_COMBO_TYPE, ECellComboClass))
-#define E_IS_CELL_COMBO(o)       (GTK_CHECK_TYPE ((o), E_CELL_COMBO_TYPE))
-#define E_IS_CELL_COMBO_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CELL_COMBO_TYPE))
-
-
-typedef struct {
-	ECellPopup parent;
-
-	GtkWidget *popup_window;
-	GtkWidget *popup_scrolled_window;
-	GtkWidget *popup_list;
-} ECellCombo;
-
-typedef struct {
-	ECellPopupClass parent_class;
-} ECellComboClass;
-
-
-GtkType    e_cell_combo_get_type		(void);
-ECell     *e_cell_combo_new			(void);
-
-void       e_cell_combo_set_popdown_strings	(ECellCombo	*ecc, 
-						 GList		*strings);
-
-#endif /* _E_CELL_COMBO_H_ */
diff --git a/widgets/table/e-cell-date.c b/widgets/table/e-cell-date.c
deleted file mode 100644
index c8e2dd5f09..0000000000
--- a/widgets/table/e-cell-date.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* ECellDate - Date item for e-table.
- * Copyright (C) 2001 Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- */
-
-#include <config.h>
-#include <sys/time.h>
-#include <time.h>
-#include <unistd.h>
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-unicode.h>
-#include <gal/util/e-i18n.h>
-#include "e-cell-date.h"
-
-#define PARENT_TYPE e_cell_text_get_type ()
-
-static ECellTextClass *parent_class;
-
-static char *
-ecd_get_text(ECellText *cell, ETableModel *model, int col, int row)
-{
-	time_t date = GPOINTER_TO_INT (e_table_model_value_at(model, col, row));
-	time_t nowdate = time(NULL);
-	time_t yesdate;
-	struct tm then, now, yesterday;
-	char buf[26];
-	gboolean done = FALSE;
-
-	if (date == 0) {
-		return e_utf8_from_locale_string (_("?"));
-	}
-
-	localtime_r (&date, &then);
-	localtime_r (&nowdate, &now);
-
-	if (nowdate - date < 60 * 60 * 8 && nowdate > date) {
-		strftime (buf, 26, _("%l:%M %p"), &then);
-		done = TRUE;
-	}
-
-	if (!done) {
-		if (then.tm_mday == now.tm_mday &&
-		    then.tm_mon == now.tm_mon &&
-		    then.tm_year == now.tm_year) {
-			strftime (buf, 26, _("Today %l:%M %p"), &then);
-			done = TRUE;
-		}
-	}
-	if (!done) {
-		yesdate = nowdate - 60 * 60 * 24;
-		localtime_r (&yesdate, &yesterday);
-		if (then.tm_mday == yesterday.tm_mday &&
-		    then.tm_mon == yesterday.tm_mon &&
-		    then.tm_year == yesterday.tm_year) {
-#if 0
-			if (nowdate - date < 60 * 60 * 12) {
-				strftime (buf, 26, _("Late Yesterday %l:%M %p"), &then);
-			} else {
-#endif
-				strftime (buf, 26, _("Yesterday %l:%M %p"), &then);
-#if 0
-			}
-#endif
-			done = TRUE;
-		}
-	}
-	if (!done) {
-		int i;
-		for (i = 2; i < 7; i++) {
-			yesdate = nowdate - 60 * 60 * 24 * i;
-			localtime_r (&yesdate, &yesterday);
-			if (then.tm_mday == yesterday.tm_mday &&
-			    then.tm_mon == yesterday.tm_mon &&
-			    then.tm_year == yesterday.tm_year) {
-				strftime (buf, 26, _("%a %l:%M %p"), &then);
-				done = TRUE;
-				break;
-			}
-		}
-	}
-	if (!done) {
-		if (then.tm_year == now.tm_year) {
-			strftime (buf, 26, _("%b %d %l:%M %p"), &then);
-		} else {
-			strftime (buf, 26, _("%b %d %Y"), &then);
-		}
-	}
-#if 0
-#ifdef CTIME_R_THREE_ARGS
-	ctime_r (&date, buf, 26);
-#else
-	ctime_r (&date, buf);
-#endif
-#endif
-	
-	return e_utf8_from_locale_string (buf);
-}
-
-static void
-ecd_free_text(ECellText *cell, char *text)
-{
-	g_free(text);
-}
-
-static void
-e_cell_date_class_init (GtkObjectClass *object_class)
-{
-	ECellTextClass *ectc = (ECellTextClass *) object_class;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	ectc->get_text  = ecd_get_text;
-	ectc->free_text = ecd_free_text;
-}
-
-static void
-e_cell_date_init (GtkObject *object)
-{
-}
-
-/**
- * e_cell_date_new:
- * @fontname: font to be used to render on the screen
- * @justify: Justification of the string in the cell.
- *
- * Creates a new ECell renderer that can be used to render dates that
- * that come from the model.  The value returned from the model is
- * interpreted as being a time_t.
- *
- * The ECellDate object support a large set of properties that can be
- * configured through the Gtk argument system and allows the user to have
- * a finer control of the way the string is displayed.  The arguments supported
- * allow the control of strikeout, bold, color and a date filter.
- *
- * The arguments "strikeout_column", "bold_column" and "color_column" set
- * and return an integer that points to a column in the model that controls
- * these settings.  So controlling the way things are rendered is achieved
- * by having special columns in the model that will be used to flag whether
- * the date should be rendered with strikeout, or bolded.   In the case of
- * the "color_column" argument, the column in the model is expected to have
- * a string that can be parsed by gdk_color_parse().
- * 
- * Returns: an ECell object that can be used to render dates.
- */
-ECell *
-e_cell_date_new (const char *fontname, GtkJustification justify)
-{
-	ECellDate *ecd = gtk_type_new (e_cell_date_get_type ());
-
-	e_cell_text_construct(E_CELL_TEXT(ecd), fontname, justify);
-      
-	return (ECell *) ecd;
-}
-
-E_MAKE_TYPE(e_cell_date, "ECellDate", ECellDate, e_cell_date_class_init, e_cell_date_init, PARENT_TYPE);
diff --git a/widgets/table/e-cell-date.h b/widgets/table/e-cell-date.h
deleted file mode 100644
index 25bde7a85a..0000000000
--- a/widgets/table/e-cell-date.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* ECellDate - Date item for e-table.
- * Copyright (C) 2001 Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- */
-#ifndef _E_CELL_DATE_H_
-#define _E_CELL_DATE_H_
-
-#include <gal/e-table/e-cell-text.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_CELL_DATE_TYPE        (e_cell_date_get_type ())
-#define E_CELL_DATE(o)          (GTK_CHECK_CAST ((o), E_CELL_DATE_TYPE, ECellDate))
-#define E_CELL_DATE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CELL_DATE_TYPE, ECellDateClass))
-#define E_IS_CELL_DATE(o)       (GTK_CHECK_TYPE ((o), E_CELL_DATE_TYPE))
-#define E_IS_CELL_DATE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CELL_DATE_TYPE))
-
-typedef struct {
-	ECellText base;
-} ECellDate;
-
-typedef struct {
-	ECellTextClass parent_class;
-} ECellDateClass;
-
-GtkType    e_cell_date_get_type (void);
-ECell     *e_cell_date_new      (const char *fontname, GtkJustification justify);
-
-END_GNOME_DECLS
-
-#endif /* _E_CELL_DATE_H_ */
diff --git a/widgets/table/e-cell-float.c b/widgets/table/e-cell-float.c
deleted file mode 100644
index c11c8e945c..0000000000
--- a/widgets/table/e-cell-float.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2001 CodeFactory AB
- * Copyright (C) 2001 Mikael Hallendal <micke@codefactory.se>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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.
- *
- * Derived from e-cell-number by Chris Lahey <clahey@ximian.com>
- * ECellFloat - Float item for e-table.
- *
- * Author: Mikael Hallendal <micke@codefactory.se>
- */
-
-#include <config.h>
-#include <sys/time.h>
-#include <unistd.h>
-#include <gal/util/e-util.h>
-#include <gal/util/e-i18n.h>
-#include "e-cell-float.h"
-
-#define PARENT_TYPE e_cell_text_get_type ()
-
-static ECellTextClass *parent_class;
-
-static char *
-ecn_get_text(ECellText *cell, ETableModel *model, int col, int row)
-{
-	gfloat   *fvalue;
-	
-	fvalue = e_table_model_value_at (model, col, row);
-	
-	return e_format_number_float (*fvalue);
-}
-
-static void
-ecn_free_text(ECellText *cell, char *text)
-{
-	g_free(text);
-}
-
-static void
-e_cell_float_class_init (GtkObjectClass *object_class)
-{
-	ECellTextClass *ectc = (ECellTextClass *) object_class;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	ectc->get_text  = ecn_get_text;
-	ectc->free_text = ecn_free_text;
-}
-
-static void
-e_cell_float_init (GtkObject *object)
-{
-}
-
-/**
- * e_cell_float_new:
- * @fontname: font to be used to render on the screen
- * @justify: Justification of the string in the cell.
- *
- * Creates a new ECell renderer that can be used to render floats that
- * that come from the model.  The value returned from the model is
- * interpreted as being an int.
- *
- * See ECellText for other features.
- * 
- * Returns: an ECell object that can be used to render floats.
- */
-ECell *
-e_cell_float_new (const char *fontname, GtkJustification justify)
-{
-	ECellFloat *ecn = gtk_type_new (e_cell_float_get_type ());
-
-	e_cell_text_construct(E_CELL_TEXT(ecn), fontname, justify);
-      
-	return (ECell *) ecn;
-}
-
-E_MAKE_TYPE(e_cell_float, "ECellFloat", ECellFloat, e_cell_float_class_init, e_cell_float_init, PARENT_TYPE);
diff --git a/widgets/table/e-cell-float.h b/widgets/table/e-cell-float.h
deleted file mode 100644
index fe598f3831..0000000000
--- a/widgets/table/e-cell-float.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2001 CodeFactory AB
- * Copyright (C) 2001 Mikael Hallendal <micke@codefactory.se>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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.
- *
- * Derived from e-cell-number by Chros Lahey <clahey@ximian.com>
- * ECellFloat - Float item for e-table.
- *
- * Author: Mikael Hallendal <micke@codefactory.se>
- */
-
-#ifndef _E_CELL_FLOAT_H_
-#define _E_CELL_FLOAT_H_
-
-#include <gal/e-table/e-cell-text.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_CELL_FLOAT_TYPE        (e_cell_float_get_type ())
-#define E_CELL_FLOAT(o)          (GTK_CHECK_CAST ((o), E_CELL_FLOAT_TYPE, ECellFloat))
-#define E_CELL_FLOAT_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CELL_FLOAT_TYPE, ECellFloatClass))
-#define E_IS_CELL_FLOAT(o)       (GTK_CHECK_TYPE ((o), E_CELL_FLOAT_TYPE))
-#define E_IS_CELL_FLOAT_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CELL_FLOAT_TYPE))
-
-typedef struct {
-	ECellText base;
-} ECellFloat;
-
-typedef struct {
-	ECellTextClass parent_class;
-} ECellFloatClass;
-
-GtkType    e_cell_float_get_type (void);
-ECell     *e_cell_float_new      (const char *fontname, GtkJustification justify);
-
-END_GNOME_DECLS
-
-#endif /* _E_CELL_FLOAT_H_ */
diff --git a/widgets/table/e-cell-number.c b/widgets/table/e-cell-number.c
deleted file mode 100644
index d5f04d9d57..0000000000
--- a/widgets/table/e-cell-number.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* ECellNumber - Number item for e-table.
- * Copyright (C) 2001 Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- */
-
-#include <config.h>
-#include <sys/time.h>
-#include <unistd.h>
-#include <gal/util/e-util.h>
-#include <gal/util/e-i18n.h>
-#include "e-cell-number.h"
-
-#define PARENT_TYPE e_cell_text_get_type ()
-
-static ECellTextClass *parent_class;
-
-static char *
-ecn_get_text(ECellText *cell, ETableModel *model, int col, int row)
-{
-	return e_format_number(GPOINTER_TO_INT (e_table_model_value_at(model, col, row)));
-}
-
-static void
-ecn_free_text(ECellText *cell, char *text)
-{
-	g_free(text);
-}
-
-static void
-e_cell_number_class_init (GtkObjectClass *object_class)
-{
-	ECellTextClass *ectc = (ECellTextClass *) object_class;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	ectc->get_text  = ecn_get_text;
-	ectc->free_text = ecn_free_text;
-}
-
-static void
-e_cell_number_init (GtkObject *object)
-{
-}
-
-/**
- * e_cell_number_new:
- * @fontname: font to be used to render on the screen
- * @justify: Justification of the string in the cell.
- *
- * Creates a new ECell renderer that can be used to render numbers that
- * that come from the model.  The value returned from the model is
- * interpreted as being an int.
- *
- * See ECellText for other features.
- * 
- * Returns: an ECell object that can be used to render numbers.
- */
-ECell *
-e_cell_number_new (const char *fontname, GtkJustification justify)
-{
-	ECellNumber *ecn = gtk_type_new (e_cell_number_get_type ());
-
-	e_cell_text_construct(E_CELL_TEXT(ecn), fontname, justify);
-      
-	return (ECell *) ecn;
-}
-
-E_MAKE_TYPE(e_cell_number, "ECellNumber", ECellNumber, e_cell_number_class_init, e_cell_number_init, PARENT_TYPE);
diff --git a/widgets/table/e-cell-number.h b/widgets/table/e-cell-number.h
deleted file mode 100644
index b9124bb2b0..0000000000
--- a/widgets/table/e-cell-number.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* ECellNumber - Number item for e-table.
- * Copyright (C) 2001 Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- */
-#ifndef _E_CELL_NUMBER_H_
-#define _E_CELL_NUMBER_H_
-
-#include <gal/e-table/e-cell-text.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_CELL_NUMBER_TYPE        (e_cell_number_get_type ())
-#define E_CELL_NUMBER(o)          (GTK_CHECK_CAST ((o), E_CELL_NUMBER_TYPE, ECellNumber))
-#define E_CELL_NUMBER_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CELL_NUMBER_TYPE, ECellNumberClass))
-#define E_IS_CELL_NUMBER(o)       (GTK_CHECK_TYPE ((o), E_CELL_NUMBER_TYPE))
-#define E_IS_CELL_NUMBER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CELL_NUMBER_TYPE))
-
-typedef struct {
-	ECellText base;
-} ECellNumber;
-
-typedef struct {
-	ECellTextClass parent_class;
-} ECellNumberClass;
-
-GtkType    e_cell_number_get_type (void);
-ECell     *e_cell_number_new      (const char *fontname, GtkJustification justify);
-
-END_GNOME_DECLS
-
-#endif /* _E_CELL_NUMBER_H_ */
diff --git a/widgets/table/e-cell-pixbuf.c b/widgets/table/e-cell-pixbuf.c
deleted file mode 100644
index 3014c45019..0000000000
--- a/widgets/table/e-cell-pixbuf.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * e-cell-pixbuf.c: An ECell that displays a GdkPixbuf
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * Authors: Vladimir Vukicevic <vladimir@ximian.com>
- *
- */
-
-#include <stdio.h>
-#include <libgnomeui/gnome-canvas.h>
-#include "e-cell-pixbuf.h"
-
-static ECellClass *parent_class;
-
-typedef struct _ECellPixbufView ECellPixbufView;
-
-struct _ECellPixbufView {
-    ECellView cell_view;
-    GnomeCanvas *canvas;
-};
-
-/*
- * ECellPixbuf functions
- */
-
-ECell *
-e_cell_pixbuf_new (void)
-{
-    ECellPixbuf *ecp;
-
-    ecp = gtk_type_new (E_CELL_PIXBUF_TYPE);
-    e_cell_pixbuf_construct (ecp);
-
-    return (ECell *) ecp;
-}
-
-void
-e_cell_pixbuf_construct (ECellPixbuf *ecp)
-{
-    /* noop */
-    return;
-}
-
-/*
- * ECell methods
- */
-
-static ECellView *
-pixbuf_new_view (ECell *ecell, ETableModel *table_model, void *e_table_item_view)
-{
-    ECellPixbufView *pixbuf_view = g_new0 (ECellPixbufView, 1);
-    ETableItem *eti = E_TABLE_ITEM (e_table_item_view);
-    GnomeCanvas *canvas = GNOME_CANVAS_ITEM (eti)->canvas;
-
-    pixbuf_view->cell_view.ecell = ecell;
-    pixbuf_view->cell_view.e_table_model = table_model;
-    pixbuf_view->cell_view.e_table_item_view = e_table_item_view;
-    pixbuf_view->canvas = canvas;
-
-    return (ECellView *) pixbuf_view;
-}
-
-static void
-pixbuf_kill_view (ECellView *ecell_view)
-{
-    ECellPixbufView *pixbuf_view = (ECellPixbufView *) ecell_view;
-
-    g_free (pixbuf_view);
-}
-
-static void
-pixbuf_draw (ECellView *ecell_view, GdkDrawable *drawable,
-             int model_col, int view_col, int row, ECellFlags flags,
-             int x1, int y1, int x2, int y2)
-{
-    GdkPixbuf *cell_pixbuf;
-    int real_x, real_y, real_w, real_h;
-    int pix_w, pix_h;
-
-    cell_pixbuf = (GdkPixbuf *) e_table_model_value_at (ecell_view->e_table_model,
-                                                        model_col, row);
-    /* we can't make sure we really got a pixbuf since, well, it's a Gdk thing */
-
-    if (x2 - x1 == 0)
-        return;
-
-    if (!cell_pixbuf)
-	return;
-
-    pix_w = gdk_pixbuf_get_width (cell_pixbuf);
-    pix_h = gdk_pixbuf_get_height (cell_pixbuf);
-
-    /* We center the pixbuf within our allocated space */
-    if (x2 - x1 > pix_w) {
-        int diff = (x2 - x1) - pix_w;
-        real_x = x1 + diff/2;
-        real_w = pix_w;
-    } else {
-        real_x = x1;
-        real_w = x2 - x1;
-    }
-
-    if (y2 - y1 > pix_h) {
-        int diff = (y2 - y1) - pix_h;
-        real_y = y1 + diff/2;
-        real_h = pix_h;
-    } else {
-        real_y = y1;
-        real_h = y2 - y1;
-    }
-
-
-    gdk_pixbuf_render_to_drawable_alpha (cell_pixbuf,
-					 drawable,
-					 0, 0,
-					 real_x, real_y, 
-					 real_w, real_h,
-					 GDK_PIXBUF_ALPHA_BILEVEL,
-					 127,
-					 GDK_RGB_DITHER_NORMAL,
-					 0, 0);
-}
-
-static gint
-pixbuf_event (ECellView *ecell_view, GdkEvent *event,
-              int model_col, int view_col, int row,
-              ECellFlags flags, ECellActions *actions)
-{
-    /* noop */
-
-    return FALSE;
-}
-
-static gint
-pixbuf_height (ECellView *ecell_view, int model_col, int view_col, int row)
-{
-    GdkPixbuf *pixbuf;
-
-    pixbuf = (GdkPixbuf *) e_table_model_value_at (ecell_view->e_table_model, model_col, row);
-    if (!pixbuf)
-        return 0;
-
-    /* We give ourselves 3 pixels of padding on either side */
-    return gdk_pixbuf_get_height (pixbuf) + 6;
-}
-
-static gint
-pixbuf_max_width (ECellView *ecell_view, int model_col, int view_col)
-{
-    int pw;
-    gint num_rows, i;
-    gint max_width = -1;
-
-    if (model_col == 0) {
-        num_rows = e_table_model_row_count (ecell_view->e_table_model);
-
-        for (i = 0; i <= num_rows; i++) {
-            GdkPixbuf *pixbuf = (GdkPixbuf *) e_table_model_value_at
-                (ecell_view->e_table_model,
-                 model_col,
-                 i);
-	    if (!pixbuf)
-		continue;
-            pw = gdk_pixbuf_get_width (pixbuf);
-            if (max_width < pw)
-                max_width = pw;
-        }
-    } else {
-        return -1;
-    }
-
-    return max_width;
-}
-
-static void
-pixbuf_destroy (GtkObject *object)
-{
-    /* ... */
-}
-
-static void
-e_cell_pixbuf_init (GtkObject *object)
-{
-    /* ... */
-}
-
-static void
-e_cell_pixbuf_class_init (GtkObjectClass *object_class)
-{
-    ECellClass *ecc = (ECellClass *) object_class;
-
-    object_class->destroy = pixbuf_destroy;
-
-    ecc->new_view = pixbuf_new_view;
-    ecc->kill_view = pixbuf_kill_view;
-    ecc->draw = pixbuf_draw;
-    ecc->event = pixbuf_event;
-    ecc->height = pixbuf_height;
-    ecc->max_width = pixbuf_max_width;
-
-    parent_class = gtk_type_class (E_CELL_TYPE);
-}
-
-guint
-e_cell_pixbuf_get_type (void)
-{
-    static guint type = 0;
-
-    if (!type) {
-        GtkTypeInfo type_info = {
-            "ECellPixbuf",
-            sizeof (ECellPixbuf),
-            sizeof (ECellPixbufClass),
-            (GtkClassInitFunc) e_cell_pixbuf_class_init,
-            (GtkObjectInitFunc) e_cell_pixbuf_init,
-            (GtkArgSetFunc) NULL,
-            (GtkArgGetFunc) NULL,
-        };
-
-        type = gtk_type_unique (e_cell_get_type (), &type_info);
-    }
-
-    return type;
-}
-
diff --git a/widgets/table/e-cell-pixbuf.h b/widgets/table/e-cell-pixbuf.h
deleted file mode 100644
index 4bb009b655..0000000000
--- a/widgets/table/e-cell-pixbuf.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * e-cell-pixbuf.h: An ECell that displays a GdkPixbuf
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * Authors: Vladimir Vukicevic <vladimir@ximian.com>
- *
- */
-
-#ifndef _E_CELL_PIXBUF_H_
-#define _E_CELL_PIXBUF_H_
-
-#include <gal/e-table/e-table.h>
-
-#define E_CELL_PIXBUF_TYPE		(e_cell_pixbuf_get_type ())
-#define E_CELL_PIXBUF(o)		(GTK_CHECK_CAST ((o), E_CELL_PIXBUF_TYPE, ECellPixbuf))
-#define E_CELL_PIXBUF_CLASS(k)	(GTK_CHECK_CAST_CLASS ((k), E_CELL_PIXBUF_TYPE, ECellPixbufClass))
-#define E_IS_CELL_PIXBUF(o)		(GTK_CHECK_TYPE ((o), E_CELL_PIXBUF_TYPE))
-#define E_IS_CELL_PIXBUF_CLASS(k)	(GTK_CHECK_CLASS_TYPE ((k), E_CELL_PIXBUF_TYPE))
-
-typedef struct _ECellPixbuf ECellPixbuf;
-typedef struct _ECellPixbufClass ECellPixbufClass;
-
-struct _ECellPixbuf {
-    ECell parent;
-};
-
-struct _ECellPixbufClass {
-    ECellClass parent_class;
-};
-
-GtkType e_cell_pixbuf_get_type (void);
-ECell *e_cell_pixbuf_new (void);
-void e_cell_pixbuf_construct (ECellPixbuf *ecp);
-
-#endif
diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c
deleted file mode 100644
index 224227e209..0000000000
--- a/widgets/table/e-cell-popup.c
+++ /dev/null
@@ -1,504 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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
- */
-
-/*
- * ECellPopup - an abstract ECell class used to support popup selections like
- * a GtkCombo widget. It contains a child ECell, e.g. an ECellText, but when
- * selected it displays an arrow on the right edge which the user can click to
- * show a popup. Subclasses implement the popup class function to show the
- * popup.
- */
-
-#include <config.h>
-#include <gdk/gdkkeysyms.h>
-#include "gal/util/e-util.h"
-#include "e-table-item.h"
-#include "e-cell-popup.h"
-
-
-#define E_CELL_POPUP_ARROW_WIDTH	16
-#define E_CELL_POPUP_ARROW_XPAD		3
-#define E_CELL_POPUP_ARROW_YPAD		3
-
-
-static void	e_cell_popup_class_init	(GtkObjectClass	*object_class);
-static void	e_cell_popup_init	(ECellPopup	*ecp);
-static void	e_cell_popup_destroy	(GtkObject	*object);
-
-
-static ECellView* ecp_new_view		(ECell		*ecell,
-					 ETableModel	*table_model,
-					 void		*e_table_item_view);
-static void	ecp_kill_view		(ECellView	*ecv);
-static void	ecp_realize		(ECellView	*ecv);
-static void	ecp_unrealize		(ECellView	*ecv);
-static void	ecp_draw		(ECellView	*ecv,
-					 GdkDrawable	*drawable,
-					 int		 model_col,
-					 int		 view_col,
-					 int		 row,
-					 ECellFlags	 flags,
-					 int		 x1,
-					 int		 y1,
-					 int		 x2,
-					 int		 y2);
-static gint	ecp_event		(ECellView	*ecv,
-					 GdkEvent	*event,
-					 int		 model_col,
-					 int		 view_col,
-					 int		 row,
-					 ECellFlags	 flags,
-					 ECellActions	*actions);
-static int	ecp_height		(ECellView	*ecv,
-					 int		 model_col,
-					 int		 view_col,
-					 int		 row);
-static void*	ecp_enter_edit		(ECellView	*ecv,
-					 int		 model_col,
-					 int		 view_col,
-					 int		 row);
-static void	ecp_leave_edit		(ECellView	*ecv,
-					 int		 model_col,
-					 int		 view_col,
-					 int		 row,
-					 void		*edit_context);
-static void	ecp_print		(ECellView	*ecv,
-					 GnomePrintContext *context, 
-					 int		 model_col,
-					 int		 view_col,
-					 int		 row,
-					 double		 width,
-					 double		 height);
-static gdouble	ecp_print_height	(ECellView	*ecv,
-					 GnomePrintContext *context, 
-					 int		 model_col,
-					 int		 view_col,
-					 int		 row,
-					 double		 width);
-static int	ecp_max_width		(ECellView	*ecv,
-					 int		 model_col,
-					 int		 view_col);
-static void	ecp_show_tooltip	(ECellView	*ecv, 
-					 int		 model_col,
-					 int		 view_col,
-					 int		 row,
-					 int		 col_width,
-					 ETableTooltip	*tooltip);
-
-static gint e_cell_popup_do_popup	(ECellPopupView	*ecp_view,
-					 GdkEvent	*event);
-
-static ECellClass *parent_class;
-
-
-E_MAKE_TYPE (e_cell_popup, "ECellPopup", ECellPopup, e_cell_popup_class_init,
-	     e_cell_popup_init, e_cell_get_type());
-
-
-static void
-e_cell_popup_class_init		(GtkObjectClass	*object_class)
-{
-	ECellClass *ecc = (ECellClass *) object_class;
-
-	object_class->destroy = e_cell_popup_destroy;
-
-	ecc->new_view     = ecp_new_view;
-	ecc->kill_view    = ecp_kill_view;
-	ecc->realize      = ecp_realize;
-	ecc->unrealize    = ecp_unrealize;
-	ecc->draw         = ecp_draw;
-	ecc->event        = ecp_event;
-	ecc->height       = ecp_height;
-	ecc->enter_edit   = ecp_enter_edit;
-	ecc->leave_edit   = ecp_leave_edit;
-	ecc->print        = ecp_print;
-	ecc->print_height = ecp_print_height;
-	ecc->max_width	  = ecp_max_width;
-	ecc->show_tooltip = ecp_show_tooltip;
-
-	parent_class = gtk_type_class (e_cell_get_type ());
-}
-
-
-static void
-e_cell_popup_init		(ECellPopup	*ecp)
-{
-	ecp->popup_shown = FALSE;
-}
-
-
-/**
- * e_cell_popup_new:
- *
- * Creates a new ECellPopup renderer.
- *
- * Returns: an ECellPopup object.
- */
-ECell *
-e_cell_popup_new		(void)
-{
-	ECellPopup *ecp = gtk_type_new (e_cell_popup_get_type ());
-
-	return (ECell*) ecp;
-}
-
-
-/*
- * GtkObject::destroy method
- */
-static void
-e_cell_popup_destroy		(GtkObject *object)
-{
-	ECellPopup *ecp = E_CELL_POPUP (object);
-
-	gtk_object_unref (GTK_OBJECT (ecp->child));
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-
-
-/*
- * ECell::new_view method
- */
-static ECellView *
-ecp_new_view (ECell *ecell, ETableModel *table_model, void *e_table_item_view)
-{
-	ECellPopup *ecp = E_CELL_POPUP (ecell);
-	ECellPopupView *ecp_view;
-	
-	/* We must have a child ECell before we create any views. */
-	g_return_val_if_fail (ecp->child != NULL, NULL);
-
-	ecp_view = g_new0 (ECellPopupView, 1);
-
-	ecp_view->cell_view.ecell = ecell;
-	ecp_view->cell_view.e_table_model = table_model;
-	ecp_view->cell_view.e_table_item_view = e_table_item_view;
-
-	ecp_view->child_view = e_cell_new_view (ecp->child, table_model,
-						e_table_item_view);
-
-	return (ECellView*) ecp_view;
-}
-
-
-/*
- * ECell::kill_view method
- */
-static void
-ecp_kill_view (ECellView *ecv)
-{
-	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
-
-	if (ecp_view->child_view)
-		e_cell_kill_view (ecp_view->child_view);
-	g_free (ecp_view);
-}
-
-
-/*
- * ECell::realize method
- */
-static void
-ecp_realize (ECellView *ecv)
-{
-	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
-
-	e_cell_realize (ecp_view->child_view);
-
-	if (parent_class->realize)
-		(* parent_class->realize) (ecv);
-}
-
-
-/*
- * ECell::unrealize method
- */
-static void
-ecp_unrealize (ECellView *ecv)
-{
-	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
-
-	e_cell_unrealize (ecp_view->child_view);
-
-	if (parent_class->unrealize)
-		(* parent_class->unrealize) (ecv);
-}
-
-
-/*
- * ECell::draw method
- */
-static void
-ecp_draw (ECellView *ecv, GdkDrawable *drawable,
-	  int model_col, int view_col, int row, ECellFlags flags,
-	  int x1, int y1, int x2, int y2)
-{
-	ECellPopup *ecp = E_CELL_POPUP (ecv->ecell);
-	ETableItem *eti = E_TABLE_ITEM (ecv->e_table_item_view);
-	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
-	GtkWidget *canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (ecv->e_table_item_view)->canvas);
-	GtkShadowType shadow;
-	GdkRectangle rect;
-	gboolean show_popup_arrow = FALSE;
-
-	/* Display the popup arrow if we are editing this cell, or the popup
-	   is shown for this cell. */
-	if (eti->editing_col == view_col && eti->editing_row == row) {
-		show_popup_arrow = TRUE;
-		ecp->popup_arrow_shown = TRUE;
-
-	} else if (ecp->popup_shown && ecp->popup_view_col == view_col
-		   && ecp->popup_row == row) {
-		show_popup_arrow = TRUE;
-	}
-
-	if (eti->editing_col == -1)
-		ecp->popup_arrow_shown = FALSE;
-
-#if 0
-	g_print ("In ecp_draw row:%i col: %i %i,%i %i,%i Show Arrow:%i\n",
-		 row, view_col, x1, y1, x2, y2, show_popup_arrow);
-#endif
-
-	if (show_popup_arrow) {
-		e_cell_draw (ecp_view->child_view, drawable, model_col,
-			     view_col, row, flags,
-			     x1, y1, x2 - E_CELL_POPUP_ARROW_WIDTH, y2);
-
-		rect.x = x2 - E_CELL_POPUP_ARROW_WIDTH;
-		rect.y = y1 + 1;
-		rect.width = E_CELL_POPUP_ARROW_WIDTH;
-		rect.height = y2 - y1 - 2;
-
-		if (ecp->popup_shown)
-			shadow = GTK_SHADOW_IN;
-		else
-			shadow = GTK_SHADOW_OUT;
-
-		gtk_paint_box (canvas->style, drawable,
-			       GTK_STATE_NORMAL, shadow,
-			       &rect, canvas, "ecellpopup",
-			       rect.x, rect.y, rect.width, rect.height);
-		gtk_paint_arrow (canvas->style, drawable,
-				 GTK_STATE_NORMAL, shadow,
-				 &rect, canvas, NULL,
-				 GTK_ARROW_DOWN, TRUE,
-				 rect.x + E_CELL_POPUP_ARROW_XPAD,
-				 rect.y + E_CELL_POPUP_ARROW_YPAD,
-				 rect.width - E_CELL_POPUP_ARROW_XPAD * 2,
-				 rect.height - E_CELL_POPUP_ARROW_YPAD * 2);
-	} else {
-		e_cell_draw (ecp_view->child_view, drawable, model_col,
-			     view_col, row, flags, x1, y1, x2, y2);
-	}
-}
-
-
-/*
- * ECell::event method
- */
-static gint
-ecp_event (ECellView *ecv, GdkEvent *event, int model_col, int view_col,
-	   int row, ECellFlags flags, ECellActions *actions)
-{
-	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
-	ECellPopup *ecp = E_CELL_POPUP (ecp_view->cell_view.ecell);
-	ETableItem *eti = E_TABLE_ITEM (ecv->e_table_item_view);
-	int width;
-
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-		if (eti->editing_col == view_col && eti->editing_row == row
-		    && ecp->popup_arrow_shown) {
-			width = e_table_header_col_diff (eti->header, view_col,
-							 view_col + 1);
-
-			g_print ("Event in item popup width: %i button: %g,%g\n",
-				 width, event->button.x, event->button.y);
-
-			/* FIXME: The event coords seem to be relative to the
-			   text within the cell, so we have to add 4. */
-			if (event->button.x + 4 >= width - E_CELL_POPUP_ARROW_WIDTH) {
-				return e_cell_popup_do_popup (ecp_view, event);
-			}
-		}
-		break;
-	case GDK_BUTTON_RELEASE:
-		break;
-	case GDK_KEY_PRESS:
-		if (event->key.state & GDK_MOD1_MASK
-		    && event->key.keyval == GDK_Down) {
-			g_print ("## Alt-Down pressed\n");
-			return e_cell_popup_do_popup (ecp_view, event);
-		}
-		g_print ("Key Press Event ECellPopup\n");
-		break;
-	default:
-		break;
-	}
-
-	return e_cell_event (ecp_view->child_view, event, model_col, view_col,
-			     row, flags, actions);
-}
-
-
-/*
- * ECell::height method
- */
-static int
-ecp_height (ECellView *ecv, int model_col, int view_col, int row) 
-{
-	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
-
-	return e_cell_height (ecp_view->child_view, model_col, view_col, row);
-}
-
-
-/*
- * ECellView::enter_edit method
- */
-static void *
-ecp_enter_edit (ECellView *ecv, int model_col, int view_col, int row)
-{
-	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
-	ECellPopup *ecp = E_CELL_POPUP (ecp_view->cell_view.ecell);
-
-	g_print ("In ecp_enter_edit model_col: %i view_col: %i row: %i\n",
-		 model_col, view_col, row);
-
-	if (ecp->popup_view_col != view_col || ecp->popup_row != row)
-		ecp->popup_arrow_shown = FALSE;
-
-	ecp->popup_view_col = view_col;
-	ecp->popup_row = row;
-
-	return e_cell_enter_edit (ecp_view->child_view, model_col, view_col, row);
-}
-
-
-/*
- * ECellView::leave_edit method
- */
-static void
-ecp_leave_edit (ECellView *ecv, int model_col, int view_col, int row,
-		void *edit_context)
-{
-	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
-
-	g_print ("In ecp_leave_edit model_col: %i view_col: %i row: %i\n",
-		 model_col, view_col, row);
-
-	e_cell_leave_edit (ecp_view->child_view, model_col, view_col, row,
-			   edit_context);
-}
-
-
-static void
-ecp_print (ECellView *ecv, GnomePrintContext *context, 
-	   int model_col, int view_col, int row, double width, double height)
-{
-	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
-
-	e_cell_print (ecp_view->child_view, context, model_col, view_col, row,
-		      width, height);
-}
-
-
-static gdouble
-ecp_print_height (ECellView *ecv, GnomePrintContext *context, 
-		  int model_col, int view_col, int row,
-		  double width)
-{
-	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
-
-	return e_cell_print_height (ecp_view->child_view, context, model_col,
-				    view_col, row, width);
-}
-
-
-static int
-ecp_max_width (ECellView *ecv,
-	       int model_col,
-	       int view_col)
-{
-	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
-
-	return e_cell_max_width (ecp_view->child_view, model_col, view_col);
-}
-
-
-static void
-ecp_show_tooltip (ECellView *ecv, 
-		  int model_col,
-		  int view_col,
-		  int row,
-		  int col_width,
-		  ETableTooltip *tooltip)
-{
-	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
-
-	e_cell_show_tooltip (ecp_view->child_view, model_col, view_col, row,
-			     col_width, tooltip);
-}
-
-
-
-ECell*
-e_cell_popup_get_child			(ECellPopup	*ecp)
-{
-	g_return_val_if_fail (E_IS_CELL_POPUP (ecp), NULL);
-
-	return ecp->child;
-}
-
-
-void
-e_cell_popup_set_child			(ECellPopup	*ecp,
-					 ECell		*child)
-{
-	g_return_if_fail (E_IS_CELL_POPUP (ecp));
-
-	if (ecp->child)
-		gtk_object_unref (GTK_OBJECT (ecp->child));
-
-	ecp->child = child;
-	gtk_object_ref (GTK_OBJECT (child));
-}
-
-
-static gint
-e_cell_popup_do_popup			(ECellPopupView	*ecp_view,
-					 GdkEvent	*event)
-{
-	ECellPopup *ecp = E_CELL_POPUP (ecp_view->cell_view.ecell);
-	gint (*popup_func) (ECellPopup *ecp, GdkEvent *event);
-
-	ecp->popup_cell_view = ecp_view;
-
-	popup_func = E_CELL_POPUP_CLASS (GTK_OBJECT (ecp)->klass)->popup;
-
-	return popup_func ? popup_func (ecp, event) : FALSE;
-}
diff --git a/widgets/table/e-cell-popup.h b/widgets/table/e-cell-popup.h
deleted file mode 100644
index 2ccfd730ae..0000000000
--- a/widgets/table/e-cell-popup.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright 2001, Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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
- */
-
-/*
- * ECellPopup - an ECell used to support popup selections like a GtkCombo
- * widget. It contains a child ECell, e.g. an ECellText, but when selected it
- * displays an arrow on the right edge which the user can click to show a
- * popup. It will support subclassing or signals so that different types of
- * popup can be provided.
- */
-
-#ifndef _E_CELL_POPUP_H_
-#define _E_CELL_POPUP_H_
-
-#include <libgnomeui/gnome-canvas.h>
-#include <gal/e-table/e-cell.h>
-
-#define E_CELL_POPUP_TYPE        (e_cell_popup_get_type ())
-#define E_CELL_POPUP(o)          (GTK_CHECK_CAST ((o), E_CELL_POPUP_TYPE, ECellPopup))
-#define E_CELL_POPUP_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CELL_POPUP_TYPE, ECellPopupClass))
-#define E_IS_CELL_POPUP(o)       (GTK_CHECK_TYPE ((o), E_CELL_POPUP_TYPE))
-#define E_IS_CELL_POPUP_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CELL_POPUP_TYPE))
-
-typedef struct _ECellPopupView ECellPopupView;
-
-typedef struct {
-	ECell parent;
-
-	ECell *child;
-
-	/* This is TRUE if the popup window is shown for the cell being
-	   edited. While shown we display the arrow indented. */
-	gboolean	 popup_shown;
-
-	/* This is TRUE if the popup arrow is shown for the cell being edited.
-	   This is needed to stop the first click on the cell from popping up
-	   the popup window. We only popup the window after we have drawn the
-	   arrow. */
-	gboolean	 popup_arrow_shown;
-
-	/* The view in which the popup is shown. */
-	ECellPopupView	*popup_cell_view;
-
-	gint		 popup_view_col;
-	gint		 popup_row;
-} ECellPopup;
-
-
-typedef struct {
-	ECellClass parent_class;
-
-	/* Virtual function for subclasses to override. */
-	gint   	   (*popup)        (ECellPopup *ecp, GdkEvent *event);
-} ECellPopupClass;
-
-
-struct _ECellPopupView {
-	ECellView	 cell_view;
-
-	ECellView	*child_view;
-};
-
-
-GtkType    e_cell_popup_get_type		(void);
-ECell     *e_cell_popup_new			(void);
-
-/* Get and set the child ECell. */
-ECell	  *e_cell_popup_get_child		(ECellPopup	*ecp);
-void       e_cell_popup_set_child		(ECellPopup	*ecp,
-						 ECell		*child);
-
-#endif /* _E_CELL_POPUP_H_ */
diff --git a/widgets/table/e-cell-size.c b/widgets/table/e-cell-size.c
deleted file mode 100644
index 3d406f2b6d..0000000000
--- a/widgets/table/e-cell-size.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* ECellSize - Size item for e-table.
- * Copyright (C) 2001 Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- */
-
-#include <config.h>
-#include <sys/time.h>
-#include <unistd.h>
-#include <gal/util/e-util.h>
-#include "e-cell-size.h"
-
-#define PARENT_TYPE e_cell_text_get_type ()
-
-static ECellTextClass *parent_class;
-
-static char *
-ecd_get_text(ECellText *cell, ETableModel *model, int col, int row)
-{
-	gint size = GPOINTER_TO_INT(e_table_model_value_at(model, col, row));
-	gfloat fsize;
-	
-	if (size < 1024) {
-		return g_strdup_printf ("%d bytes", size);
-	} else {
-		fsize = ((gfloat) size) / 1024.0;
-		if (fsize < 1024.0) {
-			return g_strdup_printf ("%d K", (int)fsize);
-		} else {
-			fsize /= 1024.0;
-			return g_strdup_printf ("%.1f MB", fsize);
-		}
-	}
-}
-
-static void
-ecd_free_text(ECellText *cell, char *text)
-{
-	g_free(text);
-}
-
-static void
-e_cell_size_class_init (GtkObjectClass *object_class)
-{
-	ECellTextClass *ectc = (ECellTextClass *) object_class;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	ectc->get_text  = ecd_get_text;
-	ectc->free_text = ecd_free_text;
-}
-
-static void
-e_cell_size_init (GtkObject *object)
-{
-}
-
-/**
- * e_cell_size_new:
- * @fontname: font to be used to render on the screen
- * @justify: Justification of the string in the cell.
- *
- * Creates a new ECell renderer that can be used to render file sizes
- * that that come from the model.  The value returned from the model
- * is interpreted as being a time_t.
- *
- * The ECellSize object support a large set of properties that can be
- * configured through the Gtk argument system and allows the user to have
- * a finer control of the way the string is displayed.  The arguments supported
- * allow the control of strikeout, bold, color and a size filter.
- *
- * The arguments "strikeout_column", "bold_column" and "color_column" set
- * and return an integer that points to a column in the model that controls
- * these settings.  So controlling the way things are rendered is achieved
- * by having special columns in the model that will be used to flag whether
- * the size should be rendered with strikeout, or bolded.   In the case of
- * the "color_column" argument, the column in the model is expected to have
- * a string that can be parsed by gdk_color_parse().
- * 
- * Returns: an ECell object that can be used to render file sizes.  */
-ECell *
-e_cell_size_new (const char *fontname, GtkJustification justify)
-{
-	ECellSize *ecd = gtk_type_new (e_cell_size_get_type ());
-
-	e_cell_text_construct(E_CELL_TEXT(ecd), fontname, justify);
-      
-	return (ECell *) ecd;
-}
-
-E_MAKE_TYPE(e_cell_size, "ECellSize", ECellSize, e_cell_size_class_init, e_cell_size_init, PARENT_TYPE);
diff --git a/widgets/table/e-cell-size.h b/widgets/table/e-cell-size.h
deleted file mode 100644
index db976a4eb6..0000000000
--- a/widgets/table/e-cell-size.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* ECellSize - Size item for e-table.
- * Copyright (C) 2001 Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- */
-#ifndef _E_CELL_SIZE_H_
-#define _E_CELL_SIZE_H_
-
-#include <gal/e-table/e-cell-text.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_CELL_SIZE_TYPE        (e_cell_size_get_type ())
-#define E_CELL_SIZE(o)          (GTK_CHECK_CAST ((o), E_CELL_SIZE_TYPE, ECellSize))
-#define E_CELL_SIZE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CELL_SIZE_TYPE, ECellSizeClass))
-#define E_IS_CELL_SIZE(o)       (GTK_CHECK_TYPE ((o), E_CELL_SIZE_TYPE))
-#define E_IS_CELL_SIZE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CELL_SIZE_TYPE))
-
-typedef struct {
-	ECellText base;
-} ECellSize;
-
-typedef struct {
-	ECellTextClass parent_class;
-} ECellSizeClass;
-
-GtkType    e_cell_size_get_type (void);
-ECell     *e_cell_size_new      (const char *fontname, GtkJustification justify);
-
-END_GNOME_DECLS
-
-#endif /* _E_CELL_SIZE_H_ */
diff --git a/widgets/table/e-cell-spin-button.c b/widgets/table/e-cell-spin-button.c
deleted file mode 100644
index 80fb519e48..0000000000
--- a/widgets/table/e-cell-spin-button.c
+++ /dev/null
@@ -1,674 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2001 CodeFactory AB
- * Copyright (C) 2001 Mikael Hallendal <micke@codefactory.se>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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: Mikael Hallendal <micke@codefactory.se>
- *
- * Celltype for drawing a spinbutton in a cell. 
- *
- * Used ECellPopup by Damon Chaplin <damon@ximian.com> as base for 
- * buttondrawings.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtksignal.h>
-#include <gal/e-table/e-table-item.h>
-#include <gal/e-table/e-table-model.h>
-#include <gal/e-table/e-cell-float.h>
-#include <gal/e-table/e-cell-number.h>
-#include <gal/util/e-util.h>
-#include "e-cell-spin-button.h"
-
-#define E_CELL_SPIN_BUTTON_ARROW_WIDTH  16
-#define PARENT_TYPE e_cell_get_type ()
-
-static void e_cell_spin_button_class_init   (GtkObjectClass   *klass);
-static void e_cell_spin_button_init         (GtkObject        *object);
-
-static void         ecsb_destroy      (GtkObject	*object);
-
-/* ECell Functions */
-static ECellView *  ecsb_new_view     (ECell                 *ecell,
-				       ETableModel           *etm,
-				       void                  *eti_view);
-static void         ecsb_realize      (ECellView             *ecv);
-static void         ecsb_kill_view    (ECellView             *ecv);
-static void         ecsb_unrealize    (ECellView             *ecv);
-static void         ecsb_draw         (ECellView             *ecv, 
-				       GdkDrawable           *drawable, 
-				       int                    model_col, 
-				       int                    view_col, 
-				       int                    row, 
-				       ECellFlags             flags, 
-				       int                    x1, 
-				       int                    y1, 
-				       int                    x2, 
-				       int                    y2); 
-
-static gint         ecsb_event        (ECellView             *ecv, 
-				       GdkEvent              *event, 
-				       int                    model_col, 
-				       int                    view_col, 
-				       int                    row,
-				       ECellFlags             flags, 
-				       ECellActions          *actions); 
-
-static gint         ecsb_height       (ECellView             *ecv,
-				       int                    model_col,
-				       int                    view_col,
-				       int                    row);
-
-static void *       ecsb_enter_edit   (ECellView             *ecv,
-				       int                    model_col, 
-				       int                    view_col, 
-				       int                    row);
-
-static void         ecsb_leave_edit   (ECellView             *ecv,
-				       int                    model_col, 
-				       int                    view_col, 
-				       int                    row, 
-				       void                  *context);
-static void         ecsb_focus        (ECellView             *ecell_view,
-				       int                    model_col,
-				       int                    view_col,
-				       int                    row,
-				       int                    x1,
-				       int                    y1,
-				       int                    x2,
-				       int                    y2);
-static void         ecsb_unfocus      (ECellView             *ecell_view);
-
-static void         ecsb_show_tooltip (ECellView             *ecv,
-				       int                    model_col, 
-				       int                    view_col, 
-				       int                    row, 
-				       int                    col_width, 
-				       ETableTooltip          *tooltip);
-
-typedef struct {
-	ECellView    cell_view;
-	
-	ECellView   *child_view;
-} ECellSpinButtonView;
-
-enum {
-	STEP,
-	LAST_SIGNAL
-};
-
-static gint     signals[LAST_SIGNAL] = { 0 };
-static ECell   *parent_class;
-
-static void 
-e_cell_spin_button_class_init     (GtkObjectClass   *klass)
-{
-        ECellClass             *ecc    = (ECellClass *) klass;  
-	ECellSpinButtonClass   *ecsbc  = (ECellSpinButtonClass *) klass;
-        
-        klass->destroy     = ecsb_destroy;
-
-	ecc->realize       = ecsb_realize;
-	ecc->unrealize     = ecsb_unrealize;
-	ecc->new_view      = ecsb_new_view;
-	ecc->kill_view     = ecsb_kill_view;
-	ecc->draw          = ecsb_draw;
-	ecc->event         = ecsb_event;
-	ecc->height        = ecsb_height;
-	ecc->enter_edit    = ecsb_enter_edit;
-	ecc->leave_edit    = ecsb_leave_edit;
-	ecc->focus         = ecsb_focus;
-	ecc->unfocus       = ecsb_unfocus;	ecc->print         = NULL;
-	ecc->print_height  = NULL;
-	ecc->max_width     = NULL;
-	ecc->show_tooltip  = ecsb_show_tooltip;
-
-	ecsbc->step        = NULL;
-
-        parent_class       = gtk_type_class (E_CELL_TYPE);
-
-	signals[STEP] =
-		gtk_signal_new ("step",
-				GTK_RUN_LAST,
-				klass->type,
-				GTK_SIGNAL_OFFSET (ECellSpinButtonClass, step),
-				e_marshal_NONE__POINTER_INT_INT_INT,
-				GTK_TYPE_NONE,
-				4, GTK_TYPE_POINTER, GTK_TYPE_INT, 
-				GTK_TYPE_INT, GTK_TYPE_INT);
-	
-	gtk_object_class_add_signals (klass, signals, LAST_SIGNAL);
-}
-
-static void 
-e_cell_spin_button_init           (GtkObject        *object)
-{
-        ECellSpinButton   *ecsb;
-	
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (M_IS_CELL_SPIN_BUTTON (object));
-	
-	ecsb = E_CELL_SPIN_BUTTON (object);
-
-	ecsb->up_pressed    = FALSE;
-	ecsb->down_pressed  = FALSE;
-}
-
-static ECellView *  
-ecsb_new_view     (ECell            *ecell,
-		   ETableModel      *etm,
-		   void             *eti_view)
-{
-	ECellSpinButton       *ecsb = E_CELL_SPIN_BUTTON (ecell);
-	ECellSpinButtonView   *ecsb_view;
-
-	g_return_val_if_fail (ecsb->child != NULL, NULL);
-
-	ecsb_view = g_new0 (ECellSpinButtonView, 1);
-
-	ecsb_view->cell_view.ecell = ecell;
-	ecsb_view->cell_view.e_table_model = etm;
-	ecsb_view->cell_view.e_table_item_view = eti_view;
-
-	ecsb_view->child_view = e_cell_new_view (ecsb->child, etm, eti_view);
-
-	return (ECellView *) ecsb_view;
-}
-
-static void         
-ecsb_realize      (ECellView        *ecv)
-{ 
-	ECellSpinButtonView   *ecsb_view;
-	
-	g_return_if_fail (ecv != NULL);
-
-	ecsb_view = (ECellSpinButtonView *) ecv;
-
-	e_cell_realize (ecsb_view->child_view);
-} 
-
-static void         
-ecsb_kill_view    (ECellView        *ecv)
-{
-	ECellSpinButtonView   *ecsb_view;
-	
-	g_return_if_fail (ecv != NULL);
-
-	ecsb_view = (ECellSpinButtonView *) ecv;
-
-	if (ecsb_view->child_view) {
-		e_cell_kill_view (ecsb_view->child_view);
-	}
-	
-	g_free (ecsb_view);
-}
-
-static void         
-ecsb_unrealize    (ECellView        *ecv)
-{ 
-	ECellSpinButtonView   *ecsb_view;
-	
-	g_return_if_fail (ecv != NULL);
-
-	ecsb_view = (ECellSpinButtonView *) ecv;
-
-	e_cell_unrealize (ecsb_view->child_view);
-}
-
-static void         
-ecsb_draw         (ECellView        *ecv, 
-		   GdkDrawable      *drawable, 
-		   int               model_col, 
-		   int               view_col, 
-		   int               row, 
-		   ECellFlags        flags, 
-		   int               x1, 
-		   int               y1, 
-		   int               x2, 
-		   int               y2)
-{
-	ECellSpinButton        *ecsb;
-	ECellSpinButtonView    *ecsb_view;
-	ETableItem             *eti;
-	GtkWidget              *canvas;
-	GtkShadowType           shadow = GTK_SHADOW_OUT;
-	GdkRectangle            rect;
-	
-	g_return_if_fail (ecv != NULL);
-	
-	ecsb_view   = (ECellSpinButtonView *) ecv;
-	ecsb        = E_CELL_SPIN_BUTTON (ecsb_view->cell_view.ecell);
-	
-	eti         = E_TABLE_ITEM (ecsb_view->cell_view.e_table_item_view);
-	canvas      = GTK_WIDGET (GNOME_CANVAS_ITEM (eti)->canvas);
-	
-	if (eti->editing_col == view_col && 
-	    eti->editing_row == row) {
-
-		/* Draw child (Whats shown under the buttons) */
-		e_cell_draw (ecsb_view->child_view, 
-			     drawable, model_col, view_col,
-			     row, flags, 
-			     x1, y1, 
-			     x2 - E_CELL_SPIN_BUTTON_ARROW_WIDTH, y2); 
-
-		/* Draw down-arrow */
-		rect.x       = x2 - E_CELL_SPIN_BUTTON_ARROW_WIDTH;
-		rect.y       = y1 + (y2 - y1) / 2;
-		rect.width   = E_CELL_SPIN_BUTTON_ARROW_WIDTH;
-		rect.height  = (y2 - y1) / 2;
-		
-		if (ecsb->down_pressed) {
-			shadow = GTK_SHADOW_IN;
-		} else {
-			shadow = GTK_SHADOW_OUT;
-		}
-		
-		gtk_paint_box (canvas->style, drawable, 
-			       GTK_STATE_NORMAL, shadow,
-			       &rect, canvas, "ecellspinbutton_down",
-			       rect.x, rect.y, rect.width, rect.height);
-
-		gtk_paint_arrow (canvas->style, drawable,
-				 GTK_STATE_NORMAL, shadow,
-				 &rect, canvas, NULL,
-				 GTK_ARROW_DOWN, TRUE,
-				 rect.x,
-				 rect.y,
-				 rect.width,
-				 rect.height);
-
-		/* Draw up-arrow */
-		rect.y       = y1;
-		
-		if (ecsb->up_pressed) {
-			shadow = GTK_SHADOW_IN;
-		} else {
-			shadow = GTK_SHADOW_OUT;
-		}
-
-		gtk_paint_box (canvas->style, drawable, 
-			       GTK_STATE_NORMAL, shadow,
-			       &rect, canvas, "ecellspinbutton_up",
-			       rect.x, rect.y, rect.width, rect.height);
-
-		gtk_paint_arrow (canvas->style, drawable,
-				 GTK_STATE_NORMAL, shadow,
-				 &rect, canvas, NULL,
-				 GTK_ARROW_UP, TRUE,
-				 rect.x,
-				 rect.y,
-				 rect.width,
-				 rect.height);
-	} else {
-		/* Draw child */
-		e_cell_draw (ecsb_view->child_view, 
-			     drawable, model_col, view_col,
-			     row, flags, 
-			     x1, y1, 
-			     x2, y2); 
-	}
-}
-
-static gint         
-ecsb_event        (ECellView        *ecv, 
-		   GdkEvent         *event, 
-		   int               model_col, 
-		   int               view_col, 
-		   int               row,
-		   ECellFlags        flags, 
-		   ECellActions     *actions)
-{
-	ECellSpinButton       *ecsb;
-	ECellSpinButtonClass  *ecsb_class;
-	ECellSpinButtonView   *ecsb_view;
-	ETableItem            *eti;
-	gint                   height, width;
-	
-	g_return_val_if_fail (ecv != NULL, FALSE);
-		
-	ecsb_view   = (ECellSpinButtonView *) ecv;
-	ecsb        = E_CELL_SPIN_BUTTON (ecsb_view->cell_view.ecell);
-	ecsb_class  = E_CELL_SPIN_BUTTON_CLASS (GTK_OBJECT(ecsb)->klass);
-	eti         = E_TABLE_ITEM (ecsb_view->cell_view.e_table_item_view);
-	
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-		if (eti->editing_col == view_col &&
-		    eti->editing_row == row) {
-			width = e_table_header_col_diff (eti->header,
-							 view_col,
-							 view_col + 1);
-			height = e_table_item_row_diff (eti, row, row + 1);
-
-			/* Check if inside a button */
-			if (event->button.x >= width - E_CELL_SPIN_BUTTON_ARROW_WIDTH) {
-				/* Yep, which one? */
-				if (event->button.y <= height / 2) {
-					ecsb->up_pressed = TRUE;
-					gtk_signal_emit (GTK_OBJECT(ecsb),
-							 signals[STEP],
-							 ecv,
-							 STEP_UP,
-							 view_col,
-							 row);
-				} else {
-					ecsb->down_pressed = TRUE;
-					gtk_signal_emit (GTK_OBJECT(ecsb),
-							 signals[STEP],
-							 ecv,
-							 STEP_DOWN,
-							 view_col,
-							 row);
-				}
-
-				e_table_item_redraw_range (eti,
-							   view_col,
-							   row,
-							   view_col,
-							   row);
-				
-			}
-		} 
-		
-		break;
-	case GDK_BUTTON_RELEASE:
-		ecsb->up_pressed = FALSE;
-		ecsb->down_pressed = FALSE;
-		e_table_item_redraw_range (eti,
-					   view_col,
-					   row,
-					   view_col,
-					   row);
-		break;
-	case GDK_KEY_PRESS:
-		break;
-	default:
-		break;
-	}
-
-	return e_cell_event (ecsb_view->child_view, event, model_col,
-			     view_col, row, flags, actions);
-}
-
-static gint         
-ecsb_height       (ECellView        *ecv,
-		   int               model_col,
-		   int               view_col,
-		   int               row)
-{
-	ECellSpinButtonView   *ecsb_view;
-	
-	g_return_val_if_fail (ecv != NULL, -1);
-	
-	ecsb_view = (ECellSpinButtonView *) ecv;
-
-	return e_cell_height (ecsb_view->child_view, model_col, view_col, row);
-}
-
-static void *       
-ecsb_enter_edit   (ECellView        *ecv,
-		   int               model_col, 
-		   int               view_col, 
-		   int               row)
-{
-	ECellSpinButtonView   *ecsb_view;
-	
-	g_return_val_if_fail (ecv != NULL, NULL);
-
-	ecsb_view = (ECellSpinButtonView *) ecv;
-
-	return e_cell_enter_edit (ecsb_view->child_view, model_col,
-				  view_col, row);
-}
-
-
-static void         
-ecsb_leave_edit   (ECellView        *ecv,
-		   int               model_col, 
-		   int               view_col, 
-		   int               row, 
-		   void             *context)
-{
-	ECellSpinButtonView   *ecsb_view;
-	
-	g_return_if_fail (ecv != NULL);
-	
-	ecsb_view = (ECellSpinButtonView *) ecv;
-
-	e_cell_leave_edit (ecsb_view->child_view, model_col, view_col, 
-			   row, context);
-}
-
-static void
-ecsb_focus        (ECellView        *ecell_view,
-		   int               model_col,
-		   int               view_col,
-		   int               row,
-		   int		     x1,
-		   int		     y1,
-		   int		     x2,
-		   int		     y2)
-{
-	ECellClass  *klass;
-	ECellSpinButtonView   *ecsb_view;
-	
-	ecsb_view = (ECellSpinButtonView *) ecell_view;
-
-	klass = E_CELL_CLASS (GTK_OBJECT (ecell_view->ecell)->klass);
-
-	if (klass->focus) {
-		klass->focus (ecell_view, model_col, view_col, row, 
-			      x1, y1, x2, y2);
-	}
-}
-
-static void
-ecsb_unfocus      (ECellView        *ecell_view)
-{
-	ECellClass  *klass;
-	ECellSpinButtonView   *ecsb_view;
-	
-	ecsb_view = (ECellSpinButtonView *) ecell_view;
-	klass = E_CELL_CLASS (GTK_OBJECT (ecell_view->ecell)->klass);
-
-	if (klass->unfocus) {
-		klass->unfocus (ecell_view);
-	}
-	
-}
-
-static void         
-ecsb_show_tooltip (ECellView        *ecv,
-		   int               model_col, 
-		   int               view_col, 
-		   int               row, 
-		   int               col_width, 
-		   ETableTooltip    *tooltip)
-{
-	ECellSpinButtonView   *ecsb_view;
-	
-	g_return_if_fail (ecv != NULL);
-
-	ecsb_view = (ECellSpinButtonView *) ecv;
-	
-	e_cell_show_tooltip (ecsb_view->child_view, model_col, view_col, 
-			     row, col_width, tooltip);
-}
-
-static void 
-ecsb_destroy        (GtkObject	*object)
-{
-	ECellSpinButton *mcsp;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (M_IS_CELL_SPIN_BUTTON (object));
-	
-	mcsp = E_CELL_SPIN_BUTTON (object);
-	
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-ECell *
-e_cell_spin_button_new (gint     min,
-			gint     max,
-			gint     step,
-			ECell   *child_cell)
-{
-	ECellSpinButton   *ecsb;
-	
-	ecsb = gtk_type_new (E_CELL_SPIN_BUTTON_TYPE);
-
-	if (!child_cell) {
-		child_cell = e_cell_number_new (NULL, 
-						GTK_JUSTIFY_LEFT);
-		
-		gtk_signal_connect (GTK_OBJECT (ecsb), "step",
-				    e_cell_spin_button_step, 
-				    NULL);
-	}
-	
-	ecsb->child   = child_cell;
-	ecsb->min.i   = min;
-	ecsb->max.i   = max;
-	ecsb->step.i  = step;
-
-	return E_CELL (ecsb);
-}
-
-ECell *
-e_cell_spin_button_new_float (gfloat    min,
-			      gfloat    max,
-			      gfloat    step,
-			      ECell    *child_cell)
-{
-	ECellSpinButton   *ecsb;
-	
-	ecsb = gtk_type_new (E_CELL_SPIN_BUTTON_TYPE);
-
-	if (!child_cell) {
-		child_cell = e_cell_float_new (NULL, GTK_JUSTIFY_LEFT);
-		gtk_signal_connect (GTK_OBJECT (ecsb), "step",
-				    e_cell_spin_button_step_float, 
-				    NULL);
-	}
-	
-	ecsb->child   = child_cell;
-	ecsb->min.f   = min;
-	ecsb->max.f   = max;
-	ecsb->step.f  = step;
-
-	return E_CELL (ecsb);
-}
-
-void
-e_cell_spin_button_step   (ECellSpinButton       *ecsb,
-			   ECellView             *ecv,
-			   ECellSpinButtonStep    direction,
-			   gint                   col,
-			   gint                   row)
-{
- 	ECellSpinButtonView   *ecsb_view; 
-	
-	ETableModel           *etm;
-	gint                   value;
-	gint                   new_value;
-	gchar                 *str_value;
-	
-	g_return_if_fail (ecsb != NULL);
-	g_return_if_fail (M_IS_CELL_SPIN_BUTTON (ecsb));
-	g_return_if_fail (ecv != NULL);
-	
- 	ecsb_view  = (ECellSpinButtonView *) ecv; 
-	etm        = ecsb_view->cell_view.e_table_model;
-	
-	value  = GPOINTER_TO_INT (e_table_model_value_at (etm, col, row));
-	new_value = value;
-	
-	switch (direction) {
-	case STEP_UP:
-		new_value = CLAMP (value + ecsb->step.i, 
-				   ecsb->min.i, ecsb->max.i);
-		break;
-	case STEP_DOWN:
-		new_value = CLAMP (value - ecsb->step.i, 
-				   ecsb->min.i, ecsb->max.i);
-		break;
-	default:
-		break;
-	};
-
-	str_value = g_strdup_printf ("%d", new_value);
-
-	e_table_model_set_value_at (etm, col, row, str_value);
-
-	g_free (str_value);
-}
-
-void
-e_cell_spin_button_step_float  (ECellSpinButton       *ecsb,
-				ECellView             *ecv,
-				ECellSpinButtonStep    direction,
-				gint                   col,
-				gint                   row)
-{
- 	ECellSpinButtonView   *ecsb_view; 
-	
-	ETableModel           *etm;
-	gfloat                 value;
-	gfloat                 new_value;
-	gchar                 *str_value;
-	
-	g_return_if_fail (ecsb != NULL);
-	g_return_if_fail (M_IS_CELL_SPIN_BUTTON (ecsb));
-	g_return_if_fail (ecv != NULL);
-	
- 	ecsb_view  = (ECellSpinButtonView *) ecv; 
-	etm        = ecsb_view->cell_view.e_table_model;
-	
-	value  = *(gfloat *) e_table_model_value_at (etm, col, row);
-
-	switch (direction) {
-	case STEP_UP:
-		new_value = CLAMP (value + ecsb->step.f, 
-				   ecsb->min.f, ecsb->max.f);
-		break;
-	case STEP_DOWN:
-		new_value = CLAMP (value - ecsb->step.f, 
-				   ecsb->min.f, ecsb->max.f);
-		break;
-	default:
-		new_value = value;
-		break;
-	};
-	
-	str_value = g_strdup_printf ("%f", new_value);
-
-	e_table_model_set_value_at (etm, col, row, str_value);
-	
-	g_free (str_value);
-}
-
-E_MAKE_TYPE (e_cell_spin_button, "ECellSpinButton", ECellSpinButton, 
-	     e_cell_spin_button_class_init, e_cell_spin_button_init, 
-	     PARENT_TYPE);
-
diff --git a/widgets/table/e-cell-spin-button.h b/widgets/table/e-cell-spin-button.h
deleted file mode 100644
index e091b37e6c..0000000000
--- a/widgets/table/e-cell-spin-button.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2001 CodeFactory AB
- * Copyright (C) 2001 Mikael Hallendal <micke@codefactory.se>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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: Mikael Hallendal <micke@codefactory.se>
- */
-
-#ifndef __E_CELL_SPIN_BUTTON_H__
-#define __E_CELL_SPIN_BUTTON_H__
-
-#include <glib.h>
-#include <gtk/gtktypeutils.h>
-#include <gal/e-table/e-cell.h>
-
-#define E_CELL_SPIN_BUTTON_TYPE        (e_cell_spin_button_get_type ())
-#define E_CELL_SPIN_BUTTON(o)          (GTK_CHECK_CAST ((o), E_CELL_SPIN_BUTTON_TYPE, ECellSpinButton))
-#define E_CELL_SPIN_BUTTON_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CELL_SPIN_BUTTON_TYPE, ECellSpinButtonClass))
-#define M_IS_CELL_SPIN_BUTTON(o)       (GTK_CHECK_TYPE ((o), E_CELL_SPIN_BUTTON_TYPE))
-#define M_IS_CELL_SPIN_BUTTON_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CELL_SPIN_BUTTON_TYPE))
-
-typedef union {
-	gint     i;
-	gfloat   f;
-} ECellSpinButtonData;
-
-typedef enum {
-	STEP_UP,
-	STEP_DOWN
-} ECellSpinButtonStep;
-
-typedef struct {
-	ECell                  parent;
-
-	ECell                 *child;
-
-	ECellSpinButtonData    min;
-	ECellSpinButtonData    max;
-	ECellSpinButtonData    step;
-	
-	gboolean               up_pressed;
-	gboolean               down_pressed;
-
-} ECellSpinButton;
-
-typedef struct {
-	ECellClass    parent_class;
-	
-	/* Functions */
-	void    (*step)    (ECellSpinButton       *mcsb,
-			    ECellView             *ecv,
-			    ECellSpinButtonStep    direction,
-			    gint                   col,
-			    gint                   row);
-} ECellSpinButtonClass;
-
-GtkType    e_cell_spin_button_get_type     (void);
-ECell *    e_cell_spin_button_new          (gint     min,
-					    gint     max,
-					    gint     step,
-					    ECell   *child_cell);
-
-ECell *    e_cell_spin_button_new_float    (gfloat    min,
- 					    gfloat    max, 
- 					    gfloat    step,
-					    ECell    *child_cell); 
-
-
-void       e_cell_spin_button_step         (ECellSpinButton       *mcsb,
-					    ECellView             *ecv,
-					    ECellSpinButtonStep    direction,
-					    gint                   col,
-					    gint                   row);
-
-void       e_cell_spin_button_step_float   (ECellSpinButton       *mcsb,
-					    ECellView             *ecv,
-					    ECellSpinButtonStep    direction,
-					    gint                   col,
-					    gint                   row);
-
-#endif /* __E_CELL_SPIN_BUTTON__ */
-
diff --git a/widgets/table/e-cell-string.c b/widgets/table/e-cell-string.c
deleted file mode 100644
index 992b1bd10e..0000000000
--- a/widgets/table/e-cell-string.c
+++ /dev/null
@@ -1,9 +0,0 @@
-ECell *
-e_cell_string_new (void)
-{
-	ECell *ecell;
-
-	ecell = gtk_type_new (ecell);
-
-	return ecell;
-}
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
deleted file mode 100644
index ded6e93c0d..0000000000
--- a/widgets/table/e-cell-text.c
+++ /dev/null
@@ -1,2436 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-cell-text.c - Text cell renderer
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Miguel de Icaza <miguel@ximian.com>
- *          Chris Lahey <clahey@ximian.com>
- *
- * (C) 1999, 2000 Ximian, Inc.
- *
- * A lot of code taken from:
- *
- * Text item type for GnomeCanvas widget
- *
- * GnomeCanvas is basically a port of the Tk toolkit's most excellent
- * canvas widget.  Tk is copyrighted by the Regents of the University
- * of California, Sun Microsystems, and other parties.
- *
- * Copyright (C) 1998 The Free Software Foundation
- *
- * Author: Federico Mena <federico@nuclecu.unam.mx>
- *
- * TODO:
- *   Clean up UTF-8 handling
- *   UTF-8 selection
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <math.h>
-#include <string.h>
-#include <gdk/gdkx.h> /* for BlackPixel */
-#include <gtk/gtkenums.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkinvisible.h>
-#include <gtk/gtksignal.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwidget.h>
-#include <libgnomeui/gnome-canvas.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include "e-cell-text.h"
-#include "gal/util/e-util.h"
-#include "gal/widgets/e-canvas.h"
-#include "gal/widgets/e-font.h"
-#include "gal/widgets/e-unicode.h"
-#include "e-table-item.h"
-#include "gal/util/e-text-event-processor.h"
-#include "gal/e-text/e-text.h"
-#include "gal/util/e-text-event-processor-emacs-like.h"
-#include "e-table-tooltip.h"
-
-
-#define ECT_CLASS(c) (E_CELL_TEXT_CLASS(GTK_OBJECT((c))->klass))
-
-/* This defines a line of text */
-struct line {
-	char *text;	/* Line's text UTF-8, it is a pointer into the text->text string */
-	int length;	/* Line's length in BYTES */
-	int width;	/* Line's width in pixels */
-	int ellipsis_length;  /* Length before adding ellipsis in BYTES */
-};
-
-/* Object argument IDs */
-enum {
-	ARG_0,
-
-	ARG_STRIKEOUT_COLUMN,
-	ARG_BOLD_COLUMN,
-	ARG_COLOR_COLUMN,
-	ARG_EDITABLE,
-};
-
-
-enum {
-	E_SELECTION_PRIMARY,
-	E_SELECTION_CLIPBOARD
-};
-
-static GdkAtom clipboard_atom = GDK_NONE;
-
-#define PARENT_TYPE e_cell_get_type ()
-
-#define TEXT_PAD 4
-
-typedef struct {
-	gpointer lines;			/* Text split into lines (private field) */
-	int num_lines;			/* Number of lines of text */
-	int max_width;
-	int ref_count;
-} ECellTextLineBreaks;
-	
-
-typedef struct _CellEdit CellEdit;
-
-typedef struct {
-	ECellView    cell_view;
-	GdkGC       *gc;
-	EFont *font;
-	GdkCursor *i_cursor;
-	GdkBitmap *stipple;		/* Stipple for text */
-	
-	GnomeCanvas *canvas;
-
-	/*
-	 * During editing.
-	 */
-	CellEdit    *edit;
-
-
-	int xofs, yofs;                 /* This gets added to the x
-                                           and y for the cell text. */
-	double ellipsis_width[2];      /* The width of the ellipsis. */
-
-} ECellTextView;
-
-typedef struct _CurrentCell{
-	ECellTextView *text_view;
-	int            width;
-	char          *text;
-	int            model_col, view_col, row;
-	ECellTextLineBreaks *breaks;
-	EFontStyle     style;
-} CurrentCell;
-
-#define CURRENT_CELL(x) ((CurrentCell *)(x))
-
-struct _CellEdit {
-	CurrentCell cell;
-
-	char         *old_text;
-
-	/*
-	 * Where the editing is taking place
-	 */
-
-	int xofs_edit, yofs_edit;       /* Offset because of editing.
-                                           This is negative compared
-                                           to the other offsets. */
-
-	/* This needs to be reworked a bit once we get line wrapping. */
-	int selection_start;            /* Start of selection - IN BYTES */
-	int selection_end;              /* End of selection - IN BYTES */
-	gboolean select_by_word;        /* Current selection is by word */
-
-	/* This section is for drag scrolling and blinking cursor. */
-	/* Cursor handling. */
-	gint timeout_id;                /* Current timeout id for scrolling */
-	GTimer *timer;                  /* Timer for blinking cursor and scrolling */
-
-	gint lastx, lasty;              /* Last x and y motion events */
-	gint last_state;                /* Last state */
-	gulong scroll_start;            /* Starting time for scroll (microseconds) */
-
-	gint show_cursor;               /* Is cursor currently shown */
-	gboolean button_down;           /* Is mouse button 1 down */
-
-	ETextEventProcessor *tep;       /* Text Event Processor */
-
-	/* Hmmm... this should probably be in native encoding? */
-
-	GtkWidget *invisible;           /* For selection handling */
-	gboolean has_selection;         /* TRUE if we have the selection */
-	gchar *primary_selection;       /* Primary selection text */
-	gint primary_length;            /* Primary selection text length in BYTES */
-	gchar *clipboard_selection;     /* Clipboard selection text */
-	gint clipboard_length;          /* Clipboard selection text length in BYTES */
-
-	guint pointer_in : 1;
-	guint default_cursor_shown : 1;
-
-	ECellActions actions;
-};
-
-static void e_cell_text_view_command (ETextEventProcessor *tep, ETextEventProcessorCommand *command, gpointer data);
-
-static void e_cell_text_view_get_selection (CellEdit *edit, GdkAtom selection, guint32 time);
-static void e_cell_text_view_supply_selection (CellEdit *edit, guint time, GdkAtom selection, char *data, gint length);
-
-static GtkWidget *e_cell_text_view_get_invisible (CellEdit *edit);
-static void _selection_clear_event (GtkInvisible *invisible,
-				    GdkEventSelection *event,
-				    CellEdit *edit);
-static void _selection_get (GtkInvisible *invisible,
-			    GtkSelectionData *selection_data,
-			    guint info,
-			    guint time_stamp,
-			    CellEdit *edit);
-static void _selection_received (GtkInvisible *invisible,
-				 GtkSelectionData *selection_data,
-				 guint time,
-				 CellEdit *edit);
-static int number_of_lines (char *text);
-static void split_into_lines (CurrentCell *cell);
-static void unref_lines (CurrentCell *cell);
-static void calc_line_widths (CurrentCell *cell);
-static int get_line_ypos (CurrentCell *cell, struct line *line);
-static int get_line_xpos (CurrentCell *cell, struct line *line);
-static void _get_tep (CellEdit *edit);
-
-static gint _get_position_from_xy (CurrentCell *cell, gint x, gint y);
-static void _get_xy_from_position (CurrentCell *cell, gint position, gint *xp, gint *yp);
-static gboolean _blink_scroll_timeout (gpointer data);
-
-static void build_current_cell (CurrentCell *cell, ECellTextView *text_view, int model_col, int view_col, int row);
-static void unbuild_current_cell (CurrentCell *cell);
-static void calc_ellipsis (ECellTextView *text_view);
-static void ect_free_color (gchar *color_spec, GdkColor *color, GdkColormap *colormap);
-static GdkColor* e_cell_text_get_color (ECellTextView *cell_view, gchar *color_spec);
-
-static ECellClass *parent_class;
-
-static char *
-ect_get_text (ECellText *cell, ETableModel *model, int col, int row)
-{
-	if (ECT_CLASS(cell)->get_text)
-		return ECT_CLASS(cell)->get_text (cell, model, col, row);
-	else
-		return NULL;
-}
-
-static void
-ect_free_text (ECellText *cell, char *text)
-{
-	if (ECT_CLASS(cell)->free_text)
-		ECT_CLASS(cell)->free_text (cell, text);
-}
-
-static char *
-ect_real_get_text (ECellText *cell, ETableModel *model, int col, int row)
-{
-	return e_table_model_value_at(model, col, row);
-}
-
-static void
-ect_real_free_text (ECellText *cell, char *text)
-{
-}
-
-static void
-ect_queue_redraw (ECellTextView *text_view, int view_col, int view_row)
-{
-	e_table_item_redraw_range (
-		text_view->cell_view.e_table_item_view,
-		view_col, view_row, view_col, view_row);
-}
-
-/*
- * Accept the currently edited text.  if it's the same as what's in the cell, do nothing.
- */
-static void
-ect_accept_edits (ECellTextView *text_view)
-{
-	CurrentCell *cell = (CurrentCell *) text_view->edit;
-
-	if (strcmp (text_view->edit->old_text, cell->text)) {
-		e_table_model_set_value_at (text_view->cell_view.e_table_model,
-					    cell->model_col, cell->row, cell->text);
-	}
-}
-
-/*
- * Shuts down the editing process
- */
-static void
-ect_stop_editing (ECellTextView *text_view)
-{
-	CellEdit *edit = text_view->edit;
-	int row, view_col;
-
-	if (!edit)
-		return;
-
-	row = edit->cell.row;
-	view_col = edit->cell.view_col;
-	
-	g_free (edit->old_text);
-	edit->old_text = NULL;
-	g_free (edit->cell.text);
-	edit->cell.text = NULL;
-	if (edit->invisible)
-		gtk_widget_unref (edit->invisible);
-	if (edit->tep)
-		gtk_object_unref (GTK_OBJECT(edit->tep));
-	if (edit->primary_selection)
-		g_free (edit->primary_selection);
-	if (edit->clipboard_selection)
-		g_free (edit->clipboard_selection);
-	if (! edit->default_cursor_shown){
-		gdk_window_set_cursor (GTK_WIDGET(text_view->canvas)->window, NULL);
-		edit->default_cursor_shown = TRUE;
-	}
-	if (edit->timeout_id) {
-		g_source_remove (edit->timeout_id);
-		edit->timeout_id = 0;
-	}
-	if (edit->timer) {
-		g_timer_stop (edit->timer);
-		g_timer_destroy (edit->timer);
-		edit->timer = NULL;
-	}
-
-	g_free (edit);
-	
-	text_view->edit = NULL;
-	ect_queue_redraw (text_view, view_col, row);
-}
-
-/*
- * Cancels the edits
- */
-static void
-ect_cancel_edit (ECellTextView *text_view)
-{
-	ect_stop_editing (text_view);
-	e_table_item_leave_edit (text_view->cell_view.e_table_item_view);
-}
-
-/*
- * ECell::new_view method
- */
-static ECellView *
-ect_new_view (ECell *ecell, ETableModel *table_model, void *e_table_item_view)
-{
-	ECellTextView *text_view = g_new0 (ECellTextView, 1);
-	GnomeCanvas *canvas = GNOME_CANVAS_ITEM (e_table_item_view)->canvas;
-	
-	text_view->cell_view.ecell = ecell;
-	text_view->cell_view.e_table_model = table_model;
-	text_view->cell_view.e_table_item_view = e_table_item_view;
-
-	text_view->canvas = canvas;
-
-	text_view->xofs = 0.0;
-	text_view->yofs = 0.0;
-	
-	return (ECellView *)text_view;
-}
-
-/*
- * ECell::kill_view method
- */
-static void
-ect_kill_view (ECellView *ecv)
-{
-	ECellTextView *text_view = (ECellTextView *) ecv;
-
-	g_free (text_view);
-}
-
-/*
- * ECell::realize method
- */
-static void
-ect_realize (ECellView *ecell_view)
-{
-	ECellTextView *text_view = (ECellTextView *) ecell_view;
-	ECellText *ect = (ECellText *) ecell_view->ecell;
-	
-	text_view->gc = gdk_gc_new (GTK_WIDGET (text_view->canvas)->window);
-
-	text_view->i_cursor = gdk_cursor_new (GDK_XTERM);
-	
-	if (ect->font_name){
-		text_view->font = e_font_from_gdk_name (ect->font_name);
-	}
-	if (!text_view->font){
-		gdk_font_ref (GTK_WIDGET (text_view->canvas)->style->font);
-		text_view->font = e_font_from_gdk_font (GTK_WIDGET (text_view->canvas)->style->font);
-	}
-	
-	calc_ellipsis (text_view);
-
-	if (parent_class->realize)
-		(* parent_class->realize) (ecell_view);
-}
-
-/*
- * ECell::unrealize method
- */
-static void
-ect_unrealize (ECellView *ecv)
-{
-	ECellTextView *text_view = (ECellTextView *) ecv;
-	ECellText *ect = (ECellText*) ecv->ecell;
-	GdkColormap *colormap;
-
-	gdk_gc_unref (text_view->gc);
-	text_view->gc = NULL;
-
-	if (text_view->edit){
-		ect_cancel_edit (text_view);
-	}
-
-	if (text_view->font)
-		e_font_unref (text_view->font);
-	text_view->font = NULL;
-	
-	if (text_view->stipple)
-		gdk_bitmap_unref (text_view->stipple);
-
-	gdk_cursor_destroy (text_view->i_cursor);
-
-	if (ect->colors) {
-		colormap = gtk_widget_get_colormap (GTK_WIDGET (text_view->canvas));
-		g_hash_table_foreach (ect->colors, (GHFunc) ect_free_color,
-				      colormap);
-		g_hash_table_destroy (ect->colors);
-		ect->colors = NULL;
-	}
-
-	if (parent_class->unrealize)
-		(* parent_class->unrealize) (ecv);
-}
-
-static void
-ect_free_color (gchar *color_spec, GdkColor *color, GdkColormap *colormap)
-{
-
-	g_free (color_spec);
-
-	/* This frees the color. Note we don't free it if it is the special
-	   value. */
-	if (color != (GdkColor*) 1) {
-		gdk_colors_free (colormap, &color->pixel, 1, 0);
-
-		/* This frees the memory for the GdkColor. */
-		gdk_color_free (color);
-	}
-}
-
-static void
-set_style(ECellView *ecell_view, CurrentCell *cell, int row)
-{
-	EFontStyle style = E_FONT_PLAIN;
-	ECellText *ect = E_CELL_TEXT (ecell_view->ecell);
-
-	if (ect->bold_column >= 0 && e_table_model_value_at(ecell_view->e_table_model, ect->bold_column, row))
-		style = E_FONT_BOLD;
-
-	cell->style = style;
-}
-
-/*
- * ECell::draw method
- */
-static void
-ect_draw (ECellView *ecell_view, GdkDrawable *drawable,
-	  int model_col, int view_col, int row, ECellFlags flags,
-	  int x1, int y1, int x2, int y2)
-{
-	/* New ECellText */
-	ECellText *ect = E_CELL_TEXT (ecell_view->ecell);
-	ECellTextView *text_view = (ECellTextView *) ecell_view;
-	GtkWidget *canvas = GTK_WIDGET (text_view->canvas);
-	GdkRectangle rect, *clip_rect;
-	struct line *lines;
-	int i;
-	int xpos, ypos;
-	int start_char, end_char;
-	int sel_start, sel_end;
-	GdkRectangle sel_rect;
-	GdkGC *fg_gc;
-	EFont *font = text_view->font;
-	const int height = e_font_height (text_view->font);
-	CellEdit *edit = text_view->edit;
-	gboolean edit_display = FALSE;
-	ECellTextLineBreaks *linebreaks;
-	GdkColor *foreground, *cell_foreground, *cursor_color;
-	gchar *color_spec;
-	gboolean selected;
-	EFontStyle style = E_FONT_PLAIN;
-
-	selected = flags & E_CELL_SELECTED;
-
-	if (edit){
-		if ((edit->cell.view_col == view_col) && (edit->cell.row == row)) {
-			edit_display = TRUE;
-			fg_gc = canvas->style->fg_gc[edit->has_selection ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE];
-		} else
-			fg_gc = canvas->style->fg_gc[GTK_STATE_ACTIVE];
-	} else {
-		fg_gc = canvas->style->fg_gc[GTK_STATE_ACTIVE];
-	}
-
-	/*
-	 * Be a nice citizen: clip to the region we are supposed to draw on
-	 */
-	rect.x = x1;
-	rect.y = y1;
-	rect.width = x2 - x1;
-	rect.height = y2 - y1;
-	
-	gdk_gc_set_clip_rectangle (text_view->gc, &rect);
-	gdk_gc_set_clip_rectangle (fg_gc, &rect);
-	clip_rect = &rect;
-
-	if (selected){
-		if (flags & E_CELL_FOCUSED)
-			foreground = &canvas->style->text [GTK_STATE_SELECTED];
-		else
-			foreground = &canvas->style->text [GTK_STATE_ACTIVE];
-	} else {
-		foreground = &canvas->style->text [GTK_STATE_NORMAL];
-	}
-
-	cursor_color = foreground;
-
-	if (ect->color_column != -1 && ! selected) {
-		color_spec = e_table_model_value_at (ecell_view->e_table_model,
-						     ect->color_column, row);
-		cell_foreground = e_cell_text_get_color (text_view,
-							 color_spec);
-		if (cell_foreground)
-			foreground = cell_foreground;
-	}
-
-	gdk_gc_set_foreground (text_view->gc, foreground);
-
-	x1 += 4;
-	y1 += 1;
-	x2 -= 4;
-	y2 -= 1;
-
-	rect.x = x1;
-	rect.y = y1;
-	rect.width = x2 - x1;
-	rect.height = y2 - y1;
-	
-	gdk_gc_set_clip_rectangle (text_view->gc, &rect);
-	gdk_gc_set_clip_rectangle (fg_gc, &rect);
-	clip_rect = &rect;
-
-	if (edit_display){
-		CellEdit *edit = text_view->edit;
-		CurrentCell *cell = CURRENT_CELL(edit);
-
-		set_style(ecell_view, cell, row);
-
-		style = cell->style;
-
-		cell->width = x2 - x1;
-		
-		split_into_lines (cell);
-
-		linebreaks = cell->breaks;
-		
-		lines = linebreaks->lines;
-		ypos = get_line_ypos (cell, lines);
-		ypos += e_font_ascent (text_view->font);
-		ypos -= edit->yofs_edit;
-
-		for (i = 0; i < linebreaks->num_lines; i++) {
-			xpos = get_line_xpos (cell, lines);
-			xpos -= edit->xofs_edit;
-
-			/* start_char, end_char, sel_start and sel_end are IN BYTES */
-
-			start_char = lines->text - cell->text;
-			end_char = start_char + lines->length;
-
-			sel_start = edit->selection_start;
-			sel_end = edit->selection_end;
-
-			if (sel_start > sel_end){
-				sel_start ^= sel_end;
-				sel_end ^= sel_start;
-				sel_start ^= sel_end;
-			}
-			if (sel_start < start_char)
-				sel_start = start_char;
-			if (sel_end > end_char)
-				sel_end = end_char;
-
-			if (sel_start < sel_end){
-				sel_rect.x = xpos + x1 + e_font_utf8_text_width (font, style, lines->text, sel_start - start_char);
-				sel_rect.y = ypos + y1 - e_font_ascent (font);
-				sel_rect.width = e_font_utf8_text_width (font, style,
-									 lines->text + sel_start - start_char,
-									 sel_end - sel_start);
-				sel_rect.height = height;
-				gtk_paint_flat_box (canvas->style,
-						    drawable,
-
-						    edit->has_selection ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE,
-						    GTK_SHADOW_NONE,
-						    clip_rect,
-						    canvas,
-						    "text",
-						    sel_rect.x,
-						    sel_rect.y,
-						    sel_rect.width,
-						    sel_rect.height);
-
-				e_font_draw_utf8_text (drawable, font, style, text_view->gc, xpos + x1, ypos + y1,
-						       lines->text,
-						       sel_start - start_char);
-				e_font_draw_utf8_text (drawable, font, style, fg_gc,
-						       xpos + x1 + e_font_utf8_text_width (font, style, lines->text, sel_start - start_char),
-						       ypos + y1,
-						       lines->text + sel_start - start_char,
-						       sel_end - sel_start);
-				e_font_draw_utf8_text (drawable, font, style, text_view->gc,
-						       xpos + x1 + e_font_utf8_text_width (font, style, lines->text, sel_end - start_char),
-						       ypos + y1,
-						       lines->text + sel_end - start_char,
-						       end_char - sel_end);
-			} else {
-				e_font_draw_utf8_text (drawable, font, style, text_view->gc,
-						       xpos + x1, ypos + y1,
-						       lines->text,
-						       lines->length);
-			}
-			if (edit->selection_start == edit->selection_end &&
-			    edit->selection_start >= start_char &&
-			    edit->selection_start <= end_char &&
-			    edit->show_cursor) {
-				gdk_gc_set_foreground (text_view->gc, cursor_color);
-				gdk_draw_rectangle (drawable,
-						    text_view->gc,
-						    TRUE,
-						    xpos + x1 + e_font_utf8_text_width (font, style, lines->text, sel_start - start_char),
-						    ypos + y1 - e_font_ascent (font),
-						    1,
-						    height);
-			}
-			if (ect->strikeout_column >= 0 && e_table_model_value_at(ecell_view->e_table_model, ect->strikeout_column, row)) {
-				gdk_draw_rectangle (drawable,
-						    text_view->gc,
-						    TRUE,
-						    x1, ypos + y1 - (e_font_ascent (font) / 2),
-						    x2 - x1,
-						    1);
-			}
-			ypos += height;
-			lines ++;
-		}
-		unref_lines (cell);
-	} else {
-		
-		ECellTextLineBreaks *linebreaks;
-		CurrentCell cell;
-		build_current_cell (&cell, text_view, model_col, view_col, row);
-		
-		set_style(ecell_view, &cell, row);
-
-		style = cell.style;
-
-		cell.width = x2 - x1;
-		
-		split_into_lines (&cell);
-		
-		linebreaks = cell.breaks;
-		lines = linebreaks->lines;
-		ypos = get_line_ypos (&cell, lines);
-		ypos += e_font_ascent (text_view->font);
-		
-		
-		for (i = 0; i < linebreaks->num_lines; i++) {
-			xpos = get_line_xpos (&cell, lines);
-			if (ect->use_ellipsis && lines->ellipsis_length < lines->length) {
-				e_font_draw_utf8_text (drawable, font, style, text_view->gc,
-					       xpos + x1, ypos + y1,
-					       lines->text,
-					       lines->ellipsis_length);
-				e_font_draw_utf8_text (drawable, font, style, text_view->gc,
-					       xpos + x1 + lines->width - text_view->ellipsis_width[style],
-					       ypos + y1,
-					       ect->ellipsis ? ect->ellipsis : "...",
-					       ect->ellipsis ? strlen (ect->ellipsis) : 3);
-			} else {
-				e_font_draw_utf8_text (drawable, font, style, text_view->gc,
-					       xpos + x1,
-					       ypos + y1,
-					       lines->text,
-					       lines->length);
-			}
-			if (ect->strikeout_column >= 0 && e_table_model_value_at(ecell_view->e_table_model, ect->strikeout_column, row)) {
-				gdk_draw_rectangle (drawable,
-						    text_view->gc,
-						    TRUE,
-						    x1, ypos + y1 - (e_font_ascent (font) / 2),
-						    x2 - x1,
-						    1);
-			}
-			ypos += height;
-			lines++;
-		}
-		unref_lines (&cell);
-		unbuild_current_cell (&cell);
-	}
-
-	gdk_gc_set_clip_rectangle (text_view->gc, NULL);
-	gdk_gc_set_clip_rectangle (fg_gc, NULL);
-}
-
-/*
- * Selects the entire string
- */
-static void
-ect_edit_select_all (ECellTextView *text_view)
-{
-	g_assert (text_view->edit);
-	
-	text_view->edit->selection_start = 0;
-	text_view->edit->selection_end = strlen (text_view->edit->cell.text);
-}
-
-static gboolean
-key_begins_editing (GdkEventKey *event)
-{
-	if (event->length == 0)
-		return FALSE;
-
-	return TRUE;
-}
-
-/*
- * ECell::event method
- */
-static gint
-ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, int row, ECellFlags flags, ECellActions *actions)
-{
-	ECellTextView *text_view = (ECellTextView *) ecell_view;
-	ETextEventProcessorEvent e_tep_event;
-	gboolean edit_display = FALSE;
-	CellEdit *edit = text_view->edit;
-	GtkWidget *canvas = GTK_WIDGET (text_view->canvas);
-	gint return_val = 0;
-	CurrentCell cell, *cellptr;
-
-	if (flags & !E_CELL_EDITING)
-		return 0;
-
-	build_current_cell (&cell, text_view, model_col, view_col, row);
-	
-
-	if (edit){
-		if ((edit->cell.view_col == view_col) && (edit->cell.row == row)) {
-			edit_display = TRUE;
-			cellptr = CURRENT_CELL(edit);
-		} else {
-			cellptr = &cell;
-		}
-	} else {
-		cellptr = &cell;
-	}
-
-	set_style(ecell_view, cellptr, row);
-
-	e_tep_event.type = event->type;
-	switch (event->type) {
-	case GDK_FOCUS_CHANGE:
-		break;
-	case GDK_KEY_PRESS: /* Fall Through */
-	case GDK_KEY_RELEASE:
-		if (event->key.keyval == GDK_Escape){
-			ect_cancel_edit (text_view);
-			return_val = TRUE;
-			break;
-		}
-
-		if ((!edit_display) &&
-		    e_table_model_is_cell_editable (ecell_view->e_table_model, model_col, row) &&
-		    key_begins_editing (&event->key)) {
-			  e_table_item_enter_edit (text_view->cell_view.e_table_item_view, view_col, row);
-			  ect_edit_select_all (text_view);
-			  edit = text_view->edit;
-			  cellptr = CURRENT_CELL(edit);
-			  edit_display = TRUE;
-		}		
-		if (edit_display) {
-			GdkEventKey key = event->key;
-			if (key.keyval == GDK_KP_Enter || key.keyval == GDK_Return){
-				e_table_item_leave_edit (text_view->cell_view.e_table_item_view);
-			} else {
-				e_tep_event.key.time = key.time;
-				e_tep_event.key.state = key.state;
-				e_tep_event.key.keyval = key.keyval;
-
-				/* This is probably ugly hack, but we have to handle UTF-8 input somehow */
-#if 0
-				e_tep_event.key.length = key.length;
-				e_tep_event.key.string = key.string;
-#else
-				e_tep_event.key.string = e_utf8_from_gtk_event_key (canvas, key.keyval, key.string);
-				if (e_tep_event.key.string != NULL) {
-					e_tep_event.key.length = strlen (e_tep_event.key.string);
-				} else {
-					e_tep_event.key.length = 0;
-				}
-#endif
-
-				_get_tep (edit);
-				return_val = e_text_event_processor_handle_event (edit->tep, &e_tep_event);
-				*actions = edit->actions;
-				if (e_tep_event.key.string) g_free (e_tep_event.key.string);
-				break;
-			}
-		}
-
-		break;
-	case GDK_BUTTON_PRESS: /* Fall Through */
-	case GDK_BUTTON_RELEASE:
-		event->button.x -= 4;
-		event->button.y -= 1;
-		if ((!edit_display) 
-		    && e_table_model_is_cell_editable (ecell_view->e_table_model, model_col, row)
-		    && event->type == GDK_BUTTON_RELEASE
-		    && event->button.button == 1) {
-			GdkEventButton button = event->button;
-
-			e_table_item_enter_edit (text_view->cell_view.e_table_item_view, view_col, row);
-			edit = text_view->edit;
-			cellptr = CURRENT_CELL(edit);
-			edit_display = TRUE;
-			
-			e_tep_event.button.type = GDK_BUTTON_PRESS;
-			e_tep_event.button.time = button.time;
-			e_tep_event.button.state = button.state;
-			e_tep_event.button.button = button.button;
-			e_tep_event.button.position = _get_position_from_xy (cellptr, button.x, button.y);
-			_get_tep (edit);
-			return_val = e_text_event_processor_handle_event (edit->tep,
-									  &e_tep_event);
-			*actions = edit->actions;
-			if (event->button.button == 1) {
-				if (event->type == GDK_BUTTON_PRESS)
-					edit->button_down = TRUE;
-				else
-					edit->button_down = FALSE;
-			}
-			edit->lastx = button.x;
-			edit->lasty = button.y;
-			edit->last_state = button.state;
-
-			e_tep_event.button.type = GDK_BUTTON_RELEASE;
-		}		
-		if (edit_display) {
-			GdkEventButton button = event->button;
-			e_tep_event.button.time = button.time;
-			e_tep_event.button.state = button.state;
-			e_tep_event.button.button = button.button;
-			e_tep_event.button.position = _get_position_from_xy (cellptr, button.x, button.y);
-			_get_tep (edit);
-			return_val = e_text_event_processor_handle_event (edit->tep,
-									  &e_tep_event);
-			*actions = edit->actions;
-			if (event->button.button == 1) {
-				if (event->type == GDK_BUTTON_PRESS)
-					edit->button_down = TRUE;
-				else
-					edit->button_down = FALSE;
-			}
-			edit->lastx = button.x;
-			edit->lasty = button.y;
-			edit->last_state = button.state;
-		}
-		break;
-	case GDK_MOTION_NOTIFY:
-		event->motion.x -= 4;
-		event->motion.y -= 1;
-		if (edit_display) {
-			GdkEventMotion motion = event->motion;
-			e_tep_event.motion.time = motion.time;
-			e_tep_event.motion.state = motion.state;
-			e_tep_event.motion.position = _get_position_from_xy (cellptr, motion.x, motion.y);
-			_get_tep (edit);
-			return_val = e_text_event_processor_handle_event (edit->tep,
-									  &e_tep_event);
-			*actions = edit->actions;
-			edit->lastx = motion.x;
-			edit->lasty = motion.y;
-			edit->last_state = motion.state;
-		}
-		break;
-	case GDK_ENTER_NOTIFY:
-#if 0
-		edit->pointer_in = TRUE;
-#endif
-		if (edit_display) {
-			if (edit->default_cursor_shown){
-				gdk_window_set_cursor (canvas->window, text_view->i_cursor);
-				edit->default_cursor_shown = FALSE;
-			}
-		}
-		break;
-	case GDK_LEAVE_NOTIFY:
-#if 0
-		text_view->pointer_in = FALSE;
-#endif
-		if (edit_display) {
-			if (! edit->default_cursor_shown){
-				gdk_window_set_cursor (canvas->window, NULL);
-				edit->default_cursor_shown = TRUE;
-			}
-		}
-		break;
-	default:
-		break;
-	}
-
-	unbuild_current_cell (&cell);
-	if (return_val)
-		return return_val;
-#if 0
-	if (GNOME_CANVAS_ITEM_CLASS(parent_class)->event)
-		return GNOME_CANVAS_ITEM_CLASS(parent_class)->event (item, event);
-#endif
-	else
-		return 0;
-	
-}
-
-/*
- * ECell::height method
- */
-static int
-ect_height (ECellView *ecell_view, int model_col, int view_col, int row) 
-{
-	ECellTextView *text_view = (ECellTextView *) ecell_view;
-	EFont *font;
-	ECellText *ect = E_CELL_TEXT(ecell_view->ecell);
-	gchar *string;
-	gint value;
-	
-	font = text_view->font;
-
-	string = ect_get_text(ect, ecell_view->e_table_model, model_col, row);
-	value = e_font_height (font) * number_of_lines(string) + TEXT_PAD;
-	ect_free_text(ect, string);
-
-	return value;
-}
-
-/*
- * ECellView::enter_edit method
- */
-static void *
-ect_enter_edit (ECellView *ecell_view, int model_col, int view_col, int row)
-{
-	ECellTextView *text_view = (ECellTextView *) ecell_view;
-	CellEdit *edit;
-	ECellText *ect = E_CELL_TEXT(ecell_view->ecell);
-	char *temp;
-
-	edit = g_new (CellEdit, 1);
-	text_view->edit = edit;
-
-	build_current_cell (CURRENT_CELL(edit), text_view, model_col, view_col, row);
-	
-	set_style(ecell_view, CURRENT_CELL(edit), row);
-
-	edit->xofs_edit = 0.0;
-	edit->yofs_edit = 0.0;
-	
-	edit->selection_start = 0;
-	edit->selection_end = 0;
-	edit->select_by_word = FALSE;
-
-	edit->timeout_id = g_timeout_add (10, _blink_scroll_timeout, text_view);
-	edit->timer = g_timer_new ();
-	g_timer_elapsed (edit->timer, &(edit->scroll_start));
-	g_timer_start (edit->timer);
-
-	edit->lastx = 0;
-	edit->lasty = 0;
-	edit->last_state = 0;
-
-	edit->scroll_start = 0;
-	edit->show_cursor = TRUE;
-	edit->button_down = FALSE;
-	
-	edit->tep = NULL;
-
-	edit->has_selection = FALSE;
-	
-	edit->invisible = NULL;
-	edit->primary_selection = NULL;
-	edit->primary_length = 0;
-	edit->clipboard_selection = NULL;
-	edit->clipboard_length = 0;
-
-	edit->pointer_in = FALSE;
-	edit->default_cursor_shown = TRUE;
-	
-	temp = ect_get_text(ect, ecell_view->e_table_model, model_col, row);
-	edit->old_text = g_strdup (temp);
-	ect_free_text(ect, temp);
-	edit->cell.text = g_strdup (edit->old_text);
-
-#if 0
-	if (edit->pointer_in){
-		if (edit->default_cursor_shown){
-			gdk_window_set_cursor (GTK_WIDGET(item->canvas)->window, text_view->i_cursor);
-			edit->default_cursor_shown = FALSE;
-		}
-	}
-#endif
-
-	ect_queue_redraw (text_view, view_col, row);
-	
-	return NULL;
-}
-
-/*
- * ECellView::leave_edit method
- */
-static void
-ect_leave_edit (ECellView *ecell_view, int model_col, int view_col, int row, void *edit_context)
-{
-	ECellTextView *text_view = (ECellTextView *) ecell_view;
-	CellEdit *edit = text_view->edit;
-
-	if (edit){
-		ect_accept_edits (text_view);
-		ect_stop_editing (text_view);
-		/* FIXME: edit is freed in ect_stop_editing() so I've
-		   commented this out - Damon. */
-		/*unbuild_current_cell (CURRENT_CELL(edit));*/
-	} else {
-		/*
-		 * We did invoke this leave edit internally
-		 */
-	}
-}
-
-static void
-ect_print (ECellView *ecell_view, GnomePrintContext *context, 
-	   int model_col, int view_col, int row,
-	   double width, double height)
-{
-	GnomeFont *font = gnome_font_new ("Helvetica", 12);
-	char *string;
-	ECellText *ect = E_CELL_TEXT(ecell_view->ecell);
-	string = ect_get_text(ect, ecell_view->e_table_model, model_col, row);
-	gnome_print_gsave(context);
-	if (gnome_print_moveto(context, 2, 2) == -1)
-				/* FIXME */;
-	if (gnome_print_lineto(context, width - 2, 2) == -1)
-				/* FIXME */;
-	if (gnome_print_lineto(context, width - 2, height - 2) == -1)
-				/* FIXME */;
-	if (gnome_print_lineto(context, 2, height - 2) == -1)
-				/* FIXME */;
-	if (gnome_print_lineto(context, 2, 2) == -1)
-				/* FIXME */;
-	if (gnome_print_clip(context) == -1)
-				/* FIXME */;
-	gnome_print_moveto(context, 2, (height - gnome_font_get_ascender(font) + gnome_font_get_descender(font)) / 2);
-	gnome_print_setfont(context, font);
-	gnome_print_show(context, string);
-	gnome_print_grestore(context);
-	ect_free_text(ect, string);
-}
-
-static gdouble
-ect_print_height (ECellView *ecell_view, GnomePrintContext *context, 
-		  int model_col, int view_col, int row,
-		  double width)
-{
-	return 16;
-}
-
-static int
-ect_max_width (ECellView *ecell_view,
-	       int model_col,
-	       int view_col)
-{
-	/* New ECellText */
-	ECellTextView *text_view = (ECellTextView *) ecell_view;
-	EFont *font;
-	int row;
-	int number_of_rows;
-	int max_width = 0;
-
-	font = text_view->font;
-	number_of_rows = e_table_model_row_count (ecell_view->e_table_model);
-
-	for (row = 0; row < number_of_rows; row++) {
-		CurrentCell cell;
-		struct line *line;
-		int width;
-
-		build_current_cell (&cell, text_view, model_col, view_col, row);
-		split_into_lines (&cell);
-		calc_line_widths (&cell);
-		
-		line = (struct line *)cell.breaks->lines;
-		width = e_font_utf8_text_width (font, cell.style,
-						line->text, line->length);
-		max_width = MAX (max_width, width);
-		unref_lines (&cell);
-		unbuild_current_cell (&cell);
-	}
-	
-	return max_width;
-}
-
-static gint
-tooltip_event (GtkWidget *window,
-	       GdkEvent *event,
-	       ETableTooltip *tooltip)
-{
-	gint ret_val = FALSE;
-	
-	switch (event->type) {
-	case GDK_LEAVE_NOTIFY:
-		e_canvas_hide_tooltip (E_CANVAS(GNOME_CANVAS_ITEM(tooltip->eti)->canvas));
-		break;
-	case GDK_BUTTON_PRESS:
-	case GDK_BUTTON_RELEASE:
-		if (event->type == GDK_BUTTON_RELEASE) {
-			e_canvas_hide_tooltip (E_CANVAS(GNOME_CANVAS_ITEM(tooltip->eti)->canvas));
-		}
-
-		event->button.x = tooltip->cx;
-		event->button.y = tooltip->cy;
-		gtk_signal_emit_by_name (GTK_OBJECT (tooltip->eti), "event",
-					 event, &ret_val);
-		if (!ret_val)
-			gtk_propagate_event (GTK_WIDGET(GNOME_CANVAS_ITEM(tooltip->eti)->canvas), event);
-		ret_val = TRUE;
-		break;
-	case GDK_KEY_PRESS:
-		e_canvas_hide_tooltip (E_CANVAS(GNOME_CANVAS_ITEM(tooltip->eti)->canvas));
-		gtk_signal_emit_by_name (GTK_OBJECT (tooltip->eti), "event",
-					 event, &ret_val);
-		if (!ret_val)
-			gtk_propagate_event (GTK_WIDGET(GNOME_CANVAS_ITEM(tooltip->eti)->canvas), event);
-		ret_val = TRUE;
-		break;
-	default:
-		break;
-	}
-
-	return ret_val;
-}
-
-static void
-ect_show_tooltip (ECellView *ecell_view, 
-		  int model_col,
-		  int view_col,
-		  int row,
-		  int col_width,
-		  ETableTooltip *tooltip)
-{
-	ECellTextView *text_view = (ECellTextView *) ecell_view;
-	CurrentCell cell;
-	struct line *lines;
-	GtkWidget *canvas;
-	int i;
-	gdouble max_width;
-	gboolean cut_off;
-	double i2c[6];
-	ArtPoint origin = {0, 0};
-	ArtPoint pixel_origin;
-	int canvas_x, canvas_y;
-	GnomeCanvasItem *tooltip_text;
-	double tooltip_width;
-	double tooltip_height;
-	double tooltip_x;
-	double tooltip_y;
-	GnomeCanvasItem *rect;
-	double text_height;
-	ECellText *ect = E_CELL_TEXT(ecell_view->ecell);
-	GtkWidget *window;
-
-	tooltip->timer = 0;
-
-	build_current_cell (&cell, text_view, model_col, view_col, row);
-
-	set_style(ecell_view, &cell, row);
-
-	cell.width = col_width - 8;
-	split_into_lines (&cell);
-	calc_line_widths (&cell);
-
-	cut_off = FALSE;
-	for (lines = cell.breaks->lines, i = 0; i < cell.breaks->num_lines;
-	     lines++, i++) {
-		if (lines->length > lines->ellipsis_length) {
-			cut_off = TRUE;
-			break;
-		}
-	}
-
-	if (!cut_off) {
-		tooltip->timer = 0;
-		unref_lines (&cell);
-		unbuild_current_cell (&cell);
-		return;
-	}
-
-	gnome_canvas_item_i2c_affine (GNOME_CANVAS_ITEM (tooltip->eti), i2c);
-	art_affine_point (&pixel_origin, &origin, i2c);
-
-	gdk_window_get_origin (GTK_WIDGET (text_view->canvas)->window,
-			       &canvas_x, &canvas_y);
-	pixel_origin.x += canvas_x;
-	pixel_origin.y += canvas_y;
-	pixel_origin.x -= (int) gtk_layout_get_hadjustment (GTK_LAYOUT (text_view->canvas))->value;
-	pixel_origin.y -= (int) gtk_layout_get_vadjustment (GTK_LAYOUT (text_view->canvas))->value;
-
-	window = gtk_window_new (GTK_WINDOW_POPUP);
-	gtk_container_set_border_width (GTK_CONTAINER (window), 1);
-
-	canvas = e_canvas_new ();
-	gtk_container_add (GTK_CONTAINER (window), canvas);
-	GTK_WIDGET_UNSET_FLAGS (canvas, GTK_CAN_FOCUS);
-	GTK_WIDGET_UNSET_FLAGS (window, GTK_CAN_FOCUS);
-
-	max_width = 0.0;
-	for (lines = cell.breaks->lines, i = 0; i < cell.breaks->num_lines;
-	     lines++, i++) {
-		gdouble line_width;
-
-		line_width = e_font_utf8_text_width (text_view->font, 
-						     cell.style, lines->text,
-						     lines->length);
-		max_width = MAX (max_width, line_width);
-	}
-
-	text_height = e_font_height (text_view->font) * cell.breaks->num_lines + 4;
-	rect = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (canvas)),
-				      gnome_canvas_rect_get_type (),
-				      "x1", (double) 0.0,
-				      "y1", (double) 0.0,
-				      "x2", (double) max_width + 4,
-				      "y2", (double) text_height,
-				      "fill_color_gdk", tooltip->background,
-				      NULL);
-
-	tooltip_text = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (canvas)),
-					      e_text_get_type (),
-					      "anchor", GTK_ANCHOR_NW,
-/*  					      "font_gdk", text_view->font, */
-					      "bold", (gboolean) ect->bold_column >= 0 && e_table_model_value_at(ecell_view->e_table_model, ect->bold_column, row),
-					      "strikeout", (gboolean) ect->strikeout_column >= 0 && e_table_model_value_at(ecell_view->e_table_model, ect->strikeout_column, row),
-					      "fill_color_gdk", tooltip->foreground,
-					      "text", cell.text,
-					      "editable", FALSE,
-					      "clip_width", max_width,
-					      "clip_height", (double) text_height,
-					      "clip", TRUE,
-					      "line_wrap", FALSE,
-  					      "justification", E_CELL_TEXT (text_view->cell_view.ecell)->justify,
-					      "draw_background", FALSE,
-					      NULL);
-
-	tooltip_width = max_width;
-	tooltip_height = text_height;
-	tooltip_y = tooltip->y;
-
-	switch (E_CELL_TEXT (text_view->cell_view.ecell)->justify) {
-	case GTK_JUSTIFY_CENTER:
-		tooltip_x = - tooltip_width / 2;
-		break;
-	case GTK_JUSTIFY_RIGHT:
-		tooltip_x = tooltip_width / 2;
-		break;
-	case GTK_JUSTIFY_FILL:
-	case GTK_JUSTIFY_LEFT:
-		tooltip_x = tooltip->x;
-		break;
-	}
-
-	gnome_canvas_item_move (tooltip_text, 3.0, 1.0);
-	gnome_canvas_item_set (rect,
-			       "x2", (double) tooltip_width + 6,
-			       "y2", (double) tooltip->row_height + 1,
-			       NULL);
-	gtk_widget_set_usize (window, tooltip_width + 6,
-			      tooltip->row_height + 1);
-	gnome_canvas_set_scroll_region (GNOME_CANVAS (canvas), 0.0, 0.0,
-					(double) tooltip_width + 6,
-					(double) tooltip_height);
-	gtk_widget_show (canvas);
-	gtk_widget_realize (window);
-	gtk_signal_connect (GTK_OBJECT (window), "event",
-			    GTK_SIGNAL_FUNC (tooltip_event), tooltip);
-
-	e_canvas_popup_tooltip (E_CANVAS(text_view->canvas), window, pixel_origin.x + tooltip->x,
-				pixel_origin.y + tooltip->y - 1);
-
-	unref_lines (&cell);
-	unbuild_current_cell (&cell);
-
-	return;
-}
-
-/*
- * GtkObject::destroy method
- */
-static void
-ect_destroy (GtkObject *object)
-{
-	ECellText *ect = E_CELL_TEXT (object);
-
-	g_free (ect->font_name);
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-/* Set_arg handler for the text item */
-static void
-ect_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ECellText *text;
-
-	text = E_CELL_TEXT (object);
-
-	switch (arg_id) {
-	case ARG_STRIKEOUT_COLUMN:
-		text->strikeout_column = GTK_VALUE_INT (*arg);
-		break;
-
-	case ARG_BOLD_COLUMN:
-		text->bold_column = GTK_VALUE_INT (*arg);
-		break;
-
-	case ARG_COLOR_COLUMN:
-		text->color_column = GTK_VALUE_INT (*arg);
-		break;
-
-	case ARG_EDITABLE:
-		text->editable = GTK_VALUE_BOOL (*arg) ? TRUE : FALSE;
-		break;
-
-	default:
-		return;
-	}
-}
-
-/* Get_arg handler for the text item */
-static void
-ect_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ECellText *text;
-
-	text = E_CELL_TEXT (object);
-
-	switch (arg_id) {
-	case ARG_STRIKEOUT_COLUMN:
-		GTK_VALUE_INT (*arg) = text->strikeout_column;
-		break;
-
-	case ARG_BOLD_COLUMN:
-		GTK_VALUE_INT (*arg) = text->bold_column;
-		break;
-
-	case ARG_COLOR_COLUMN:
-		GTK_VALUE_INT (*arg) = text->color_column;
-		break;
-
-	case ARG_EDITABLE:
-		GTK_VALUE_BOOL (*arg) = text->editable ? TRUE : FALSE;
-		break;
-
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-e_cell_text_class_init (GtkObjectClass *object_class)
-{
-	ECellClass *ecc = (ECellClass *) object_class;
-	ECellTextClass *ectc = (ECellTextClass *) object_class;
-
-	object_class->destroy = ect_destroy;
-
-	ecc->new_view   = ect_new_view;
-	ecc->kill_view  = ect_kill_view;
-	ecc->realize    = ect_realize;
-	ecc->unrealize  = ect_unrealize;
-	ecc->draw       = ect_draw;
-	ecc->event      = ect_event;
-	ecc->height     = ect_height;
-	ecc->enter_edit = ect_enter_edit;
-	ecc->leave_edit = ect_leave_edit;
-	ecc->print      = ect_print;
-	ecc->print_height = ect_print_height;
-	ecc->max_width = ect_max_width;
-	ecc->show_tooltip = ect_show_tooltip;
-
-	ectc->get_text = ect_real_get_text;
-	ectc->free_text = ect_real_free_text;
-
-	object_class->get_arg = ect_get_arg;
-	object_class->set_arg = ect_set_arg;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	gtk_object_add_arg_type ("ECellText::strikeout_column",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_STRIKEOUT_COLUMN);
-	gtk_object_add_arg_type ("ECellText::bold_column",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_BOLD_COLUMN);
-	gtk_object_add_arg_type ("ECellText::color_column",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_COLOR_COLUMN);
-	gtk_object_add_arg_type ("ECellText::editable",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_EDITABLE);
-
-	if (!clipboard_atom)
-		clipboard_atom = gdk_atom_intern ("CLIPBOARD", FALSE);
-}
-
-static void
-e_cell_text_init (ECellText *ect)
-{
-	ect->ellipsis = NULL;
-	ect->use_ellipsis = TRUE;
-	ect->strikeout_column = -1;
-	ect->bold_column = -1;
-	ect->color_column = -1;
-	ect->editable = TRUE;
-}
-
-E_MAKE_TYPE(e_cell_text, "ECellText", ECellText, e_cell_text_class_init, e_cell_text_init, PARENT_TYPE);
-
-/**
- * e_cell_text_construct:
- * @cell: The cell to construct
- * @fontname: font to be used to render on the screen
- * @justify: Justification of the string in the cell
- *
- * constructs the ECellText.  To be used by subclasses and language
- * bindings.
- *
- * Returns: The ECellText.
- */
-ECell *
-e_cell_text_construct (ECellText *cell, const char *fontname, GtkJustification justify)
-{
-	cell->font_name = g_strdup (fontname);
-	cell->justify = justify;
-	return E_CELL(cell);
-}
-
-/**
- * e_cell_text_new:
- * @fontname: font to be used to render on the screen
- * @justify: Justification of the string in the cell.
- *
- * Creates a new ECell renderer that can be used to render strings that
- * that come from the model.  The value returned from the model is
- * interpreted as being a char *.
- *
- * The ECellText object support a large set of properties that can be
- * configured through the Gtk argument system and allows the user to have
- * a finer control of the way the string is displayed.  The arguments supported
- * allow the control of strikeout, bold, and color.
- *
- * The arguments "strikeout_column", "bold_column" and "color_column" set
- * and return an integer that points to a column in the model that controls
- * these settings.  So controlling the way things are rendered is achieved
- * by having special columns in the model that will be used to flag whether
- * the text should be rendered with strikeout, or bolded.   In the case of
- * the "color_column" argument, the column in the model is expected to have
- * a string that can be parsed by gdk_color_parse().
- * 
- * Returns: an ECell object that can be used to render strings.
- */
-ECell *
-e_cell_text_new (const char *fontname, GtkJustification justify)
-{
-	ECellText *ect = gtk_type_new (e_cell_text_get_type ());
-
-	e_cell_text_construct(ect, fontname, justify);
-
-	return (ECell *) ect;
-}
-
-/* Calculates the x position of the specified line of text, based on the text's justification */
-static int
-get_line_xpos (CurrentCell *cell, struct line *line)
-{
-	int x;
-	
-	ECellTextView *text_view = cell->text_view;
-	ECellText *ect = E_CELL_TEXT (((ECellView *)cell->text_view)->ecell);
-	
-	x = text_view->xofs + ect->x;
-
-	switch (ect->justify) {
-	case GTK_JUSTIFY_RIGHT:
-		x += cell->width - line->width;
-		break;
-
-	case GTK_JUSTIFY_CENTER:
-		x += (cell->width - line->width) / 2;
-		break;
-
-	default:
-		/* For GTK_JUSTIFY_LEFT, we don't have to do anything.  We do not support
-		 * GTK_JUSTIFY_FILL, yet.
-		 */
-		break;
-	}
-
-	return x;
-}
-
-/* Calculates the x position of the specified line of text, based on the text's justification */
-static int
-get_line_ypos (CurrentCell *cell, struct line *line)
-{
-	int y;
-
-	ECellTextView *text_view = cell->text_view;
-	ECellText *ect = E_CELL_TEXT (((ECellView *)cell->text_view)->ecell);
-	ECellTextLineBreaks *linebreaks = cell->breaks;
-
-	struct line *lines = linebreaks->lines;
-
-	EFont *font;
-	
-	font = text_view->font;
-
-	y = text_view->yofs + ect->y;
-	y += (line - lines) * e_font_height (font);
-
-	return y;
-}
-
-/* fixme: Handle Font attributes */
-/* position is in BYTES */
-
-static void
-_get_xy_from_position (CurrentCell *cell, gint position, gint *xp, gint *yp)
-{
-	if (xp || yp) {
-		struct line *lines;
-		int x, y;
-		int j;
-		ECellTextView *text_view = cell->text_view;
-		ECellTextLineBreaks *linebreaks;
-		EFont *font;
-		
-		font = text_view->font;
-		
-		split_into_lines (cell);
-		
-		linebreaks = cell->breaks;
-		lines = linebreaks->lines;
-
-		x = get_line_xpos (cell, lines);
-		y = get_line_ypos (cell, lines);
-		for (j = 0, lines = linebreaks->lines; j < linebreaks->num_lines; lines++, j++) {
-			if (lines->text > cell->text + position)
-				break;
-			y += e_font_height (font);
-		}
-		lines --;
-		y -= e_font_descent (font);
-		
-		x += e_font_utf8_text_width (font, cell->style,
-					     lines->text,
-					     position - (lines->text - cell->text));
-		if ((CellEdit *) cell == cell->text_view->edit){
-			x -= ((CellEdit *)cell)->xofs_edit;
-			y -= ((CellEdit *)cell)->yofs_edit;
-		}
-		if (xp)
-			*xp = x;
-		if (yp)
-			*yp = y;
-		unref_lines (cell);
-	}
-}
-
-static gint
-_get_position_from_xy (CurrentCell *cell, gint x, gint y)
-{
-	int i, j;
-	int xpos, ypos;
-	struct line *lines;
-	int return_val;
-	gchar *p;
-
-	ECellTextView *text_view = cell->text_view;
-	ECellTextLineBreaks *linebreaks;
-	EFont *font;
-	
-	font = text_view->font;
-
-	split_into_lines (cell);
-	
-	linebreaks = cell->breaks;
-
-	lines = linebreaks->lines;
-
-	if ((CellEdit *) cell == cell->text_view->edit){
-		x += ((CellEdit *)cell)->xofs_edit;
-		y += ((CellEdit *)cell)->yofs_edit;
-	}
-	
-	ypos = get_line_ypos (cell, linebreaks->lines);
-	j = 0;
-	while (y > ypos) {
-		ypos += e_font_height (font);
-		j ++;
-	}
-	j--;
-	if (j >= linebreaks->num_lines)
-		j = linebreaks->num_lines - 1;
-	if (j < 0)
-		j = 0;
-	i = 0;
-
-	lines += j;
-	xpos = get_line_xpos (cell, lines);
-
-	for (p = lines->text; p < lines->text + lines->length && g_unichar_validate (g_utf8_get_char (p)); p = g_utf8_next_char (p)) {
-		gint charwidth;
-
-		charwidth = e_font_utf8_char_width (font, cell->style, p);
-
-		xpos += charwidth / 2;
-		if (xpos > x) {
-			break;
-		}
-		xpos += (charwidth + 1) / 2;
-	}
-	
-	return_val = p - cell->text;
-
-	unref_lines (cell);
-
-	return return_val;
-}
-
-#define SCROLL_WAIT_TIME 30000
-
-static gboolean
-_blink_scroll_timeout (gpointer data)
-{
-	ECellTextView *text_view = (ECellTextView *) data;
-	ECellText *ect = E_CELL_TEXT (((ECellView *)text_view)->ecell);
-	CellEdit *edit = text_view->edit;
-	CurrentCell *cell = CURRENT_CELL(edit);
-
-	gulong current_time;
-	gboolean scroll = FALSE;
-	gboolean redraw = FALSE;
-	
-	g_timer_elapsed (edit->timer, &current_time);
-
-	if (edit->scroll_start + SCROLL_WAIT_TIME > 1000000) {
-		if (current_time > edit->scroll_start - (1000000 - SCROLL_WAIT_TIME) &&
-		    current_time < edit->scroll_start)
-			scroll = TRUE;
-	} else {
-		if (current_time > edit->scroll_start + SCROLL_WAIT_TIME ||
-		    current_time < edit->scroll_start)
-			scroll = TRUE;
-	}
-	if (scroll && edit->button_down) {
-		/* FIXME: Copy this for y. */
-		if (edit->lastx - ect->x > cell->width) {
-			ECellTextLineBreaks *linebreaks;
-			split_into_lines (cell);
-			linebreaks = cell->breaks;
-			if (edit->xofs_edit < linebreaks->max_width - cell->width) {
-				edit->xofs_edit += 4;
-				if (edit->xofs_edit > linebreaks->max_width - cell->width + 1)
-					edit->xofs_edit = linebreaks->max_width - cell->width + 1;
-				redraw = TRUE;
-			}
-			unref_lines (cell);
-		}
-		if (edit->lastx - ect->x < 0 &&
-		    edit->xofs_edit > 0) {
-			edit->xofs_edit -= 4;
-			if (edit->xofs_edit < 0)
-				edit->xofs_edit = 0;
-			redraw = TRUE;
-		}
-		if (redraw) {
-			ETextEventProcessorEvent e_tep_event;
-			e_tep_event.type = GDK_MOTION_NOTIFY;
-			e_tep_event.motion.state = edit->last_state;
-			e_tep_event.motion.time = 0;
-			e_tep_event.motion.position = _get_position_from_xy (cell, edit->lastx, edit->lasty);
-			_get_tep (edit);
-			e_text_event_processor_handle_event (edit->tep,
-							     &e_tep_event);
-			edit->scroll_start = current_time;
-		}
-	}
-
-	if (!((current_time / 500000) % 2)) {
-		if (!edit->show_cursor)
-			redraw = TRUE;
-		edit->show_cursor = TRUE;
-	} else {
-		if (edit->show_cursor)
-			redraw = TRUE;
-		edit->show_cursor = FALSE;
-	}
-	if (redraw){
-		ect_queue_redraw (text_view, edit->cell.view_col, edit->cell.row);
-	}
-	return TRUE;
-}
-
-static int
-_get_position (ECellTextView *text_view, ETextEventProcessorCommand *command)
-{
-	int length;
-	int x, y;
-	CellEdit *edit = text_view->edit;
-	CurrentCell *cell = CURRENT_CELL(edit);
-	EFont *font;
-	gchar *p;
-	int unival;
-	
-	font = text_view->font;
-	
-	switch (command->position) {
-		
-	case E_TEP_VALUE:
-		return command->value;
-
-	case E_TEP_SELECTION:
-		return edit->selection_end;
-
-	case E_TEP_START_OF_BUFFER:
-		return 0;
-
-		/* fixme: this probably confuses TEP */
-
-	case E_TEP_END_OF_BUFFER:
-		return strlen (cell->text);
-
-	case E_TEP_START_OF_LINE:
-
-		if (edit->selection_end < 1) return 0;
-
-		p = g_utf8_find_prev_char (cell->text, cell->text + edit->selection_end);
-
-		if (p == cell->text) return 0;
-
-		p = g_utf8_find_prev_char (cell->text, p);
-
-		while (p && p > cell->text) {
-			if (*p == '\n') return p - cell->text + 1;
-			p = g_utf8_find_prev_char (cell->text, p);
-		}
-
-		return 0;
-
-	case E_TEP_END_OF_LINE:
-
-		length = strlen (cell->text);
-		if (edit->selection_end >= length) return length;
-
-		p = g_utf8_next_char (cell->text + edit->selection_end);
-
-		while (*p && g_unichar_validate (g_utf8_get_char (p))) {
-			if (*p == '\n') return p - cell->text;
-			p = g_utf8_next_char (p);
-		}
-
-		return p - cell->text;
-
-	case E_TEP_FORWARD_CHARACTER:
-
-		length = strlen (cell->text);
-		if (edit->selection_end >= length) return length;
-
-		p = g_utf8_next_char (cell->text + edit->selection_end);
-
-		return p - cell->text;
-
-	case E_TEP_BACKWARD_CHARACTER:
-
-		if (edit->selection_end < 1) return 0;
-
-		p = g_utf8_find_prev_char (cell->text, cell->text + edit->selection_end);
-
-		if (p == NULL) return 0;
-
-		return p - cell->text;
-
-	case E_TEP_FORWARD_WORD:
-
-		length = strlen (cell->text);
-		if (edit->selection_end >= length) return length;
-
-		p = g_utf8_next_char (cell->text + edit->selection_end);
-
-		while (*p && g_unichar_validate (g_utf8_get_char (p))) {
-			unival = g_utf8_get_char (p);
-			if (g_unichar_isspace (unival)) return p - cell->text;
-			p = g_utf8_next_char (p);
-		}
-
-		return p - cell->text;
-
-	case E_TEP_BACKWARD_WORD:
-
-		if (edit->selection_end < 1) return 0;
-
-		p = g_utf8_find_prev_char (cell->text, cell->text + edit->selection_end);
-
-		if (p == cell->text) return 0;
-
-		p = g_utf8_find_prev_char (cell->text, p);
-
-		while (p && p > cell->text && g_unichar_validate (g_utf8_get_char (p))) {
-			unival = g_utf8_get_char (p);
-			if (g_unichar_isspace (unival)) {
-				return (g_utf8_next_char (p) - cell->text);
-			}
-			p = g_utf8_find_prev_char (cell->text, p);
-		}
-
-		return 0;
-
-	case E_TEP_FORWARD_LINE:
-		_get_xy_from_position (cell, edit->selection_end, &x, &y);
-		y += e_font_height (font);
-		return _get_position_from_xy (cell, x, y);
-	case E_TEP_BACKWARD_LINE:
-		_get_xy_from_position (cell, edit->selection_end, &x, &y);
-		y -= e_font_height (font);
-		return _get_position_from_xy (cell, x, y);
-
-	case E_TEP_FORWARD_PARAGRAPH:
-	case E_TEP_BACKWARD_PARAGRAPH:
-		
-	case E_TEP_FORWARD_PAGE:
-	case E_TEP_BACKWARD_PAGE:
-		return edit->selection_end;
-	default:
-		return edit->selection_end;
-	}
-	g_assert_not_reached ();
-	return 0; /* Kill warning */
-}
-
-static void
-_delete_selection (ECellTextView *text_view)
-{
-	CellEdit *edit = text_view->edit;
-	CurrentCell *cell = CURRENT_CELL(edit);
-	gint length;
-	gchar *sp, *ep;
-
-	if (edit->selection_end == edit->selection_start) return;
-
-	if (edit->selection_end < edit->selection_start) {
-		edit->selection_end ^= edit->selection_start;
-		edit->selection_start ^= edit->selection_end;
-		edit->selection_end ^= edit->selection_start;
-	}
-
-	sp = cell->text + edit->selection_start;
-	ep = cell->text + edit->selection_end;
-	length = strlen (ep) + 1;
-
-	memmove (sp, ep, length);
-
-	edit->selection_end = edit->selection_start;
-}
-
-/* fixme: */
-/* NB! We expect value to be length IN BYTES */
-
-static void
-_insert (ECellTextView *text_view, char *string, int value)
-{
-	CellEdit *edit = text_view->edit;
-	CurrentCell *cell = CURRENT_CELL(edit);
-	char *temp;
-
-	if (value <= 0) return;
-
-	temp = g_new (gchar, strlen (cell->text) + value + 1);
-
-	strncpy (temp, cell->text, edit->selection_start);
-	strncpy (temp + edit->selection_start, string, value);
-	strcpy (temp + edit->selection_start + value, cell->text + edit->selection_end);
-
-	g_free (cell->text);
-
-	cell->text = temp;
-
-	edit->selection_start += value;
-	edit->selection_end = edit->selection_start;
-}
-
-static void
-e_cell_text_view_command (ETextEventProcessor *tep, ETextEventProcessorCommand *command, gpointer data)
-{
-	CellEdit *edit = (CellEdit *) data;
-	CurrentCell *cell = CURRENT_CELL(edit);
-	ECellTextView *text_view = cell->text_view;
-	ECellText *ect = E_CELL_TEXT (text_view->cell_view.ecell);
-
-	gboolean change = FALSE;
-	gboolean redraw = FALSE;
-
-	int sel_start, sel_end;
-	EFont *font;
-	
-	font = text_view->font;
-
-	/* If the EText isn't editable, then ignore any commands that would
-	   modify the text. */
-	if (!ect->editable && (command->action == E_TEP_DELETE
-			       || command->action == E_TEP_INSERT
-			       || command->action == E_TEP_PASTE
-			       || command->action == E_TEP_GET_SELECTION))
-		return;
-
-	switch (command->action) {
-	case E_TEP_MOVE:
-		edit->selection_start = _get_position (text_view, command);
-		edit->selection_end = edit->selection_start;
-		if (edit->timer) {
-			g_timer_reset (edit->timer);
-		}
-		redraw = TRUE;
-		break;
-	case E_TEP_SELECT:
-		edit->selection_end = _get_position (text_view, command);
-		sel_start = MIN(edit->selection_start, edit->selection_end);
-		sel_end = MAX(edit->selection_start, edit->selection_end);
-		if (sel_start != sel_end) {
-			e_cell_text_view_supply_selection (edit, command->time, GDK_SELECTION_PRIMARY,
-							   cell->text + sel_start,
-							   sel_end - sel_start);
-		} else if (edit->timer) {
-			g_timer_reset (edit->timer);
-		}
-		redraw = TRUE;
-		break;
-	case E_TEP_DELETE:
-		if (edit->selection_end == edit->selection_start) {
-			edit->selection_end = _get_position (text_view, command);
-		}
-		_delete_selection (text_view);
-		if (edit->timer) {
-			g_timer_reset (edit->timer);
-		}
-		redraw = TRUE;
-		change = TRUE;
-		break;
-
-	case E_TEP_INSERT:
-		if (edit->selection_end != edit->selection_start) {
-			_delete_selection (text_view);
-		}
-		_insert (text_view, command->string, command->value);
-		if (edit->timer) {
-			g_timer_reset (edit->timer);
-		}
-		redraw = TRUE;
-		change = TRUE;
-		break;
-	case E_TEP_COPY:
-		sel_start = MIN(edit->selection_start, edit->selection_end);
-		sel_end = MAX(edit->selection_start, edit->selection_end);
-		if (sel_start != sel_end) {
-			e_cell_text_view_supply_selection (edit, command->time, clipboard_atom,
-							   cell->text + sel_start,
-							   sel_end - sel_start);
-		}
-		if (edit->timer) {
-			g_timer_reset (edit->timer);
-		}
-		break;
-	case E_TEP_PASTE:
-		e_cell_text_view_get_selection (edit, clipboard_atom, command->time);
-		if (edit->timer) {
-			g_timer_reset (edit->timer);
-		}
-		redraw = TRUE;
-		change = TRUE;
-		break;
-	case E_TEP_GET_SELECTION:
-		e_cell_text_view_get_selection (edit, GDK_SELECTION_PRIMARY, command->time);
-		break;
-	case E_TEP_ACTIVATE:
-		e_table_item_leave_edit (text_view->cell_view.e_table_item_view);
-		break;
-	case E_TEP_SET_SELECT_BY_WORD:
-		edit->select_by_word = command->value;
-		break;
-	case E_TEP_GRAB:
-		edit->actions = E_CELL_GRAB;
-		break;
-	case E_TEP_UNGRAB:
-		edit->actions = E_CELL_UNGRAB;
-		break;
-	case E_TEP_NOP:
-		break;
-	}
-
-	if (!edit->button_down) {
-		int x;
-		int i;
-		struct line *lines;
-		ECellTextLineBreaks *linebreaks;
-		
-		split_into_lines (cell);
-		
-		linebreaks = cell->breaks;
-	
-		for (lines = linebreaks->lines, i = 0; i < linebreaks->num_lines ; i++, lines ++) {
-			if ((lines->text - cell->text) > edit->selection_end) {
-				break;
-			}
-		}
-		lines --;
-		x = e_font_utf8_text_width (font, cell->style,
-					    lines->text,
-					    edit->selection_end - (lines->text - cell->text));
-		
-
-		if (x < edit->xofs_edit) {
-			edit->xofs_edit = x;
-			redraw = TRUE;
-		}
-
-		if (2 + x - cell->width > edit->xofs_edit) {
-			edit->xofs_edit = 2 + x - cell->width;
-			redraw = TRUE;
-		}
-		unref_lines (cell);
-	}
-
-	if (redraw){
-		ect_queue_redraw (text_view, edit->cell.view_col, edit->cell.row);
-	}
-#if 0
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM(text));
-#endif
-}
-
-static void _invisible_destroy (GtkInvisible *invisible,
-				CellEdit *edit)
-{
-	edit->invisible = NULL;
-}
-
-static GtkWidget *e_cell_text_view_get_invisible (CellEdit *edit)
-{	
-	GtkWidget *invisible;
-	if (edit->invisible) {
-		invisible = edit->invisible;
-	} else {
-		invisible = gtk_invisible_new ();
-		edit->invisible = invisible;
-		
-		gtk_selection_add_target (invisible,
-					  GDK_SELECTION_PRIMARY,
-					  GDK_SELECTION_TYPE_STRING,
-					  E_SELECTION_PRIMARY);
-		gtk_selection_add_target (invisible,
-					  clipboard_atom,
-					  GDK_SELECTION_TYPE_STRING,
-					  E_SELECTION_CLIPBOARD);
-		
-		gtk_signal_connect (GTK_OBJECT(invisible), "selection_get",
-				    GTK_SIGNAL_FUNC (_selection_get), 
-				    edit);
-		gtk_signal_connect (GTK_OBJECT(invisible), "selection_clear_event",
-				    GTK_SIGNAL_FUNC (_selection_clear_event),
-				    edit);
-		gtk_signal_connect (GTK_OBJECT(invisible), "selection_received",
-				    GTK_SIGNAL_FUNC (_selection_received),
-				    edit);
-		
-		gtk_signal_connect (GTK_OBJECT(invisible), "destroy",
-				    GTK_SIGNAL_FUNC (_invisible_destroy),
-				    edit);
-	}
-	return invisible;
-}
-
-static void
-_selection_clear_event (GtkInvisible *invisible,
-			GdkEventSelection *event,
-			CellEdit *edit)
-{
-	if (event->selection == GDK_SELECTION_PRIMARY) {
-		g_free (edit->primary_selection);
-		edit->primary_selection = NULL;
-		edit->primary_length = 0;
-
-		edit->has_selection = FALSE;
-#if 0
-		gnome_canvas_item_request_update (GNOME_CANVAS_ITEM(text));
-#endif
-
-	} else if (event->selection == clipboard_atom) {
-		g_free (edit->clipboard_selection);
-		edit->clipboard_selection = NULL;
-		edit->clipboard_length = 0;
-	}
-}
-
-static void
-_selection_get (GtkInvisible *invisible,
-		GtkSelectionData *selection_data,
-		guint info,
-		guint time_stamp,
-		CellEdit *edit)
-{
-	switch (info) {
-	case E_SELECTION_PRIMARY:
-		gtk_selection_data_set (selection_data, GDK_SELECTION_TYPE_STRING,
-					8, edit->primary_selection, edit->primary_length);
-		break;
-	case E_SELECTION_CLIPBOARD:
-		gtk_selection_data_set (selection_data, GDK_SELECTION_TYPE_STRING,
-					8, edit->clipboard_selection, edit->clipboard_length);
-		break;
-	}
-}
-
-/* fixme: What happens, if delivered string is not UTF-8? */
-
-static void
-_selection_received (GtkInvisible *invisible,
-		     GtkSelectionData *selection_data,
-		     guint time,
-		     CellEdit *edit)
-{
-	if (selection_data->length < 0 || selection_data->type != GDK_SELECTION_TYPE_STRING) {
-		return;
-	} else {
-		ETextEventProcessorCommand command;
-		command.action = E_TEP_INSERT;
-		command.position = E_TEP_SELECTION;
-		command.string = selection_data->data;
-		command.value = selection_data->length;
-		command.time = time;
-		e_cell_text_view_command (edit->tep, &command, edit);
-	}
-}
-
-static void
-e_cell_text_view_supply_selection (CellEdit *edit, guint time, GdkAtom selection, char *data, gint length)
-{
-	gboolean successful;
-	GtkWidget *invisible;
-
-	invisible = e_cell_text_view_get_invisible (edit);
-
-	if (selection == GDK_SELECTION_PRIMARY){
-		if (edit->primary_selection) {
-			g_free (edit->primary_selection);
-		}
-		edit->primary_selection = g_strndup (data, length);
-		edit->primary_length = length;
-	} else if (selection == clipboard_atom) {
-		if (edit->clipboard_selection) {
-			g_free (edit->clipboard_selection);
-		}
-		edit->clipboard_selection = g_strndup (data, length);
-		edit->clipboard_length = length;
-	}
-
-	successful = gtk_selection_owner_set (invisible,
-					      selection,
-					      time);
-	
-	if (selection == GDK_SELECTION_PRIMARY)
-		edit->has_selection = successful;
-}
-
-static void
-e_cell_text_view_get_selection (CellEdit *edit, GdkAtom selection, guint32 time)
-{
-	GtkWidget *invisible;
-	invisible = e_cell_text_view_get_invisible (edit);
-	gtk_selection_convert (invisible,
-			      selection,
-			      GDK_SELECTION_TYPE_STRING,
-			      time);
-}
-
-static void
-_get_tep (CellEdit *edit)
-{
-	if (!edit->tep) {
-		edit->tep = e_text_event_processor_emacs_like_new ();
-		gtk_object_ref (GTK_OBJECT (edit->tep));
-		gtk_object_sink (GTK_OBJECT (edit->tep));
-		gtk_signal_connect (GTK_OBJECT(edit->tep),
-				   "command",
-				   GTK_SIGNAL_FUNC(e_cell_text_view_command),
-				   (gpointer) edit);
-	}
-}
-
-static int
-number_of_lines (char *text)
-{
-	int num_lines = 0;
-	gchar *p;
-
-	if (!text) return 0;
-
-	for (p = text; *p && g_unichar_validate (g_utf8_get_char (p)); p = g_utf8_next_char (p)) {
-		if (*p == '\n') num_lines++;
-	}
-	
-	num_lines++;
-	return num_lines;
-}
-
-/* Splits the text of the text item into lines */
-static void
-split_into_lines (CurrentCell *cell)
-{
-	char *p;
-	struct line *lines;
-	gint len;
-
-	char *text = cell->text;
-	ECellTextLineBreaks *linebreaks;
-
-	if (! cell->breaks) {
-		cell->breaks = g_new (ECellTextLineBreaks, 1);
-		cell->breaks->ref_count = 1;
-	} else {
-		cell->breaks->ref_count ++;
-		return;
-	}
-	linebreaks = cell->breaks;
-
-	/* Check if already split. */
-	linebreaks->lines = NULL;
-	linebreaks->num_lines = 0;
-	
-	if (!text)
-		return;
-	
-	/* First, count the number of lines */
-
-	linebreaks->num_lines = number_of_lines(cell->text);
-	
-	/* Allocate array of lines and calculate split positions */
-	
-	linebreaks->lines = lines = g_new0 (struct line, linebreaks->num_lines);
-
-	len = 0;
-	for (p = text; *p && g_unichar_validate (g_utf8_get_char (p)); p = g_utf8_next_char (p)) {
-		if (len == 0) lines->text = p;
-		if (*p == '\n') {
-			lines->length = p - lines->text;
-			lines++;
-			len = 0;
-		} else
-			len++;
-	}
-	
-	if (len == 0)
-		lines->text = p;
-	lines->length = p - lines->text;
-
-	calc_line_widths (cell);
-}
-
-/* Free lines structure. */
-static void
-unref_lines (CurrentCell *cell)
-{
-	if (cell->breaks){
-		cell->breaks->ref_count --;
-		if (cell->breaks->ref_count <= 0){
-			g_free (cell->breaks->lines);
-			g_free (cell->breaks);
-			cell->breaks = NULL;
-		}
-	}
-}
-
-static void
-calc_ellipsis (ECellTextView *text_view)
-{
-	ECellText *ect = E_CELL_TEXT (((ECellView *)text_view)->ecell);
-	EFont *font;
-	
-	font = text_view->font;
-	if (font) {
-		text_view->ellipsis_width[E_FONT_PLAIN] =
-			e_font_utf8_text_width (font, E_FONT_PLAIN,
-					ect->ellipsis ? ect->ellipsis : "...",
-					ect->ellipsis ? strlen (ect->ellipsis) : 3);
-		text_view->ellipsis_width[E_FONT_BOLD] =
-			e_font_utf8_text_width (font, E_FONT_BOLD,
-					ect->ellipsis ? ect->ellipsis : "...",
-					ect->ellipsis ? strlen (ect->ellipsis) : 3);
-	}
-}
-
-/* Calculates the line widths (in pixels) of the text's splitted lines */
-static void
-calc_line_widths (CurrentCell *cell)
-{
-	ECellTextView *text_view = cell->text_view;
-	ECellText *ect = E_CELL_TEXT (((ECellView *)text_view)->ecell);
-	ECellTextLineBreaks *linebreaks = cell->breaks;
-	struct line *lines;
-	int i;
-	int j;
-	EFont *font;
-	
-	font = text_view->font;
-	
-	lines = linebreaks->lines;
-	linebreaks->max_width = 0;
-
-	if (!lines) return;
-
-	for (i = 0; i < linebreaks->num_lines; i++) {
-		if (lines->length != 0) {
-			if (font) {
-				lines->width = e_font_utf8_text_width (font, cell->style,
-								       lines->text, lines->length);
-				lines->ellipsis_length = 0;
-			} else {
-				lines->width = 0;
-			}
-			
-			if (ect->use_ellipsis &&
-			    (!(text_view->edit &&
-			       cell->row == text_view->edit->cell.row &&
-			       cell->view_col == text_view->edit->cell.view_col)) &&
-			    lines->width > cell->width) {
-				if (font) {
-					lines->ellipsis_length = 0;
-					for (j = 0; j < lines->length; j++){
-						if (e_font_utf8_text_width (font, cell->style, lines->text, j) +
-						    text_view->ellipsis_width[cell->style] < cell->width) {
-							lines->ellipsis_length = j;
-						}
-						else
-							break;
-					}
-				}
-				else
-					lines->ellipsis_length = 0;
-				lines->width = e_font_utf8_text_width (font, cell->style, lines->text, lines->ellipsis_length) +
-					text_view->ellipsis_width[cell->style];
-			}
-			else
-				lines->ellipsis_length = lines->length;
-
-			if (lines->width > linebreaks->max_width)
-				linebreaks->max_width = lines->width;
-		} else {
-			lines->width = 0;
-			lines->ellipsis_length = 0;
-		}
-
-		lines++;
-	}
-}
-
-static void
-build_current_cell (CurrentCell *cell, ECellTextView *text_view, int model_col, int view_col, int row)
-{
-	ECellView *ecell_view = (ECellView *) text_view;
-	ECellText *ect = E_CELL_TEXT (ecell_view->ecell);
-	char *temp;
-
-	cell->text_view = text_view;
-	cell->model_col = model_col;
-	cell->view_col = view_col;
-	cell->row = row;
-	cell->breaks = NULL;
-
-	temp = ect_get_text(ect, ecell_view->e_table_model, model_col, row);
-	cell->text = g_strdup(temp);
-	ect_free_text(ect, temp);
-
-	cell->width = e_table_header_get_column (
-		((ETableItem *)ecell_view->e_table_item_view)->header,
-		view_col)->width - 8;
-	cell->style = 0;
-}
-
-static void
-unbuild_current_cell (CurrentCell *cell)
-{
-	g_free(cell->text);
-	cell->text = NULL;
-}
-
-
-static GdkColor*
-e_cell_text_get_color (ECellTextView *cell_view, gchar *color_spec)
-{
-	ECellText *ect = E_CELL_TEXT (((ECellView*) cell_view)->ecell);
-	GdkColormap *colormap;
-	GdkColor *color, tmp_color;
-
-	/* If the color spec is NULL we use the default color. */
-	if (color_spec == NULL)
-		return NULL;
-
-	/* Create the hash table if we haven't already. */
-	if (!ect->colors)
-		ect->colors = g_hash_table_new (g_str_hash, g_str_equal);
-
-	/* See if we've already allocated the color. Note that we use a
-	   special value of (GdkColor*) 1 in the hash to indicate that we've
-	   already tried and failed to allocate the color, so we don't keep
-	   trying to allocate it. */
-	color = g_hash_table_lookup (ect->colors, color_spec);
-	if (color == (GdkColor*) 1)
-		return NULL;
-	if (color)
-		return color;
-
-	/* Try to parse the color. */
-	if (gdk_color_parse (color_spec, &tmp_color)) {
-		colormap = gtk_widget_get_colormap (GTK_WIDGET (cell_view->canvas));
-
-		/* Try to allocate the color. */
-		if (gdk_color_alloc (colormap, &tmp_color))
-			color = gdk_color_copy (&tmp_color);
-	}
-
-	g_hash_table_insert (ect->colors, g_strdup (color_spec),
-			     color ? color : (GdkColor*) 1);
-	return color;
-}
-
diff --git a/widgets/table/e-cell-text.h b/widgets/table/e-cell-text.h
deleted file mode 100644
index 8ea9c509bd..0000000000
--- a/widgets/table/e-cell-text.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* ECellText - Text item for e-table.
- * Copyright (C) 2000 Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * Drawing and event handling from:
- * 
- * EText - Text item for evolution.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * A majority of code taken from:
- *
- * Text item type for GnomeCanvas widget
- *
- * GnomeCanvas is basically a port of the Tk toolkit's most excellent
- * canvas widget.  Tk is copyrighted by the Regents of the University
- * of California, Sun Microsystems, and other parties.
- *
- * Copyright (C) 1998 The Free Software Foundation
- *
- * Author: Federico Mena <federico@nuclecu.unam.mx> */
-#ifndef _E_CELL_TEXT_H_
-#define _E_CELL_TEXT_H_
-
-#include <libgnomeui/gnome-canvas.h>
-#include <gal/e-table/e-cell.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_CELL_TEXT_TYPE        (e_cell_text_get_type ())
-#define E_CELL_TEXT(o)          (GTK_CHECK_CAST ((o), E_CELL_TEXT_TYPE, ECellText))
-#define E_CELL_TEXT_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CELL_TEXT_TYPE, ECellTextClass))
-#define E_IS_CELL_TEXT(o)       (GTK_CHECK_TYPE ((o), E_CELL_TEXT_TYPE))
-#define E_IS_CELL_TEXT_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CELL_TEXT_TYPE))
-
-typedef struct {
-	ECell parent;
-
-	GtkJustification  justify;
-	char             *font_name;
-
-	double x, y;			/* Position at anchor */
-
-	gulong pixel;			/* Fill color */
-
-	/* Clip handling */
-	char *ellipsis;                 /* The ellipsis characters.  NULL = "...". */
-
-	guint use_ellipsis : 1;         /* Whether to use the ellipsis. */
-	guint editable : 1;		/* Whether the text can be edited. */
-	
-	int strikeout_column;
-	int bold_column;
-
-	/* This column in the ETable should return a string specifying a color,
-	   either a color name like "red" or a color spec like "rgb:F/0/0".
-	   See the XParseColor man page for the formats available. */
-	int color_column;
-
-	/* This stores the colors we have allocated. */
-	GHashTable *colors;
-} ECellText;
-
-typedef struct {
-	ECellClass parent_class;
-
-	char *(*get_text)  (ECellText *cell, ETableModel *model, int col, int row);
-	void  (*free_text) (ECellText *cell, char *text);
-} ECellTextClass;
-
-GtkType    e_cell_text_get_type (void);
-ECell     *e_cell_text_new      (const char *fontname, GtkJustification justify);
-ECell     *e_cell_text_construct(ECellText *cell, const char *fontname, GtkJustification justify);
-
-END_GNOME_DECLS
-
-#endif /* _E_CELL_TEXT_H_ */
-
-
diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c
deleted file mode 100644
index e85418e593..0000000000
--- a/widgets/table/e-cell-toggle.c
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * e-cell-toggle.c: Multi-state image toggle cell object.
- *
- * Author:
- *   Miguel de Icaza (miguel@kernel.org)
- *
- * (C) 1999, 2000 Ximian, Inc
- */
-#include <config.h>
-#include <gtk/gtkenums.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gdk/gdkkeysyms.h>
-#include <libgnomeui/gnome-canvas.h>
-#include "e-cell-toggle.h"
-#include "gal/util/e-util.h"
-#include "e-table-item.h"
-
-#define PARENT_TYPE e_cell_get_type ()
-
-typedef struct {
-	ECellView    cell_view;
-	GdkGC       *gc;
-	GnomeCanvas *canvas;
-} ECellToggleView;
-
-static ECellClass *parent_class;
-
-static void
-etog_queue_redraw (ECellToggleView *text_view, int view_col, int view_row)
-{
-	e_table_item_redraw_range (
-		text_view->cell_view.e_table_item_view,
-		view_col, view_row, view_col, view_row);
-}
-
-/*
- * ECell::realize method
- */
-static ECellView *
-etog_new_view (ECell *ecell, ETableModel *table_model, void *e_table_item_view)
-{
-	ECellToggleView *toggle_view = g_new0 (ECellToggleView, 1);
-	ETableItem *eti = E_TABLE_ITEM (e_table_item_view);
-	GnomeCanvas *canvas = GNOME_CANVAS_ITEM (eti)->canvas;
-	
-	toggle_view->cell_view.ecell = ecell;
-	toggle_view->cell_view.e_table_model = table_model;
-	toggle_view->cell_view.e_table_item_view = e_table_item_view;
-	toggle_view->canvas = canvas;
-	
-	return (ECellView *) toggle_view;
-}
-
-static void
-etog_kill_view (ECellView *ecell_view)
-{
-	g_free (ecell_view);
-}	
-
-static void
-etog_realize (ECellView *ecell_view)
-{
-	ECellToggleView *toggle_view = (ECellToggleView *) ecell_view;
-
-	toggle_view->gc = gdk_gc_new (GTK_WIDGET (toggle_view->canvas)->window);
-}
-
-/*
- * ECell::unrealize method
- */
-static void
-etog_unrealize (ECellView *ecv)
-{
-	ECellToggleView *toggle_view = (ECellToggleView *) ecv;
-
-	gdk_gc_unref (toggle_view->gc);
-	toggle_view->gc = NULL;
-}
-
-/*
- * ECell::draw method
- */
-static void
-etog_draw (ECellView *ecell_view, GdkDrawable *drawable,
-	  int model_col, int view_col, int row, ECellFlags flags,
-	  int x1, int y1, int x2, int y2)
-{
-	ECellToggle *toggle = E_CELL_TOGGLE (ecell_view->ecell);
-	gboolean selected;
-#if 0
-	ECellToggleView *toggle_view = (ECellToggleView *) ecell_view;
-#endif
-	GdkPixbuf *image;
-	int x, y, width, height;
-	
-	const int value = GPOINTER_TO_INT (
-		 e_table_model_value_at (ecell_view->e_table_model, model_col, row));
-	
-	selected = flags & E_CELL_SELECTED;
-
-	if (value >= toggle->n_states){
-		g_warning ("Value from the table model is %d, the states we support are [0..%d)\n",
-			   value, toggle->n_states);
-		return;
-	}
-
-	image = toggle->images [value];
-
-	if ((x2 - x1) < gdk_pixbuf_get_width (image)){
-		x = x1;
-		width = x2 - x1;
-	} else {
-		x = x1 + ((x2 - x1) - gdk_pixbuf_get_width (image)) / 2;
-		width = gdk_pixbuf_get_width (image);
-	}
-
-	if ((y2 - y1) < gdk_pixbuf_get_height (image)){
-		y = y1;
-		height = y2 - y1;
-	} else {
-		y = y1 + ((y2 - y1) - gdk_pixbuf_get_height (image)) / 2;
-		height = gdk_pixbuf_get_height (image);
-	}
-
-#if 0 /* do alpha */
-	if (gdk_pixbuf_get_has_alpha (image)) {
-		flat = gdk_pixbuf_composite_color_simple (
-			image,
-			gdk_pixbuf_get_width (image),
-			gdk_pixbuf_get_height (image),
-			GDK_INTERP_NEAREST,
-			255,
-			32,
-			0xffffff, 0xffffff);	
-		
-		gdk_pixbuf_render_to_drawable (flat, drawable,
-					       toggle_view->gc,
-					       0, 0,
-					       x, y,
-					       width, height,
-					       GDK_RGB_DITHER_NORMAL,
-					       0, 0);
-		gdk_pixbuf_unref (flat);
-	} else {
-		gdk_pixbuf_render_to_drawable (image, drawable,
-					       toggle_view->gc,
-					       0, 0,
-					       x, y,
-					       width, height,
-					       GDK_RGB_DITHER_NORMAL,
-					       0, 0);
-	}
-#else 
-	gdk_pixbuf_render_to_drawable_alpha (image, drawable,
-					     0, 0,
-					     x, y,
-					     width, height,
-					     GDK_PIXBUF_ALPHA_BILEVEL,
-					     128,
-					     GDK_RGB_DITHER_NORMAL,
-					     x, y);
-#endif
-}
-
-static void
-etog_set_value (ECellToggleView *toggle_view, int model_col, int view_col, int row, int value)
-{
-	ECell *ecell = toggle_view->cell_view.ecell;
-	ECellToggle *toggle = E_CELL_TOGGLE (ecell);
-
-	if (value >= toggle->n_states)
-		value = 0;
-
-	e_table_model_set_value_at (toggle_view->cell_view.e_table_model,
-				    model_col, row, GINT_TO_POINTER (value));
-	etog_queue_redraw (toggle_view, view_col, row);
-}
-
-/*
- * ECell::event method
- */
-static gint
-etog_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, int row, ECellFlags flags, ECellActions *actions)
-{
-	ECellToggleView *toggle_view = (ECellToggleView *) ecell_view;
-	void *_value = e_table_model_value_at (ecell_view->e_table_model, model_col, row);
-	const int value = GPOINTER_TO_INT (_value);
-
-	if (flags & !E_CELL_EDITING)
-		return 0;
-	
-	switch (event->type){
-	case GDK_BUTTON_RELEASE:
-		if (!e_table_model_is_cell_editable(ecell_view->e_table_model, model_col, row))
-			return FALSE;
-		
-		etog_set_value (toggle_view, model_col, view_col, row, value + 1);
-		return TRUE;
-
-	case GDK_KEY_PRESS:
-		if (!e_table_model_is_cell_editable(ecell_view->e_table_model, model_col, row))
-			return FALSE;
-		
-		if (event->key.keyval == GDK_space){
-			etog_set_value (toggle_view, model_col, view_col, row, value + 1);
-			return TRUE;
-		}
-		return FALSE;
-		
-	default:
-		return FALSE;
-	}
-	return TRUE;
-}
-
-/*
- * ECell::height method
- */
-static int
-etog_height (ECellView *ecell_view, int model_col, int view_col, int row)
-{
-	ECellToggle *toggle = E_CELL_TOGGLE (ecell_view->ecell);
-
-	return toggle->height;
-}
-
-/*
- * ECell::max_width method
- */
-static int
-etog_max_width (ECellView *ecell_view, int model_col, int view_col)
-{
-	ECellToggle *toggle = E_CELL_TOGGLE (ecell_view->ecell);
-	int max_width = 0;
-	int number_of_rows;
-	int row;
-
-	number_of_rows = e_table_model_row_count (ecell_view->e_table_model);
-	for (row = 0; row < number_of_rows; row++) {
-		void *value = e_table_model_value_at (ecell_view->e_table_model,
-						      model_col, row);
-		max_width = MAX (max_width, gdk_pixbuf_get_width (toggle->images[GPOINTER_TO_INT (value)]));
-	}
-
-	return max_width;
-}
-
-static void
-etog_destroy (GtkObject *object)
-{
-	ECellToggle *etog = E_CELL_TOGGLE (object);
-	int i;
-	
-	for (i = 0; i < etog->n_states; i++)
-		gdk_pixbuf_unref (etog->images [i]);
-
-	g_free (etog->images);
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-static void
-e_cell_toggle_class_init (GtkObjectClass *object_class)
-{
-	ECellClass *ecc = (ECellClass *) object_class;
-
-	object_class->destroy = etog_destroy;
-
-	ecc->new_view   = etog_new_view;
-	ecc->kill_view  = etog_kill_view;
-	ecc->realize    = etog_realize;
-	ecc->unrealize  = etog_unrealize;
-	ecc->draw       = etog_draw;
-	ecc->event      = etog_event;
-	ecc->height     = etog_height;
-	ecc->max_width  = etog_max_width;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-}
-
-E_MAKE_TYPE(e_cell_toggle, "ECellToggle", ECellToggle, e_cell_toggle_class_init, NULL, PARENT_TYPE);
-
-/**
- * e_cell_toggle_construct:
- * @etog: a fresh ECellToggle object
- * @border: number of pixels used as a border
- * @n_states: number of states the toggle will have
- * @images: a collection of @n_states images, one for each state.
- *
- * Constructs the @etog object with the @border, @n_staes, and @images
- * arguments.
- */
-void
-e_cell_toggle_construct (ECellToggle *etog, int border, int n_states, GdkPixbuf **images)
-{
-	int max_height =  0;
-	int i;
-	
-	etog->border = border;
-	etog->n_states = n_states;
-
-	etog->images = g_new (GdkPixbuf *, n_states);
-
-	for (i = 0; i < n_states; i++){
-		etog->images [i] = images [i];
-		gdk_pixbuf_ref (images [i]);
-
-		if (gdk_pixbuf_get_height (images [i]) > max_height)
-		  max_height = gdk_pixbuf_get_height (images [i]);
-	}
-
-	etog->height = max_height;
-}
-
-/**
- * e_cell_checkbox_new:
- * @border: number of pixels used as a border
- * @n_states: number of states the toggle will have
- * @images: a collection of @n_states images, one for each state.
- *
- * Creates a new ECell renderer that can be used to render toggle
- * buttons with the images specified in @images.  The value returned 
- * by ETableModel::get_value is typecase into an integer and clamped
- * to the [0..n_states) range.  That will select the image rendered.
- * 
- * Returns: an ECell object that can be used to render multi-state
- * toggle cells.
- */
-ECell *
-e_cell_toggle_new (int border, int n_states, GdkPixbuf **images)
-{
-	ECellToggle *etog = gtk_type_new (e_cell_toggle_get_type ());
-
-	e_cell_toggle_construct (etog, border, n_states, images);
-
-	return (ECell *) etog;
-}
-
-
diff --git a/widgets/table/e-cell-toggle.h b/widgets/table/e-cell-toggle.h
deleted file mode 100644
index 0916970b00..0000000000
--- a/widgets/table/e-cell-toggle.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef _E_CELL_TOGGLE_H_
-#define _E_CELL_TOGGLE_H_
-
-#include <libgnomeui/gnome-canvas.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gal/e-table/e-cell.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_CELL_TOGGLE_TYPE        (e_cell_toggle_get_type ())
-#define E_CELL_TOGGLE(o)          (GTK_CHECK_CAST ((o), E_CELL_TOGGLE_TYPE, ECellToggle))
-#define E_CELL_TOGGLE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CELL_TOGGLE_TYPE, ECellToggleClass))
-#define E_IS_CELL_TOGGLE(o)       (GTK_CHECK_TYPE ((o), E_CELL_TOGGLE_TYPE))
-#define E_IS_CELL_TOGGLE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CELL_TOGGLE_TYPE))
-
-typedef struct {
-	ECell parent;
-
-	int        border;
-	int        n_states;
-	GdkPixbuf **images;
-
-	int        height;
-} ECellToggle;
-
-typedef struct {
-	ECellClass parent_class;
-} ECellToggleClass;
-
-GtkType    e_cell_toggle_get_type  (void);
-ECell     *e_cell_toggle_new       (int border, int n_states, GdkPixbuf **images);
-void       e_cell_toggle_construct (ECellToggle *etog, int border,
-				    int n_states, GdkPixbuf **images);
-
-END_GNOME_DECLS
-
-#endif /* _E_CELL_TOGGLE_H_ */
-
-
diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c
deleted file mode 100644
index af5997eed1..0000000000
--- a/widgets/table/e-cell-tree.c
+++ /dev/null
@@ -1,721 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-cell-tree.c - Tree cell renderer
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Chris Toshok <toshok@ximian.com>
- *
- * A majority of code taken from:
- *
- * the ECellText renderer.
- *
- * Copyright (C) 1998 The Free Software Foundation
- * Copyright (C) 1999, 2000 Ximian, Inc.
- */
-
-#include <config.h>
-
-#include <ctype.h>
-#include <math.h>
-#include <stdio.h>
-
-#include <gdk/gdkx.h> /* for BlackPixel */
-#include <gtk/gtkenums.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkinvisible.h>
-#include <gtk/gtksignal.h>
-#include <gdk/gdkkeysyms.h>
-#include <libgnomeui/gnome-canvas.h>
-
-#include "e-tree-table-adapter.h"
-#include "e-tree-model.h"
-#include "gal/util/e-util.h"
-#include "e-table-item.h"
-#include "e-cell-tree.h"
-
-#include "tree-expanded.xpm"
-#include "tree-unexpanded.xpm"
-
-#define PARENT_TYPE e_cell_get_type ()
-
-typedef struct {
-	ECellView    cell_view;
-	ECellView   *subcell_view;
-	GdkGC       *gc;
-
-	GnomeCanvas *canvas;
-
-} ECellTreeView;
-
-static ECellClass *parent_class;
-
-#define INDENT_AMOUNT 16
-
-static ETreePath
-e_cell_tree_get_node (ETableModel *table_model, int row)
-{
-	return e_table_model_value_at (table_model, -1, row);
-}
-
-static ETreeModel*
-e_cell_tree_get_tree_model (ETableModel *table_model, int row)
-{
-	return e_table_model_value_at (table_model, -2, row);
-}
-
-static ETreeTableAdapter *
-e_cell_tree_get_tree_table_adapter (ETableModel *table_model, int row)
-{
-	return e_table_model_value_at (table_model, -3, row);
-}
-
-static int
-visible_depth_of_node (ETableModel *model, int row)
-{
-	ETreeModel *tree_model = e_cell_tree_get_tree_model(model, row);
-	ETreeTableAdapter *adapter = e_cell_tree_get_tree_table_adapter(model, row);
-	ETreePath path = e_cell_tree_get_node(model, row);
-	return (e_tree_model_node_depth (tree_model, path)
-		- (e_tree_table_adapter_root_node_is_visible (adapter) ? 0 : 1));
-}
-
-static gint
-offset_of_node (ETableModel *table_model, int row)
-{
-	ETreeModel *tree_model = e_cell_tree_get_tree_model(table_model, row);
-	ETreePath path = e_cell_tree_get_node(table_model, row);
-
-	if (visible_depth_of_node (table_model, row) > 0 ||
-	    e_tree_model_node_is_expandable(tree_model, path)) {
-		return (visible_depth_of_node(table_model, row) + 1) * INDENT_AMOUNT;
-	} else {
-		return 0;
-	}
-}
-
-/*
- * ECell::new_view method
- */
-static ECellView *
-ect_new_view (ECell *ecell, ETableModel *table_model, void *e_table_item_view)
-{
-	ECellTree *ect = E_CELL_TREE (ecell);
-	ECellTreeView *tree_view = g_new0 (ECellTreeView, 1);
-	GnomeCanvas *canvas = GNOME_CANVAS_ITEM (e_table_item_view)->canvas;
-	
-	tree_view->cell_view.ecell = ecell;
-	tree_view->cell_view.e_table_model = table_model;
-	tree_view->cell_view.e_table_item_view = e_table_item_view;
-	
-	/* create our subcell view */
-	tree_view->subcell_view = e_cell_new_view (ect->subcell, table_model, e_table_item_view /* XXX */);
-
-	tree_view->canvas = canvas;
-
-	return (ECellView *)tree_view;
-}
-
-/*
- * ECell::kill_view method
- */
-static void
-ect_kill_view (ECellView *ecv)
-{
-	ECellTreeView *tree_view = (ECellTreeView *) ecv;
-
-	/* kill our subcell view */
-	e_cell_kill_view (tree_view->subcell_view);
-
-	g_free (tree_view);
-}
-
-/*
- * ECell::realize method
- */
-static void
-ect_realize (ECellView *ecell_view)
-{
-	ECellTreeView *tree_view = (ECellTreeView *) ecell_view;
-
-	/* realize our subcell view */
-	e_cell_realize (tree_view->subcell_view);
-
-	tree_view->gc = gdk_gc_new (GTK_WIDGET (tree_view->canvas)->window);
-
-	gdk_gc_set_line_attributes (tree_view->gc, 1, 
-				    GDK_LINE_ON_OFF_DASH, None, None);
-	gdk_gc_set_dashes (tree_view->gc, 0, "\1\1", 2);
-
-	if (parent_class->realize)
-		(* parent_class->realize) (ecell_view);
-}
-
-/*
- * ECell::unrealize method
- */
-static void
-ect_unrealize (ECellView *ecv)
-{
-	ECellTreeView *tree_view = (ECellTreeView *) ecv;
-
-	/* unrealize our subcell view. */
-	e_cell_unrealize (tree_view->subcell_view);
-
-	gdk_gc_unref (tree_view->gc);
-	tree_view->gc = NULL;
-
-	if (parent_class->unrealize)
-		(* parent_class->unrealize) (ecv);
-}
-
-/*
- * ECell::draw method
- */
-static void
-ect_draw (ECellView *ecell_view, GdkDrawable *drawable,
-	  int model_col, int view_col, int row, ECellFlags flags,
-	  int x1, int y1, int x2, int y2)
-{
-	ECellTreeView *tree_view = (ECellTreeView *)ecell_view;
-	ETreeModel *tree_model = e_cell_tree_get_tree_model(ecell_view->e_table_model, row);
-	ETreeTableAdapter *tree_table_adapter = e_cell_tree_get_tree_table_adapter(ecell_view->e_table_model, row);
-	ETreePath node;
-	GdkRectangle rect, *clip_rect;
-	GtkWidget *canvas = GTK_WIDGET (tree_view->canvas);
-	GdkGC *fg_gc = canvas->style->fg_gc[GTK_STATE_ACTIVE];
-	GdkColor *foreground;
-	gboolean selected;
-
-	int offset, subcell_offset;
-
-	selected = flags & E_CELL_SELECTED;
-
-	/* only draw the tree effects if we're the active sort */
-	if (/* XXX */ TRUE) {
-		GdkPixbuf *node_image;
-		int node_image_width = 0, node_image_height = 0;
-		ETreePath parent_node;
-
-		node = e_cell_tree_get_node (ecell_view->e_table_model, row);
-
-		offset = offset_of_node (ecell_view->e_table_model, row);
-		subcell_offset = offset;
-
-		node_image = e_tree_model_icon_at (tree_model, node);
-
-		if (node_image) {
-			node_image_width = gdk_pixbuf_get_width (node_image);
-			node_image_height = gdk_pixbuf_get_height (node_image);
-		}
-
-		/*
-		 * Be a nice citizen: clip to the region we are supposed to draw on
-		 */
-		rect.x = x1;
-		rect.y = y1;
-		rect.width = subcell_offset + node_image_width;
-		rect.height = y2 - y1;
-	
-		gdk_gc_set_clip_rectangle (tree_view->gc, &rect);
-		gdk_gc_set_clip_rectangle (fg_gc, &rect);
-		clip_rect = &rect;
-
-		if (selected) {
-			foreground = &canvas->style->text [GTK_STATE_SELECTED];
-		} else {
-			foreground = &canvas->style->text [GTK_STATE_NORMAL];
-		}
-
-		gdk_gc_set_foreground (tree_view->gc, foreground);
-
-		/* draw our lines */
-		if (E_CELL_TREE(tree_view->cell_view.ecell)->draw_lines) {
-
-			int depth;
-
-			if (visible_depth_of_node (ecell_view->e_table_model, row) > 0
-			    || e_tree_model_node_get_children (tree_model, node, NULL) > 0)
-				gdk_draw_line (drawable, tree_view->gc,
-					       rect.x + offset - INDENT_AMOUNT / 2 + 1,
-					       rect.y + rect.height / 2,
-					       rect.x + offset,
-					       rect.y + rect.height / 2);
-
-			if (visible_depth_of_node (ecell_view->e_table_model, row) != 0) {
-				gdk_draw_line (drawable, tree_view->gc,
-					       rect.x + offset - INDENT_AMOUNT / 2,
-					       rect.y,
-					       rect.x + offset - INDENT_AMOUNT / 2,
-					       (e_tree_model_node_get_next (tree_model, node)
-						? rect.y + rect.height
-						: rect.y + rect.height / 2));
-			}
-
-			/* now traverse back up to the root of the tree, checking at
-			   each level if the node has siblings, and drawing the
-			   correct vertical pipe for it's configuration. */
-			parent_node = e_tree_model_node_get_parent (tree_model, node);
-			offset -= INDENT_AMOUNT;
-			depth = visible_depth_of_node (ecell_view->e_table_model, row) - 1;
-			while (parent_node && depth != 0) {
-				if (e_tree_model_node_get_next(tree_model, parent_node)) {
-					gdk_draw_line (drawable, tree_view->gc,
-						       rect.x + offset - INDENT_AMOUNT / 2,
-						       rect.y,
-						       rect.x + offset - INDENT_AMOUNT / 2,
-						       rect.y + rect.height);
-				}
-				parent_node = e_tree_model_node_get_parent (tree_model, parent_node);
-				depth --;
-				offset -= INDENT_AMOUNT;
-			}
-		}
-
-		/* now draw our icon if we're expandable */
-		if (e_tree_model_node_is_expandable (tree_model, node)) {
-			GdkPixbuf *image;
-			int image_width, image_height;
-
-			image = (e_tree_table_adapter_node_is_expanded (tree_table_adapter, node)
-				 ? E_CELL_TREE(tree_view->cell_view.ecell)->open_pixbuf
-				 : E_CELL_TREE(tree_view->cell_view.ecell)->closed_pixbuf);
-
-			image_width = gdk_pixbuf_get_width(image);
-			image_height = gdk_pixbuf_get_height(image);
-
-			gdk_pixbuf_render_to_drawable_alpha (image,
-							     drawable,
-							     0, 0,
-							     x1 + subcell_offset - INDENT_AMOUNT / 2 - image_width / 2,
-							     y1 + (y2 - y1) / 2 - image_height / 2,
-							     image_width, image_height,
-							     GDK_PIXBUF_ALPHA_BILEVEL,
-							     128,
-							     GDK_RGB_DITHER_NORMAL,
-							     image_width, 0);
-		}
-
-		if (node_image) {
-			gdk_pixbuf_render_to_drawable_alpha (node_image,
-							     drawable,
-							     0, 0,
-							     x1 + subcell_offset,
-							     y1 + (y2 - y1) / 2 - node_image_height / 2,
-							     node_image_width, node_image_height,
-							     GDK_PIXBUF_ALPHA_BILEVEL,
-							     128,
-							     GDK_RGB_DITHER_NORMAL,
-							     node_image_width, 0);
-			subcell_offset += node_image_width;
-		}
-	}
-
-	/* Now cause our subcell to draw its contents, shifted by
-	   subcell_offset pixels */
-	e_cell_draw (tree_view->subcell_view, drawable,
-		     model_col, view_col, row, flags,
-		     x1 + subcell_offset, y1, x2, y2);
-}
-
-/*
- * ECell::event method
- */
-static gint
-ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, int row, ECellFlags flags, ECellActions *actions)
-{
-	ECellTreeView *tree_view = (ECellTreeView *) ecell_view;
-	ETreeModel *tree_model = e_cell_tree_get_tree_model (ecell_view->e_table_model, row);
-	ETreeTableAdapter *tree_table_adapter = e_cell_tree_get_tree_table_adapter(ecell_view->e_table_model, row);
-	ETreePath node = e_cell_tree_get_node (ecell_view->e_table_model, row);
-	int offset = offset_of_node (ecell_view->e_table_model, row);
-
-	switch (event->type) {
-	case GDK_BUTTON_PRESS: {
-		/* if the event happened in our area of control (and
-                   we care about it), handle it. */
-
-		/* only activate the tree control if the click/release happens in the icon's area. */
-		if (event->button.x > (offset - INDENT_AMOUNT) && event->button.x < offset) {
-			if (e_tree_model_node_is_expandable (tree_model, node)) {
-				e_tree_table_adapter_node_set_expanded (tree_table_adapter,
-									node,
-									!e_tree_table_adapter_node_is_expanded(tree_table_adapter, node));
-				return TRUE;
-			}
-		}
-		else if (event->button.x < (offset - INDENT_AMOUNT))
-			return FALSE;
-	}
-	default: {
-		gint return_value;
-
-		/* modify the event and pass it off to our subcell_view */
-		switch (event->type) {
-		case GDK_BUTTON_PRESS:
-		case GDK_BUTTON_RELEASE:
-		case GDK_2BUTTON_PRESS:
-		case GDK_3BUTTON_PRESS:
-			event->button.x -= offset;
-			break;
-		case GDK_MOTION_NOTIFY:
-			event->motion.x -= offset;
-			break;
-		default:
-			/* nada */
-			break;
-		}
-
-		return_value = e_cell_event(tree_view->subcell_view, event, model_col, view_col, row, flags, actions);
-
-		/* modify the event and pass it off to our subcell_view */
-		switch (event->type) {
-		case GDK_BUTTON_PRESS:
-		case GDK_BUTTON_RELEASE:
-		case GDK_2BUTTON_PRESS:
-		case GDK_3BUTTON_PRESS:
-			event->button.x += offset;
-			break;
-		case GDK_MOTION_NOTIFY:
-			event->motion.x += offset;
-			break;
-		default:
-			/* nada */
-			break;
-		}
-
-		return return_value;
-	}
-	}
-}
-
-/*
- * ECell::height method
- */
-static int
-ect_height (ECellView *ecell_view, int model_col, int view_col, int row) 
-{
-	ECellTreeView *tree_view = (ECellTreeView *) ecell_view;
-
-	return e_cell_height (tree_view->subcell_view, model_col, view_col, row);
-}
-
-/*
- * ECell::max_width method
- */
-static int
-ect_max_width (ECellView *ecell_view, int model_col, int view_col)
-{
-	ECellTreeView *tree_view = (ECellTreeView *) ecell_view;
-	int row;
-	int number_of_rows;
-	int max_width = 0;
-	int width = 0;
-	int subcell_max_width;
-
-	number_of_rows = e_table_model_row_count (ecell_view->e_table_model);
-
-	subcell_max_width = e_cell_max_width (tree_view->subcell_view, model_col, view_col);
-	
-	for (row = 0; row < number_of_rows; row++) {
-		ETreeModel *tree_model = e_cell_tree_get_tree_model(ecell_view->e_table_model, row);
-		ETreeTableAdapter *tree_table_adapter = e_cell_tree_get_tree_table_adapter(ecell_view->e_table_model, row);
-		ETreePath node;
-		GdkPixbuf *node_image;
-		int node_image_width = 0, node_image_height = 0;
-		
-		int offset, subcell_offset;
-		gboolean expanded, expandable;
-		
-		node = e_cell_tree_get_node (ecell_view->e_table_model, row);
-		
-		offset = offset_of_node (ecell_view->e_table_model, row);
-		expandable = e_tree_model_node_is_expandable (tree_model, node);
-		expanded = e_tree_table_adapter_node_is_expanded (tree_table_adapter, node);
-		subcell_offset = offset;
-
-		node_image = e_tree_model_icon_at (tree_model, node);
-
-		if (node_image) {
-			node_image_width = gdk_pixbuf_get_width (node_image);
-			node_image_height = gdk_pixbuf_get_height (node_image);
-		}
-
-		width = subcell_max_width + subcell_offset + node_image_width;
-
-		if (expandable) {
-			GdkPixbuf *image;
-
-			image = (expanded 
-				 ? E_CELL_TREE(tree_view->cell_view.ecell)->open_pixbuf
-				 : E_CELL_TREE(tree_view->cell_view.ecell)->closed_pixbuf);
-
-			width += gdk_pixbuf_get_width(image);
-		}
-
-		max_width = MAX (max_width, width);
-	}
-
-	return max_width;
-}
-
-/*
- * ECellView::show_tooltip method
- */
-static void
-ect_show_tooltip (ECellView *ecell_view, int model_col, int view_col, int row,
-		  int col_width, ETableTooltip *tooltip)
-{		
-	ECellTreeView *tree_view = (ECellTreeView *) ecell_view;
-	ETreeModel *tree_model = e_cell_tree_get_tree_model (ecell_view->e_table_model, row);
-	ETreePath node = e_cell_tree_get_node (ecell_view->e_table_model, row);
-	int offset = offset_of_node (ecell_view->e_table_model, row);
-	GdkPixbuf *node_image;
-
-	node_image = e_tree_model_icon_at (tree_model, node);
-	if (node_image)
-		offset += gdk_pixbuf_get_width (node_image);
-
-	tooltip->x += offset;
-	e_cell_show_tooltip (tree_view->subcell_view, model_col, view_col, row, col_width - offset, tooltip);
-}
-		
-/*
- * ECellView::enter_edit method
- */
-static void *
-ect_enter_edit (ECellView *ecell_view, int model_col, int view_col, int row)
-{
-	/* just defer to our subcell's view */
-	ECellTreeView *tree_view = (ECellTreeView *) ecell_view;
-
-	return e_cell_enter_edit (tree_view->subcell_view, model_col, view_col, row);
-}
-
-/*
- * ECellView::leave_edit method
- */
-static void
-ect_leave_edit (ECellView *ecell_view, int model_col, int view_col, int row, void *edit_context)
-{
-	/* just defer to our subcell's view */
-	ECellTreeView *tree_view = (ECellTreeView *) ecell_view;
-
-	e_cell_leave_edit (tree_view->subcell_view, model_col, view_col, row, edit_context);
-}
-
-static void
-ect_print (ECellView *ecell_view, GnomePrintContext *context, 
-	   int model_col, int view_col, int row,
-	   double width, double height)
-{
-	ECellTreeView *tree_view = (ECellTreeView *) ecell_view;
-
-	if (/* XXX only if we're the active sort */ TRUE) {
-		ETreeModel *tree_model = e_cell_tree_get_tree_model (ecell_view->e_table_model, row);
-		ETreeTableAdapter *tree_table_adapter = e_cell_tree_get_tree_table_adapter(ecell_view->e_table_model, row);
-		ETreePath node = e_cell_tree_get_node (ecell_view->e_table_model, row);
-		int offset = offset_of_node (ecell_view->e_table_model, row);
-		int subcell_offset = offset;
-		gboolean expandable = e_tree_model_node_is_expandable (tree_model, node);
-		gboolean expanded = e_tree_table_adapter_node_is_expanded (tree_table_adapter, node);
-
-		/* draw our lines */
-		if (E_CELL_TREE(tree_view->cell_view.ecell)->draw_lines) {
-			int depth;
-
-			if (!e_tree_model_node_is_root (tree_model, node)
-			    || e_tree_model_node_get_children (tree_model, node, NULL) > 0) {
-				gnome_print_moveto (context,
-						    offset - INDENT_AMOUNT / 2,
-						    height / 2);
-
-				gnome_print_lineto (context,
-						    offset,
-						    height / 2);
-			}
-
-			if (visible_depth_of_node (ecell_view->e_table_model, row) != 0) {
-				gnome_print_moveto (context,
-						    offset - INDENT_AMOUNT / 2,
-						    height);
-				gnome_print_lineto (context,
-						    offset - INDENT_AMOUNT / 2,
-						    (e_tree_model_node_get_next (tree_model, node)
-						     ? 0
-						     : height / 2));
-			}
-
-			/* now traverse back up to the root of the tree, checking at
-			   each level if the node has siblings, and drawing the
-			   correct vertical pipe for it's configuration. */
-			node = e_tree_model_node_get_parent (tree_model, node);
-			depth = visible_depth_of_node (ecell_view->e_table_model, row) - 1;
-			offset -= INDENT_AMOUNT;
-			while (node && depth != 0) {
-				if (e_tree_model_node_get_next(tree_model, node)) {
-					gnome_print_moveto (context,
-							    offset - INDENT_AMOUNT / 2,
-							    height);
-					gnome_print_lineto (context,
-							    offset - INDENT_AMOUNT / 2,
-							    0);
-				}
-				node = e_tree_model_node_get_parent (tree_model, node);
-				depth --;
-				offset -= INDENT_AMOUNT;
-			}
-		}
-
-		/* now draw our icon if we're expandable */
-		if (expandable) {
-			double image_matrix [6] = {16, 0, 0, 16, 0, 0};
-			GdkPixbuf *image = (expanded 
-					    ? E_CELL_TREE(tree_view->cell_view.ecell)->open_pixbuf
-					    : E_CELL_TREE(tree_view->cell_view.ecell)->closed_pixbuf);
-			int image_width, image_height, image_rowstride;
-			guchar *image_pixels;
-
-			image_width = gdk_pixbuf_get_width(image);
-			image_height = gdk_pixbuf_get_height(image);
-			image_pixels = gdk_pixbuf_get_pixels(image);
-			image_rowstride = gdk_pixbuf_get_rowstride(image);
-
-			image_matrix [4] = subcell_offset - INDENT_AMOUNT / 2 - image_width / 2;
-			image_matrix [5] = height / 2 - image_height / 2;
-
-			gnome_print_gsave (context);
-			gnome_print_concat (context, image_matrix);
-
-			gnome_print_rgbaimage (context, image_pixels, image_width, image_height, image_rowstride);
-			gnome_print_grestore (context);
-		}
-
-		gnome_print_stroke (context);
-
-		if (gnome_print_translate(context, subcell_offset, 0) == -1)
-				/* FIXME */;
-		width -= subcell_offset;
-	}
-
-
-	e_cell_print (tree_view->subcell_view, context, model_col, view_col, row, width, height);
-}
-
-static gdouble
-ect_print_height (ECellView *ecell_view, GnomePrintContext *context, 
-		  int model_col, int view_col, int row,
-		  double width)
-{
-	return 12; /* XXX */
-}
-
-/*
- * GtkObject::destroy method
- */
-static void
-ect_destroy (GtkObject *object)
-{
-	ECellTree *ect = E_CELL_TREE (object);
-
-	/* destroy our subcell */
-	if (ect->subcell)
-		gtk_object_unref (GTK_OBJECT (ect->subcell));
-	ect->subcell = NULL;
-
-	gdk_pixbuf_unref (ect->open_pixbuf);
-	gdk_pixbuf_unref (ect->closed_pixbuf);
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-static void
-e_cell_tree_class_init (GtkObjectClass *object_class)
-{
-	ECellClass *ecc = (ECellClass *) object_class;
-
-	object_class->destroy = ect_destroy;
-
-	ecc->new_view   = ect_new_view;
-	ecc->kill_view  = ect_kill_view;
-	ecc->realize    = ect_realize;
-	ecc->unrealize  = ect_unrealize;
-	ecc->draw       = ect_draw;
-	ecc->event      = ect_event;
-	ecc->height     = ect_height;
-	ecc->enter_edit = ect_enter_edit;
-	ecc->leave_edit = ect_leave_edit;
-	ecc->print      = ect_print;
-	ecc->print_height = ect_print_height;
-	ecc->max_width = ect_max_width;
-	ecc->show_tooltip = ect_show_tooltip;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-}
-
-E_MAKE_TYPE(e_cell_tree, "ECellTree", ECellTree, e_cell_tree_class_init, NULL, PARENT_TYPE);
-
-/**
- * e_cell_tree_construct:
- * @ect: the ECellTree we're constructing.
- * @open_pixbuf: pixbuf to be used instead of the '-' icon.
- * @closed_pixbuf: pixbuf to be used instead of the '+' icon.
- * @draw_lines: whether or not to draw the lines between parents/children/siblings.
- * @subcell: the ECell to render to the right of the tree effects.
- * 
- * Constructs an ECellTree.  used by subclasses that need to
- * initialize a nested ECellTree.  See e_cell_tree_new() for more info.
- * 
- **/
-void
-e_cell_tree_construct (ECellTree *ect,
-		       GdkPixbuf *open_pixbuf,
-		       GdkPixbuf *closed_pixbuf,
-		       gboolean draw_lines,
-		       ECell *subcell)
-{		       
-	ect->subcell = subcell;
-	if (subcell) {
-		gtk_object_ref (GTK_OBJECT (subcell));
-		gtk_object_sink (GTK_OBJECT (subcell));
-	}
-	if (open_pixbuf)
-		ect->open_pixbuf = open_pixbuf;
-	else
-		ect->open_pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **)tree_expanded_xpm);
-	if (closed_pixbuf)
-		ect->closed_pixbuf = closed_pixbuf;
-	else
-		ect->closed_pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **)tree_unexpanded_xpm);
-
-	ect->draw_lines = draw_lines;
-}
-
-
-/**
- * e_cell_tree_new:
- * @open_pixbuf: pixbuf to be used instead of the '-' icon.
- * @closed_pixbuf: pixbuf to be used instead of the '+' icon.
- * @draw_lines: whether or not to draw the lines between parents/children/siblings.
- * @subcell: the ECell to render to the right of the tree effects.
- * 
- * Creates a new ECell renderer that can be used to render tree
- * effects that come from an ETreeModel.  Various assumptions are made
- * as to the fact that the ETableModel the ETable this cell is
- * associated with is in fact an ETreeModel.  The cell uses special
- * columns to get at structural information (needed to draw the
- * lines/icons.
- * 
- * Return value: an ECell object that can be used to render trees.
- **/
-ECell *
-e_cell_tree_new (GdkPixbuf *open_pixbuf,
-		 GdkPixbuf *closed_pixbuf,
-		 gboolean draw_lines,
-		 ECell *subcell)
-{
-	ECellTree *ect = gtk_type_new (e_cell_tree_get_type ());
-
-	e_cell_tree_construct (ect, open_pixbuf, closed_pixbuf, draw_lines, subcell);
-
-	return (ECell *) ect;
-}
diff --git a/widgets/table/e-cell-tree.h b/widgets/table/e-cell-tree.h
deleted file mode 100644
index 7b2d007159..0000000000
--- a/widgets/table/e-cell-tree.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* ECellTree - Tree item for e-table.
- * Copyright (C) 2000 Ximian, Inc.
- * Author: Chris Toshok <toshok@ximian.com>
- *
- */
-#ifndef _E_CELL_TREE_H_
-#define _E_CELL_TREE_H_
-
-#include <libgnomeui/gnome-canvas.h>
-#include <gal/e-table/e-cell.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_CELL_TREE_TYPE        (e_cell_tree_get_type ())
-#define E_CELL_TREE(o)          (GTK_CHECK_CAST ((o), E_CELL_TREE_TYPE, ECellTree))
-#define E_CELL_TREE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CELL_TREE_TYPE, ECellTreeClass))
-#define E_IS_CELL_TREE(o)       (GTK_CHECK_TYPE ((o), E_CELL_TREE_TYPE))
-#define E_IS_CELL_TREE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CELL_TREE_TYPE))
-
-typedef struct {
-	ECell parent;
-
-	gboolean draw_lines;
-
-	GdkPixbuf   *open_pixbuf;
-	GdkPixbuf   *closed_pixbuf;
-
-	ECell *subcell;
-} ECellTree;
-
-typedef struct {
-	ECellClass parent_class;
-} ECellTreeClass;
-
-GtkType    e_cell_tree_get_type (void);
-ECell     *e_cell_tree_new      (GdkPixbuf *open_pixbuf,
-				 GdkPixbuf *closed_pixbuf,
-				 gboolean draw_lines,
-				 ECell *subcell);
-void       e_cell_tree_construct (ECellTree *ect,
-				  GdkPixbuf *open_pixbuf,
-				  GdkPixbuf *closed_pixbuf,
-				  gboolean draw_lines,
-				  ECell *subcell);
-
-
-END_GNOME_DECLS
-
-#endif /* _E_CELL_TREE_H_ */
-
-
diff --git a/widgets/table/e-cell.c b/widgets/table/e-cell.c
deleted file mode 100644
index 79f0a0e9bd..0000000000
--- a/widgets/table/e-cell.c
+++ /dev/null
@@ -1,354 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-cell.c: base class for cell renderers in e-table
- *
- * Author:
- *   Miguel de Icaza (miguel@kernel.org)
- *
- * (C) 1999 Ximian, Inc
- */
-#include <config.h>
-#include "e-cell.h"
-#include "gal/util/e-util.h"
-
-#define PARENT_TYPE gtk_object_get_type ()
-
-static ECellView *
-ec_new_view (ECell *ecell, ETableModel *table_model, void *e_table_item_view)
-{
-	return NULL;
-}
-
-static void
-ec_realize (ECellView *e_cell)
-{
-}
-
-static void
-ec_kill_view (ECellView *ecell_view)
-{
-}
-
-static void
-ec_unrealize (ECellView *e_cell)
-{
-}
-
-static void
-ec_draw (ECellView *ecell_view, GdkDrawable *drawable,
-	 int model_col, int view_col, int row, ECellFlags flags,
-	 int x1, int y1, int x2, int y2)
-{
-	g_error ("e-cell-draw invoked\n");
-}
-
-static gint
-ec_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, int row, ECellFlags flags, ECellActions *actions)
-{
-	g_error ("e-cell-event invoked\n");
-	return 0;
-}
-
-static gint
-ec_height (ECellView *ecell_view, int model_col, int view_col, int row)
-{
-	g_error ("e-cell-height invoked\n");
-	return 0;
-}
-
-static void
-ec_focus (ECellView *ecell_view, int model_col, int view_col, int row, int x1, int y1, int x2, int y2)
-{
-	ecell_view->focus_col = view_col; 
-	ecell_view->focus_row = row;
-	ecell_view->focus_x1 = x1;
-	ecell_view->focus_y1 = y1;
-	ecell_view->focus_x2 = x2;
-	ecell_view->focus_y2 = y2;
-}
-
-static void
-ec_unfocus (ECellView *ecell_view)
-{
-	ecell_view->focus_col = -1;
-	ecell_view->focus_row = -1;
-	ecell_view->focus_x1 = -1;
-	ecell_view->focus_y1 = -1;
-	ecell_view->focus_x2 = -1;
-	ecell_view->focus_y2 = -1;
-}
-
-static void *
-ec_enter_edit (ECellView *ecell_view, int model_col, int view_col, int row)
-{
-	return NULL;
-}
-
-static void
-ec_leave_edit (ECellView *ecell_view, int model_col, int view_col, int row, void *context)
-{
-}
-
-static void
-ec_show_tooltip (ECellView *ecell_view, int model_col, int view_col, int row, int col_width, ETableTooltip *tooltip)
-{
-	/* Do nothing */
-}
-
-static void
-e_cell_class_init (GtkObjectClass *object_class)
-{
-	ECellClass *ecc = (ECellClass *) object_class;
-
-	ecc->realize = ec_realize;
-	ecc->unrealize = ec_unrealize;
-	ecc->new_view = ec_new_view;
-	ecc->kill_view = ec_kill_view;
-	ecc->draw = ec_draw;
-	ecc->event = ec_event;
-	ecc->focus = ec_focus;
-	ecc->unfocus = ec_unfocus;
-	ecc->height = ec_height;
-	ecc->enter_edit = ec_enter_edit;
-	ecc->leave_edit = ec_leave_edit;
-	ecc->print = NULL;
-	ecc->print_height = NULL;
-	ecc->max_width = NULL;
-	ecc->show_tooltip = ec_show_tooltip;
-}
-
-static void
-e_cell_init (GtkObject *object)
-{
-}
-
-E_MAKE_TYPE(e_cell, "ECell", ECell, e_cell_class_init, e_cell_init, PARENT_TYPE);
-
-/**
- * e_cell_event:
- * @ecell_view: The ECellView where the event will be dispatched
- * @event: The GdkEvent.
- * @model_col: the column in the model
- * @view_col: the column in the view
- * @row: the row
- * @flags: flags about the current state
- * @actions: A second return value in case the cell wants to take some action (specifically grabbing & ungrabbing)
- *
- * Dispatches the event @event to the @ecell_view for.
- *
- * Returns: processing state from the GdkEvent handling.
- */
-gint
-e_cell_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, int row, ECellFlags flags, ECellActions *actions)
-{
-	return E_CELL_CLASS (GTK_OBJECT (ecell_view->ecell)->klass)->event (
-		ecell_view, event, model_col, view_col, row, flags, actions);
-}
-
-/** 
- * e_cell_new_view:
- * @ecell: the Ecell that will create the new view
- * @table_model: the table model the ecell is bound to
- * @e_table_item_view: An ETableItem object (the CanvasItem that reprensents the view of the table)
- *
- * ECell renderers new to be bound to a table_model and to the actual view
- * during their life time to actually render the data.  This method is invoked
- * by the ETableItem canvas item to instatiate a new view of the ECell.
- *
- * This is invoked when the ETableModel is attached to the ETableItem (a CanvasItem
- * that can render ETableModels in the screen).
- *
- * Returns: a new ECellView for this @ecell on the @table_model displayed on the @e_table_item_view.
- */
-ECellView *
-e_cell_new_view (ECell *ecell, ETableModel *table_model, void *e_table_item_view)
-{
-	return E_CELL_CLASS (GTK_OBJECT (ecell)->klass)->new_view (
-		ecell, table_model, e_table_item_view);
-}
-
-/**
- * e_cell_realize:
- * @ecell_view: The ECellView to be realized.
- *
- * This function is invoked to give a chance to the ECellView to allocate
- * any resources it needs from Gdk, equivalent to the GtkWidget::realize
- * signal.
- */
-void
-e_cell_realize (ECellView *ecell_view)
-{
-	E_CELL_CLASS (GTK_OBJECT (ecell_view->ecell)->klass)->realize (ecell_view);
-}
-
-/**
- * e_cell_kill_view:
- * @ecell_view: view to be destroyed.
- *
- * This method it used to destroy a view of an ECell renderer
- */
-void
-e_cell_kill_view (ECellView *ecell_view)
-{
-	E_CELL_CLASS (GTK_OBJECT (ecell_view->ecell)->klass)->kill_view (ecell_view);
-}
-
-/**
- * e_cell_unrealize:
- * @ecell_view: The ECellView to be unrealized.
- *
- * This function is invoked to give a chance to the ECellView to
- * release any resources it allocated during the realize method,
- * equivalent to the GtkWidget::unrealize signal.
- */
-void
-e_cell_unrealize (ECellView *ecell_view)
-{
-	E_CELL_CLASS (GTK_OBJECT (ecell_view->ecell)->klass)->unrealize (ecell_view);
-}
-
-/**
- * e_cell_draw:
- * @ecell_view: the ECellView to redraw
- * @drawable: draw desination
- * @model_col: the column in the model being drawn.
- * @view_col: the column in the view being drawn (what the model maps to).
- * @row: the row being drawn
- * @flags: rendering flags.
- * @x1: boudary for the rendering
- * @y1: boudary for the rendering
- * @x2: boudary for the rendering
- * @y2: boudary for the rendering
- *
- * This instructs the ECellView to render itself into the drawable.  The
- * region to be drawn in given by (x1,y1)-(x2,y2).
- *
- * The most important flags are %E_CELL_SELECTED and %E_CELL_FOCUSED, other
- * flags include alignments and justifications.
- */
-void
-e_cell_draw (ECellView *ecell_view, GdkDrawable *drawable,
-	     int model_col, int view_col, int row, ECellFlags flags,
-	     int x1, int y1, int x2, int y2)
-{
-	g_return_if_fail (ecell_view != NULL);
-	g_return_if_fail (row >= 0);
-	g_return_if_fail (row < e_table_model_row_count(ecell_view->e_table_model));
-
-	E_CELL_CLASS (GTK_OBJECT (ecell_view->ecell)->klass)->draw (
-		ecell_view, drawable, model_col, view_col, row, flags, x1, y1, x2, y2);
-}
-
-/**
- * e_cell_print:
- * @ecell_view: the ECellView to redraw
- * @context: The GnomePrintContext where we output our printed data.
- * @model_col: the column in the model being drawn.
- * @view_col: the column in the view being drawn (what the model maps to).
- * @row: the row being drawn
- * @width: width 
- * @height: height
- *
- * FIXME:
- */
-void
-e_cell_print (ECellView *ecell_view, GnomePrintContext *context, 
-	      int model_col, int view_col, int row,
-	      double width, double height)
-{
-	E_CELL_CLASS (GTK_OBJECT (ecell_view->ecell)->klass)->print
-		(ecell_view, context, model_col, view_col, row, width, height);
-}
-
-/**
- * e_cell_print:
- *
- * FIXME:
- */
-gdouble
-e_cell_print_height (ECellView *ecell_view, GnomePrintContext *context, 
-		     int model_col, int view_col, int row,
-		     double width)
-{
-	if (E_CELL_CLASS (GTK_OBJECT (ecell_view->ecell)->klass)->print_height)
-		return E_CELL_CLASS (GTK_OBJECT (ecell_view->ecell)->klass)->print_height
-			(ecell_view, context, model_col, view_col, row, width);
-	else
-		return 0.0;
-}
-
-/**
- * e_cell_height:
- * @ecell_view: the ECellView.
- * @model_col: the column in the model
- * @view_col: the column in the view.
- * @row: the row to me measured
- *
- * Returns: the height of the cell at @model_col, @row rendered at
- * @view_col, @row.
- */
-int
-e_cell_height (ECellView *ecell_view, int model_col, int view_col, int row)
-{
-	return E_CELL_CLASS (GTK_OBJECT (ecell_view->ecell)->klass)->height (
-		ecell_view, model_col, view_col, row);
-}
-
-/**
- * e_cell_enter_edit:
- * @ecell_view: the ECellView that will enter editing
- * @model_col: the column in the model
- * @view_col: the column in the view
- * @row: the row
- *
- * Notifies the ECellView that it is about to enter editing mode for
- * @model_col, @row rendered at @view_col, @row.
- */
-void *
-e_cell_enter_edit (ECellView *ecell_view, int model_col, int view_col, int row)
-{
-	return E_CELL_CLASS (GTK_OBJECT (ecell_view->ecell)->klass)->enter_edit (
-		ecell_view, model_col, view_col, row);
-}
-
-/**
- * e_cell_leave_edit:
- * @ecell_view: the ECellView that will leave editing
- * @model_col: the column in the model
- * @view_col: the column in the view
- * @row: the row
- * @edit_context: the editing context
- *
- * Notifies the ECellView that editing is finished at @model_col, @row
- * rendered at @view_col, @row.
- */
-void
-e_cell_leave_edit (ECellView *ecell_view, int model_col, int view_col, int row, void *edit_context)
-{
-	E_CELL_CLASS (GTK_OBJECT (ecell_view->ecell)->klass)->leave_edit (
-		ecell_view, model_col, view_col, row, edit_context);
-}
-
-/**
- * e_cell_max_width:
- * @ecell_view: the ECellView that will leave editing
- * @model_col: the column in the model
- * @view_col: the column in the view.
- *
- * Returns: the maximum width for the ECellview at @model_col which
- * is being rendered as @view_col
- */
-int
-e_cell_max_width (ECellView *ecell_view, int model_col, int view_col)
-{
-	return E_CELL_CLASS (GTK_OBJECT (ecell_view->ecell)->klass)->max_width 
-		(ecell_view, model_col, view_col);
-}
-	      
-void
-e_cell_show_tooltip (ECellView *ecell_view, int model_col, int view_col, 
-		     int row, int col_width, ETableTooltip *tooltip)
-{
-	E_CELL_CLASS (GTK_OBJECT (ecell_view->ecell)->klass)->show_tooltip
-		(ecell_view, model_col, view_col, row, col_width, tooltip);
-}
diff --git a/widgets/table/e-cell.h b/widgets/table/e-cell.h
deleted file mode 100644
index b9927114bb..0000000000
--- a/widgets/table/e-cell.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_CELL_H_
-#define _E_CELL_H_
-
-#include <gdk/gdktypes.h>
-#include <libgnomeprint/gnome-print.h>
-#include <gal/e-table/e-table-model.h>
-#include <gal/e-table/e-table-tooltip.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_CELL_TYPE        (e_cell_get_type ())
-#define E_CELL(o)          (GTK_CHECK_CAST ((o), E_CELL_TYPE, ECell))
-#define E_CELL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CELL_TYPE, ECellClass))
-#define E_IS_CELL(o)       (GTK_CHECK_TYPE ((o), E_CELL_TYPE))
-#define E_IS_CELL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CELL_TYPE))
-
-typedef enum {
-	E_CELL_SELECTED       = 1 << 0,
-
-	E_CELL_JUSTIFICATION  = 3 << 1,
-	E_CELL_JUSTIFY_CENTER = 0 << 1,
-	E_CELL_JUSTIFY_LEFT   = 1 << 1,
-	E_CELL_JUSTIFY_RIGHT  = 2 << 1,
-	E_CELL_JUSTIFY_FILL   = 3 << 1,
-
-	E_CELL_ALIGN_LEFT     = 1 << 1,
-	E_CELL_ALIGN_RIGHT    = 1 << 2,
-
-	E_CELL_FOCUSED        = 1 << 3,
-
-	E_CELL_EDITING        = 1 << 4,
-} ECellFlags;
-
-typedef enum {
-	E_CELL_GRAB           = 1 << 0,
-	E_CELL_UNGRAB         = 1 << 1,
-} ECellActions;
-
-typedef struct {
-	GtkObject       object;
-} ECell;
-
-typedef struct {
-	ECell *ecell;
-	ETableModel *e_table_model;
-	void        *e_table_item_view;
-	
-	gint   focus_x1, focus_y1, focus_x2, focus_y2;
-	gint   focus_col, focus_row;
-} ECellView;
-
-#define E_CELL_IS_FOCUSED(ecell_view) (ecell_view->focus_x1 != -1)
-
-typedef struct {
-	GtkObjectClass parent_class;
-	
-	ECellView *(*new_view)     (ECell *ecell, ETableModel *table_model, void *e_table_item_view);
-	void       (*kill_view)    (ECellView *ecell_view);
-				   
-	void       (*realize)      (ECellView *ecell_view);
-	void       (*unrealize)    (ECellView *ecell_view);
-				   
-	void   	   (*draw)         (ECellView *ecell_view, GdkDrawable *drawable,
-	       			    int model_col, int view_col, int row,
-				    ECellFlags flags, int x1, int y1, int x2, int y2);
-	gint   	   (*event)        (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, int row, ECellFlags flags, ECellActions *actions);
-	void   	   (*focus)        (ECellView *ecell_view, int model_col, int view_col,
-				    int row, int x1, int y1, int x2, int y2);
-	void   	   (*unfocus)      (ECellView *ecell_view);
-	int        (*height)       (ECellView *ecell_view, int model_col, int view_col, int row);
-				   
-	void      *(*enter_edit)   (ECellView *ecell_view, int model_col, int view_col, int row);
-	void       (*leave_edit)   (ECellView *ecell_view, int model_col, int view_col, int row, void *context);
-	void       (*print)        (ECellView *ecell_view, GnomePrintContext *context,
-				    int model_col, int view_col, int row,
-				    gdouble width, gdouble height);
-	gdouble    (*print_height) (ECellView *ecell_view, GnomePrintContext *context,
-				    int model_col, int view_col, int row, gdouble width);
-	int        (*max_width) (ECellView *ecell_view, int model_col, int view_col);
-	void       (*show_tooltip) (ECellView *ecell_view, int model_col, int view_col, int row, int col_width, ETableTooltip *tooltip);
-} ECellClass;
-
-GtkType    e_cell_get_type  (void);
-ECellView *e_cell_new_view  (ECell *ecell, ETableModel *table_model, void *e_table_item_view);
-void       e_cell_kill_view (ECellView *ecell_view);
-
-gint       e_cell_event     (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, int row, ECellFlags flags, ECellActions *actions);
-
-void       e_cell_realize   (ECellView *ecell_view);
-void       e_cell_unrealize (ECellView *ecell_view);
-
-void       e_cell_draw      (ECellView *ecell_view, GdkDrawable *drawable, 
-			     int model_col, int view_col, int row, ECellFlags flags,
-			     int x1, int y1, int x2, int y2);
-void       e_cell_print      (ECellView *ecell_view, GnomePrintContext *context, 
-			      int model_col, int view_col, int row,
-			      double width, double height);
-gdouble    e_cell_print_height (ECellView *ecell_view, GnomePrintContext *context,
-				int model_col, int view_col, int row, gdouble width);
-int        e_cell_max_width (ECellView *ecell_view, int model_col, int view_col);
-void       e_cell_show_tooltip (ECellView *ecell_view, int model_col, int view_col, int row, int col_width, ETableTooltip *tooltip);
-void       e_cell_focus     (ECellView *ecell_view, int model_col, int view_col, int row,
-			     int x1, int y1, int x2, int y2);
-void       e_cell_unfocus   (ECellView *ecell_view);
-int        e_cell_height    (ECellView *ecell_view, int model_col, int view_col, int row);
-
-void      *e_cell_enter_edit (ECellView *ecell_view, int model_col, int view_col, int row);
-void       e_cell_leave_edit (ECellView *ecell_view, int model_col, int view_col, int row, void *edit_context);
-
-END_GNOME_DECLS
-
-#endif /* _E_CELL_H_ */
diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c
deleted file mode 100644
index 72fe24c6c0..0000000000
--- a/widgets/table/e-table-click-to-add.c
+++ /dev/null
@@ -1,544 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-table-click-to-add.c: A canvas item based view of the ETableColumn.
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * Copyright 1999, 2000 Ximian, Inc.
- */
-#include <config.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtksignal.h>
-#include <libgnomeui/gnome-canvas.h>
-#include <libgnomeui/gnome-canvas-util.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-#include "e-table-header.h"
-#include "e-table-click-to-add.h"
-#include "e-table-defines.h"
-#include "e-table-one.h"
-#include "gal/e-text/e-text.h"
-#include "gal/widgets/e-canvas.h"
-#include "gal/widgets/e-canvas-utils.h"
-
-enum {
-	CURSOR_CHANGE,
-	LAST_SIGNAL
-};
-
-static gint etcta_signals [LAST_SIGNAL] = { 0, };
-
-#define PARENT_OBJECT_TYPE gnome_canvas_group_get_type ()
-
-#define ELEMENTS(x) (sizeof (x) / sizeof (x[0]))
-
-static GnomeCanvasGroupClass *etcta_parent_class;
-
-enum {
-	ARG_0,
-	ARG_HEADER,
-	ARG_MODEL,
-	ARG_MESSAGE,
-	ARG_WIDTH,
-	ARG_HEIGHT,
-};
-
-static void
-etcta_cursor_change (GtkObject *object, gint row, gint col, ETableClickToAdd *etcta)
-{
-	gtk_signal_emit (GTK_OBJECT (etcta),
-			 etcta_signals [CURSOR_CHANGE],
-			 row, col);
-}
-
-static void
-etcta_add_table_header (ETableClickToAdd *etcta, ETableHeader *header)
-{
-	etcta->eth = header;
-	if (etcta->eth)
-		gtk_object_ref (GTK_OBJECT (etcta->eth));
-	if (etcta->row)
-		gnome_canvas_item_set(GNOME_CANVAS_ITEM(etcta->row),
-				      "ETableHeader", header,
-				      NULL);
-}
-
-static void
-etcta_drop_table_header (ETableClickToAdd *etcta)
-{
-	GtkObject *header;
-	
-	if (!etcta->eth)
-		return;
-
-	header = GTK_OBJECT (etcta->eth);
-
-	gtk_object_unref (header);
-	etcta->eth = NULL;
-}
-
-static void
-etcta_add_one (ETableClickToAdd *etcta, ETableModel *one)
-{
-	etcta->one = one;
-	if (etcta->one)
-		gtk_object_ref (GTK_OBJECT(etcta->one));
-	if (etcta->row)
-		gnome_canvas_item_set(GNOME_CANVAS_ITEM(etcta->row),
-				      "ETableModel", one,
-				      NULL);
-	gtk_object_set(GTK_OBJECT(etcta->selection),
-		       "model", one,
-		       NULL);
-}
-
-static void
-etcta_drop_one (ETableClickToAdd *etcta)
-{
-	if (!etcta->one)
-		return;
-	gtk_object_unref (GTK_OBJECT(etcta->one));
-	etcta->one = NULL;
-	gtk_object_set(GTK_OBJECT(etcta->selection),
-		       "model", NULL,
-		       NULL);
-}
-
-static void
-etcta_add_model (ETableClickToAdd *etcta, ETableModel *model)
-{
-	etcta->model = model;
-	if (etcta->model)
-		gtk_object_ref (GTK_OBJECT(etcta->model));
-}
-
-static void
-etcta_drop_model (ETableClickToAdd *etcta)
-{
-	etcta_drop_one (etcta);
-	if (!etcta->model)
-		return;
-	gtk_object_unref (GTK_OBJECT(etcta->model));
-	etcta->model = NULL;
-}
-
-static void
-etcta_add_message (ETableClickToAdd *etcta, char *message)
-{
-	etcta->message = g_strdup(message);
-}
-
-static void
-etcta_drop_message (ETableClickToAdd *etcta)
-{
-	g_free(etcta->message);
-	etcta->message = NULL;
-}
-
-
-static void
-etcta_destroy (GtkObject *object){
-	ETableClickToAdd *etcta = E_TABLE_CLICK_TO_ADD (object);
-
-	etcta_drop_table_header (etcta);
-	etcta_drop_model (etcta);
-	etcta_drop_message (etcta);
-	gtk_object_unref(GTK_OBJECT(etcta->selection));
-
-	if (GTK_OBJECT_CLASS (etcta_parent_class)->destroy)
-		(*GTK_OBJECT_CLASS (etcta_parent_class)->destroy) (object);
-}
-
-static void
-etcta_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	ETableClickToAdd *etcta;
-
-	item = GNOME_CANVAS_ITEM (o);
-	etcta = E_TABLE_CLICK_TO_ADD (o);
-
-	switch (arg_id){
-	case ARG_HEADER:
-		etcta_drop_table_header (etcta);
-		etcta_add_table_header (etcta, E_TABLE_HEADER(GTK_VALUE_OBJECT (*arg)));
-		break;
-	case ARG_MODEL:
-		etcta_drop_model (etcta);
-		etcta_add_model (etcta, E_TABLE_MODEL(GTK_VALUE_OBJECT (*arg)));
-		break;
-	case ARG_MESSAGE:
-		etcta_drop_message (etcta);
-		etcta_add_message (etcta, GTK_VALUE_STRING (*arg));
-		break;
-	case ARG_WIDTH:
-		etcta->width = GTK_VALUE_DOUBLE (*arg);
-		if (etcta->row)
-			gnome_canvas_item_set(etcta->row,
-					      "minimum_width", etcta->width,
-					      NULL);
-		if (etcta->text)
-			gnome_canvas_item_set(etcta->text,
-					      "width", etcta->width - 4,
-					      NULL);
-		if (etcta->rect)
-			gnome_canvas_item_set(etcta->rect,
-					      "x2", etcta->width - 1,
-					      NULL);
-		break;
-	}
-	gnome_canvas_item_request_update(item);
-}
-
-static void
-etcta_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ETableClickToAdd *etcta;
-
-	etcta = E_TABLE_CLICK_TO_ADD (o);
-
-	switch (arg_id){
-	case ARG_HEADER:
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(etcta->eth);
-		break;
-	case ARG_MODEL:
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(etcta->model);
-		break;
-	case ARG_MESSAGE:
-		GTK_VALUE_STRING (*arg) = g_strdup(etcta->message);
-		break;
-	case ARG_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = etcta->width;
-		break;
-	case ARG_HEIGHT:
-		GTK_VALUE_DOUBLE (*arg) = etcta->height;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-etcta_realize (GnomeCanvasItem *item)
-{
-	ETableClickToAdd *etcta = E_TABLE_CLICK_TO_ADD (item);
-
-	etcta->rect = gnome_canvas_item_new(GNOME_CANVAS_GROUP(item),
-					    gnome_canvas_rect_get_type(),
-					    "x1", (double) 0,
-					    "y1", (double) 0,
-					    "x2", (double) etcta->width - 1,
-					    "y2", (double) etcta->height - 1,
-					    "outline_color", "black", 
-					    "fill_color", "white",
-					    NULL);
-
-	etcta->text = gnome_canvas_item_new(GNOME_CANVAS_GROUP(item),
-					    e_text_get_type(),
-					    "text", etcta->message ? etcta->message : "",
-					    "anchor", GTK_ANCHOR_NW,
-					    "width", etcta->width - 4,
-					    "draw_background", FALSE,
-					    NULL);
-	e_canvas_item_move_absolute (etcta->text, 2, 2);
-
-	if (GNOME_CANVAS_ITEM_CLASS (etcta_parent_class)->realize)
-		(*GNOME_CANVAS_ITEM_CLASS (etcta_parent_class)->realize)(item);
-}
-
-static void
-etcta_unrealize (GnomeCanvasItem *item)
-{
-	if (GNOME_CANVAS_ITEM_CLASS (etcta_parent_class)->unrealize)
-		(*GNOME_CANVAS_ITEM_CLASS (etcta_parent_class)->unrealize)(item);
-}
-
-static double
-etcta_point (GnomeCanvasItem *item, double x, double y, int cx, int cy,
-	    GnomeCanvasItem **actual_item)
-{
-	*actual_item = item;
-	return 0.0;
-}
-
-static void finish_editing (ETableClickToAdd *etcta);
-
-static int
-item_key_press (ETableItem *item, int row, int col, GdkEvent *event, ETableClickToAdd *etcta)
-{
-	switch (event->key.keyval) {
-		case GDK_Return:
-		case GDK_KP_Enter:
-		case GDK_ISO_Enter:
-		case GDK_3270_Enter:
-			finish_editing(etcta);
-			return TRUE;
-	}
-	return FALSE;
-}
-
-static void
-finish_editing (ETableClickToAdd *etcta)
-{
-	if (etcta->row) {
-		ETableModel *one;
-
-		e_table_one_commit(E_TABLE_ONE(etcta->one));
-		etcta_drop_one (etcta);
-		gtk_object_destroy(GTK_OBJECT(etcta->row));
-		etcta->row = NULL;
-
-		one = e_table_one_new(etcta->model);
-		etcta_add_one (etcta, one);
-		gtk_object_unref(GTK_OBJECT(one));
-
-		e_selection_model_clear(E_SELECTION_MODEL(etcta->selection));
-
-		etcta->row = gnome_canvas_item_new(GNOME_CANVAS_GROUP(etcta),
-						   e_table_item_get_type(),
-						   "ETableHeader", etcta->eth,
-						   "ETableModel", etcta->one,
-						   "minimum_width", etcta->width,
-						   "horizontal_draw_grid", FALSE,
-						   "vertical_draw_grid", TRUE,
-						   "selection_model", etcta->selection,
-						   "cursor_mode", E_CURSOR_SPREADSHEET,
-						   NULL);
-
-		gtk_signal_connect(GTK_OBJECT(etcta->row), "key_press",
-				   GTK_SIGNAL_FUNC(item_key_press), etcta);
-
-		e_table_item_set_cursor(E_TABLE_ITEM(etcta->row), 0, 0);
-	}
-}
-
-/*
- * Handles the events on the ETableClickToAdd, particularly it creates the ETableItem and passes in some events.
- */
-static int
-etcta_event (GnomeCanvasItem *item, GdkEvent *e)
-{
-	ETableClickToAdd *etcta = E_TABLE_CLICK_TO_ADD (item);
-	int ret_val = TRUE;
-	
-	switch (e->type){
-	case GDK_BUTTON_PRESS:
-		if (etcta->text) {
-			gtk_object_destroy(GTK_OBJECT(etcta->text));
-			etcta->text = NULL;
-		}
-		if (etcta->rect) {
-			gtk_object_destroy(GTK_OBJECT(etcta->rect));
-			etcta->rect = NULL;
-		}
-		if (!etcta->row) {
-			ETableModel *one;
-
-			one = e_table_one_new(etcta->model);
-			etcta_add_one (etcta, one);
-			gtk_object_unref(GTK_OBJECT(one));
-			
-			e_selection_model_clear(E_SELECTION_MODEL(etcta->selection));
-
-			etcta->row = gnome_canvas_item_new(GNOME_CANVAS_GROUP(item),
-							   e_table_item_get_type(),
-							   "ETableHeader", etcta->eth,
-							   "ETableModel", etcta->one,
-							   "minimum_width", etcta->width,
-							   "horizontal_draw_grid", FALSE,
-							   "vertical_draw_grid", TRUE,
-							   "selection_model", etcta->selection,
-							   "cursor_mode", E_CURSOR_SPREADSHEET,
-							   NULL);
-
-			gtk_signal_connect(GTK_OBJECT(etcta->row), "key_press",
-					   GTK_SIGNAL_FUNC(item_key_press), etcta);
-		}
-		/* Fall through.  No break; */
-	case GDK_BUTTON_RELEASE:
-	case GDK_2BUTTON_PRESS:
-	case GDK_3BUTTON_PRESS:
-		if (etcta->row) {
-			gnome_canvas_item_i2w (item, &e->button.x, &e->button.y);
-			gnome_canvas_item_w2i (etcta->row, &e->button.x, &e->button.y);
-			gtk_signal_emit_by_name(GTK_OBJECT(etcta->row), "event", e, &ret_val);
-			gnome_canvas_item_i2w (etcta->row, &e->button.x, &e->button.y);
-			gnome_canvas_item_w2i (item, &e->button.x, &e->button.y);
-		}
-		break;
-
-	case GDK_KEY_PRESS:
-		switch (e->key.keyval) {
-		case GDK_Tab:
-		case GDK_KP_Tab:
-		case GDK_ISO_Left_Tab:
-			finish_editing (etcta);
-			break;
-		default:
-			return FALSE;
-			break;
-		}
-			
-	default:
-		return FALSE;
-	}
-	return TRUE;
-}
-
-static void
-etcta_reflow (GnomeCanvasItem *item, int flags)
-{
-	ETableClickToAdd *etcta = E_TABLE_CLICK_TO_ADD (item);
-	
-	double old_height = etcta->height;
-	
-	if (etcta->text) {
-		gtk_object_get(GTK_OBJECT(etcta->text),
-			       "height", &etcta->height,
-			       NULL);
-		etcta->height += 6;
-	}
-	if (etcta->row) {
-		gtk_object_get(GTK_OBJECT(etcta->row),
-			       "height", &etcta->height,
-			       NULL);
-	}
-
-	if (etcta->rect) {
-		gtk_object_set(GTK_OBJECT(etcta->rect),
-			       "y2", etcta->height - 1,
-			       NULL);
-	}
-	if (old_height != etcta->height)
-		e_canvas_item_request_parent_reflow(item);
-}
-
-static void
-etcta_class_init (ETableClickToAddClass *klass)
-{
-	GnomeCanvasItemClass *item_class = GNOME_CANVAS_ITEM_CLASS(klass);
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS(klass);
-
-	etcta_parent_class = gtk_type_class (PARENT_OBJECT_TYPE);
-
-	klass->cursor_change = NULL;
-
-	object_class->destroy = etcta_destroy;
-	object_class->set_arg = etcta_set_arg;
-	object_class->get_arg = etcta_get_arg;
-
-	item_class->realize     = etcta_realize;
-	item_class->unrealize   = etcta_unrealize;
-	item_class->point       = etcta_point;
-	item_class->event       = etcta_event;
-
-	gtk_object_add_arg_type ("ETableClickToAdd::header", GTK_TYPE_OBJECT,
-				 GTK_ARG_READWRITE, ARG_HEADER);
-	gtk_object_add_arg_type ("ETableClickToAdd::model", GTK_TYPE_OBJECT,
-				 GTK_ARG_READWRITE, ARG_MODEL);
-	gtk_object_add_arg_type ("ETableClickToAdd::message", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_MESSAGE);
-	gtk_object_add_arg_type ("ETableClickToAdd::width", GTK_TYPE_DOUBLE,
-				 GTK_ARG_READWRITE, ARG_WIDTH);
-	gtk_object_add_arg_type ("ETableClickToAdd::height", GTK_TYPE_DOUBLE,
-				 GTK_ARG_READABLE, ARG_HEIGHT);
-
-	etcta_signals [CURSOR_CHANGE] =
-		gtk_signal_new ("cursor_change",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableClickToAddClass, cursor_change),
-				gtk_marshal_NONE__INT_INT,
-				GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
-
-	gtk_object_class_add_signals (object_class, etcta_signals, LAST_SIGNAL);
-}
-
-static void
-etcta_init (GnomeCanvasItem *item)
-{
-	ETableClickToAdd *etcta = E_TABLE_CLICK_TO_ADD (item);
-
-	etcta->one = NULL;
-	etcta->model = NULL;
-	etcta->eth = NULL;
-
-	etcta->message = NULL;
-
-	etcta->row = NULL;
-	etcta->text = NULL;
-	etcta->rect = NULL;
-
-	etcta->selection = e_table_selection_model_new();
-	gtk_signal_connect(GTK_OBJECT(etcta->selection), "cursor_changed",
-			   GTK_SIGNAL_FUNC(etcta_cursor_change), etcta);
-
-	e_canvas_item_set_reflow_callback(item, etcta_reflow);
-}
-
-GtkType
-e_table_click_to_add_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"ETableClickToAdd",
-			sizeof (ETableClickToAdd),
-			sizeof (ETableClickToAddClass),
-			(GtkClassInitFunc) etcta_class_init,
-			(GtkObjectInitFunc) etcta_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_OBJECT_TYPE, &info);
-	}
-
-	return type;
-}
-
-
-/* The colors in this need to be themefied. */
-/**
- * e_table_click_to_add_commit:
- * @etcta: The %ETableClickToAdd to commit.
- * 
- * This routine commits the current thing being edited and returns to
- * just displaying the click to add message.
- **/
-void
-e_table_click_to_add_commit (ETableClickToAdd *etcta)
-{
-	if (etcta->row) {
-		e_table_one_commit(E_TABLE_ONE(etcta->one));
-		etcta_drop_one (etcta);
-		gtk_object_destroy(GTK_OBJECT(etcta->row));
-		etcta->row = NULL;
-	}
-	if (!etcta->rect) {
-		etcta->rect = gnome_canvas_item_new(GNOME_CANVAS_GROUP(etcta),
-						    gnome_canvas_rect_get_type(),
-						    "x1", (double) 0,
-						    "y1", (double) 0,
-						    "x2", (double) etcta->width - 1,
-						    "y2", (double) etcta->height - 1,
-						    "outline_color", "black",
-						    "fill_color", "white",
-						    NULL);
-	}
-	if (!etcta->text) {
-		etcta->text = gnome_canvas_item_new(GNOME_CANVAS_GROUP(etcta),
-						    e_text_get_type(),
-						    "text", etcta->message ? etcta->message : "",
-						    "anchor", GTK_ANCHOR_NW,
-						    "width", etcta->width - 4,
-						    "draw_background", FALSE,
-						    NULL);
-		e_canvas_item_move_absolute (etcta->text, 3, 3);
-	}
-}
diff --git a/widgets/table/e-table-click-to-add.h b/widgets/table/e-table-click-to-add.h
deleted file mode 100644
index 5163825a7b..0000000000
--- a/widgets/table/e-table-click-to-add.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_CLICK_TO_ADD_H_
-#define _E_TABLE_CLICK_TO_ADD_H_
-
-#include <gnome-xml/tree.h>
-#include <libgnomeui/gnome-canvas.h>
-#include <gal/e-table/e-table-header.h>
-#include <gal/e-table/e-table-sort-info.h>
-#include <gal/e-table/e-table-item.h>
-#include <gal/e-table/e-table-selection-model.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TABLE_CLICK_TO_ADD_TYPE        (e_table_click_to_add_get_type ())
-#define E_TABLE_CLICK_TO_ADD(o)          (GTK_CHECK_CAST ((o), E_TABLE_CLICK_TO_ADD_TYPE, ETableClickToAdd))
-#define E_TABLE_CLICK_TO_ADD_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_CLICK_TO_ADD_TYPE, ETableClickToAddClass))
-#define E_IS_TABLE_CLICK_TO_ADD(o)       (GTK_CHECK_TYPE ((o), E_TABLE_CLICK_TO_ADD_TYPE))
-#define E_IS_TABLE_CLICK_TO_ADD_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_CLICK_TO_ADD_TYPE))
-
-typedef struct {
-	GnomeCanvasGroup  parent;
-
-	ETableModel      *one;    /* The ETableOne. */
-
-	ETableModel      *model;  /* The backend model. */
-	ETableHeader     *eth;    /* This is just to give to the ETableItem. */
-
-	char             *message;
-
-	GnomeCanvasItem  *row;    /* If row is NULL, we're sitting with no data and a "Click here" message. */
-	GnomeCanvasItem  *text;   /* If text is NULL, row shouldn't be. */
-	GnomeCanvasItem  *rect;   /* What the heck.  Why not. */
-	
-	gdouble           width;
-	gdouble           height;
-
-	ETableSelectionModel *selection;
-} ETableClickToAdd;
-
-typedef struct {
-	GnomeCanvasGroupClass parent_class;
-
-	/*
-	 * signals
-	 */
-	void (*cursor_change) (ETableClickToAdd *etcta, gint row, gint col);
-} ETableClickToAddClass;
-
-GtkType    e_table_click_to_add_get_type (void);
-
-void       e_table_click_to_add_commit (ETableClickToAdd *etcta);
-
-END_GNOME_DECLS
-
-#endif /* _E_TABLE_CLICK_TO_ADD_H_ */
diff --git a/widgets/table/e-table-col-dnd.h b/widgets/table/e-table-col-dnd.h
deleted file mode 100644
index 98b489b7c0..0000000000
--- a/widgets/table/e-table-col-dnd.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef _E_TABLE_COL_DND_H_
-#define _E_TABLE_COL_DND_H_
-
-BEGIN_GNOME_DECLS
-
-#define TARGET_ETABLE_COL_TYPE "application/x-etable-column-header"
-
-enum {
-	TARGET_ETABLE_COL_HEADER
-};
-
-END_GNOME_DECLS
-
-#endif /* _E_TABLE_COL_DND_H_ */
diff --git a/widgets/table/e-table-col.c b/widgets/table/e-table-col.c
deleted file mode 100644
index 7a67a7cf55..0000000000
--- a/widgets/table/e-table-col.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-col.c: ETableCol implementation
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * (C) 1999 Ximian, Inc
- */
-#include <config.h>
-#include <gtk/gtkobject.h>
-#include <gtk/gtksignal.h>
-#include "e-table-col.h"
-#include "gal/util/e-util.h"
-
-#define PARENT_TYPE (gtk_object_get_type ())
-
-static GtkObjectClass *parent_class;
-
-
-enum {
-	ARG_0,
-	ARG_SORTABLE,
-};
-
-static void
-etc_destroy (GtkObject *object)
-{
-	ETableCol *etc = E_TABLE_COL (object);
-
-	gtk_object_unref (GTK_OBJECT(etc->ecell));
-
-	if (etc->pixbuf)
-		gdk_pixbuf_unref (etc->pixbuf);
-	if (etc->text)
-		g_free (etc->text);
-	
-	(*parent_class->destroy)(object);
-}
- 
-
-static void
-etc_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ETableCol *etc = E_TABLE_COL (o);
-	
-	switch (arg_id){
-	case ARG_SORTABLE:
-		etc->sortable = GTK_VALUE_BOOL(*arg);
-		break;
-	}
-}
-
-static void
-etc_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ETableCol *etc = E_TABLE_COL (o);
-	
-	switch (arg_id){
-	case ARG_SORTABLE:
-		GTK_VALUE_BOOL(*arg) = etc->sortable;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-     
-static void
-e_table_col_class_init (GtkObjectClass *object_class)
-{
-	parent_class = gtk_type_class (PARENT_TYPE);
-	object_class->destroy = etc_destroy;
-	object_class->get_arg = etc_get_arg;
-	object_class->set_arg = etc_set_arg;
-
-	gtk_object_add_arg_type ("ETableCol::sortable",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_SORTABLE);  
-}
-
-static void
-e_table_col_init (ETableCol *etc)
-{
-	etc->width = 0;
-	etc->sortable = 1;
-	etc->groupable = 1;
-	etc->justification = GTK_JUSTIFY_LEFT;
-}
-
-E_MAKE_TYPE(e_table_col, "ETableCol", ETableCol, e_table_col_class_init, e_table_col_init, PARENT_TYPE);
-
-/** 
- * e_table_col_new:
- * @col_idx: the column we represent in the model
- * @text: a title for this column
- * @expansion: FIXME
- * @min_width: minimum width in pixels for this column
- * @ecell: the renderer to be used for this column
- * @compare: comparision function for the elements stored in this column
- * @resizable: whether the column can be resized interactively by the user
- *
- * The ETableCol represents a column to be used inside an ETable.  The
- * ETableCol objects are inserted inside an ETableHeader (which is just a collection
- * of ETableCols).  The ETableHeader is the definition of the order in which
- * columns are shown to the user. 
- *
- * The @text argument is the the text that will be shown as a header to the
- * user. @col_idx reflects where the data for this ETableCol object will
- * be fetch from an ETableModel.  So even if the user changes the order
- * of the columns being viewed (the ETableCols in the ETableHeader), the
- * column will always point to the same column inside the ETableModel.
- *
- * The @ecell argument is an ECell object that needs to know how to render the
- * data in the ETableModel for this specific row. 
- *
- * Returns: the newly created ETableCol object.
- */
-ETableCol *
-e_table_col_new (int col_idx, const char *text, double expansion, int min_width,
-		 ECell *ecell, GCompareFunc compare, gboolean resizable)
-{
-	ETableCol *etc;
-	
-	g_return_val_if_fail (expansion >= 0, NULL);
-	g_return_val_if_fail (min_width >= 0, NULL);
-	g_return_val_if_fail (ecell != NULL, NULL);
-	g_return_val_if_fail (compare != NULL, NULL);
-	g_return_val_if_fail (text != NULL, NULL);
-
-	etc = gtk_type_new (E_TABLE_COL_TYPE);
-       
-	etc->is_pixbuf = FALSE;
-
-	etc->col_idx = col_idx;
-	etc->text = g_strdup (text);
-	etc->pixbuf = NULL;
-	etc->expansion = expansion;
-	etc->min_width = min_width;
-	etc->ecell = ecell;
-	etc->compare = compare;
-
-	etc->selected = 0;
-	etc->resizable = resizable;
-
-	gtk_object_ref (GTK_OBJECT(etc->ecell));
-
-	return etc;
-}
-
-/** 
- * e_table_col_new_with_pixbuf:
- * @col_idx: the column we represent in the model
- * @pixbuf: the image to be used for the header
- * @expansion: FIXME
- * @min_width: minimum width in pixels for this column
- * @ecell: the renderer to be used for this column
- * @compare: comparision function for the elements stored in this column
- * @resizable: whether the column can be resized interactively by the user
- *
- * The ETableCol represents a column to be used inside an ETable.  The
- * ETableCol objects are inserted inside an ETableHeader (which is just a collection
- * of ETableCols).  The ETableHeader is the definition of the order in which
- * columns are shown to the user. 
- *
- * The @text argument is the the text that will be shown as a header to the
- * user. @col_idx reflects where the data for this ETableCol object will
- * be fetch from an ETableModel.  So even if the user changes the order
- * of the columns being viewed (the ETableCols in the ETableHeader), the
- * column will always point to the same column inside the ETableModel.
- *
- * The @ecell argument is an ECell object that needs to know how to render the
- * data in the ETableModel for this specific row. 
- *
- * Returns: the newly created ETableCol object.
- */
-ETableCol *
-e_table_col_new_with_pixbuf (int col_idx, const char *text, GdkPixbuf *pixbuf, double expansion, int min_width,
-			     ECell *ecell, GCompareFunc compare, gboolean resizable)
-{
-	ETableCol *etc;
-	
-	g_return_val_if_fail (expansion >= 0, NULL);
-	g_return_val_if_fail (min_width >= 0, NULL);
-	g_return_val_if_fail (ecell != NULL, NULL);
-	g_return_val_if_fail (compare != NULL, NULL);
-	g_return_val_if_fail (pixbuf != NULL, NULL);
-
-	etc = gtk_type_new (E_TABLE_COL_TYPE);
-
-	etc->is_pixbuf = TRUE;
-
-	etc->col_idx = col_idx;
-	etc->text = g_strdup(text);
-	etc->pixbuf = pixbuf;
-	etc->expansion = expansion;
-	etc->min_width = min_width;
-	etc->ecell = ecell;
-	etc->compare = compare;
-
-	etc->selected = 0;
-	etc->resizable = resizable;
-
-	gtk_object_ref (GTK_OBJECT(etc->ecell));
-	gdk_pixbuf_ref (etc->pixbuf);
-
-	return etc;
-}
diff --git a/widgets/table/e-table-col.h b/widgets/table/e-table-col.h
deleted file mode 100644
index 8377beb37e..0000000000
--- a/widgets/table/e-table-col.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_COL_H_
-#define _E_TABLE_COL_H_
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gal/e-table/e-cell.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_TABLE_COL_TYPE        (e_table_col_get_type ())
-#define E_TABLE_COL(o)          (GTK_CHECK_CAST ((o), E_TABLE_COL_TYPE, ETableCol))
-#define E_TABLE_COL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_COL_TYPE, ETableColClass))
-#define E_IS_TABLE_COL(o)       (GTK_CHECK_TYPE ((o), E_TABLE_COL_TYPE))
-#define E_IS_TABLE_COL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_COL_TYPE))
-
-typedef enum {
-	E_TABLE_COL_ARROW_NONE = 0,
-	E_TABLE_COL_ARROW_UP,
-	E_TABLE_COL_ARROW_DOWN
-} ETableColArrow;
-
-/*
- * Information about a single column
- */
-typedef struct {
-	GtkObject    base;
-	char        *text;
-	GdkPixbuf   *pixbuf;
-	int          min_width;
-	int          width;
-	double       expansion;
-	short        x;
-	GCompareFunc compare;
-	unsigned int is_pixbuf:1;
-	unsigned int selected:1;
-	unsigned int resizable:1;
-	unsigned int sortable:1;
-	unsigned int groupable:1;
-	int          col_idx;
-
-	GtkJustification justification;
-
-	ECell         *ecell;
-} ETableCol;
-
-typedef struct {
-	GtkObjectClass parent_class;
-} ETableColClass;
-
-GtkType        e_table_col_get_type        (void);
-ETableCol     *e_table_col_new             (int col_idx, const char *text,
-					    double expansion, int min_width,
-					    ECell *ecell, GCompareFunc compare,
-					    gboolean resizable);
-ETableCol     *e_table_col_new_with_pixbuf (int col_idx, const char *text, 
-					    GdkPixbuf *pixbuf,
-					    double expansion, int min_width,
-					    ECell *ecell, GCompareFunc compare,
-					    gboolean resizable);
-void           e_table_col_destroy         (ETableCol *etc);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* _E_TABLE_COL_H_ */
-
diff --git a/widgets/table/e-table-column-specification.c b/widgets/table/e-table-column-specification.c
deleted file mode 100644
index 68c19188b1..0000000000
--- a/widgets/table/e-table-column-specification.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-column-specification.c: Savable specification of a column.
- *
- * Author:
- *   Chris Lahey <clahey@ximian.com>
- *
- * (C) 2000 Ximian, Inc.
- */
-#include <config.h>
-#include <stdlib.h>
-#include <gtk/gtksignal.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-#include "gal/util/e-xml-utils.h"
-#include "gal/util/e-util.h"
-#include "e-table-column-specification.h"
-
-#define PARENT_TYPE (gtk_object_get_type())
-
-static GtkObjectClass *etcs_parent_class;
-
-static void
-free_strings (ETableColumnSpecification *etcs)
-{
-	g_free(etcs->title);
-	g_free(etcs->pixbuf);
-	g_free(etcs->cell);
-	g_free(etcs->compare);
-}
-
-static void
-etcs_destroy (GtkObject *object)
-{
-	ETableColumnSpecification *etcs = E_TABLE_COLUMN_SPECIFICATION (object);
-
-	free_strings(etcs);
-
-	GTK_OBJECT_CLASS (etcs_parent_class)->destroy (object);
-}
-
-static void
-etcs_class_init (GtkObjectClass *klass)
-{
-	etcs_parent_class = gtk_type_class (PARENT_TYPE);
-	
-	klass->destroy = etcs_destroy;
-}
-
-static void
-etcs_init (ETableColumnSpecification *specification)
-{
-	specification->model_col     = 0;
-	specification->title        = g_strdup("");
-	specification->pixbuf        = NULL;
-	
-	specification->expansion     = 0;
-	specification->minimum_width = 0;
-	specification->resizable     = FALSE;
-	
-	specification->cell          = NULL;
-	specification->compare       = NULL;
-}
-
-E_MAKE_TYPE(e_table_column_specification, "ETableColumnSpecification", ETableColumnSpecification, etcs_class_init, etcs_init, PARENT_TYPE);
-
-ETableColumnSpecification *
-e_table_column_specification_new (void)
-{
-	ETableColumnSpecification *etcs = gtk_type_new (E_TABLE_COLUMN_SPECIFICATION_TYPE);
-
-	return (ETableColumnSpecification *) etcs;
-}
-
-void
-e_table_column_specification_load_from_node (ETableColumnSpecification *etcs,
-					     const xmlNode       *node)
-{
-	free_strings(etcs);
-
-	etcs->model_col     = e_xml_get_integer_prop_by_name(node, "model_col");
-	etcs->title         = e_xml_get_string_prop_by_name(node, "_title");
-	etcs->pixbuf        = e_xml_get_string_prop_by_name(node, "pixbuf");
-
-	etcs->expansion     = e_xml_get_double_prop_by_name(node, "expansion");
-	etcs->minimum_width = e_xml_get_integer_prop_by_name(node, "minimum_width");
-	etcs->resizable     = e_xml_get_bool_prop_by_name(node, "resizable");
-
-	etcs->cell          = e_xml_get_string_prop_by_name(node, "cell");
-	etcs->compare       = e_xml_get_string_prop_by_name(node, "compare");
-
-	if (etcs->title == NULL)
-		etcs->title = g_strdup("");
-}
-
-xmlNode *
-e_table_column_specification_save_to_node (ETableColumnSpecification *specification,
-					   xmlNode                   *parent)
-{
-	xmlNode *node;
-	if (parent)
-		node = xmlNewChild(parent, NULL, "ETableColumn", NULL);
-	else
-		node = xmlNewNode(NULL, "ETableColumn");
-
-	e_xml_set_integer_prop_by_name(node, "model_col", specification->model_col);
-	e_xml_set_string_prop_by_name(node, "_title", specification->title);
-	e_xml_set_string_prop_by_name(node, "pixbuf", specification->pixbuf);
-
-	e_xml_set_double_prop_by_name(node, "expansion", specification->expansion);
-	e_xml_set_integer_prop_by_name(node, "minimum_width", specification->minimum_width);
-	e_xml_set_bool_prop_by_name(node, "resizable", specification->resizable);
-
-	e_xml_set_string_prop_by_name(node, "cell", specification->cell);
-	e_xml_set_string_prop_by_name(node, "compare", specification->compare);
-
-	return node;
-}
-
diff --git a/widgets/table/e-table-column-specification.h b/widgets/table/e-table-column-specification.h
deleted file mode 100644
index 2bcbe75e20..0000000000
--- a/widgets/table/e-table-column-specification.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_COLUMN_SPECIFICATION_H_
-#define _E_TABLE_COLUMN_SPECIFICATION_H_
-
-#include <glib.h>
-#include <gtk/gtkobject.h>
-#include <gnome-xml/tree.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-#define E_TABLE_COLUMN_SPECIFICATION_TYPE        (e_table_column_specification_get_type ())
-#define E_TABLE_COLUMN_SPECIFICATION(o)          (GTK_CHECK_CAST ((o), E_TABLE_COLUMN_SPECIFICATION_TYPE, ETableColumnSpecification))
-#define E_TABLE_COLUMN_SPECIFICATION_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_COLUMN_SPECIFICATION_TYPE, ETableColumnSpecificationClass))
-#define E_IS_TABLE_COLUMN_SPECIFICATION(o)       (GTK_CHECK_TYPE ((o), E_TABLE_COLUMN_SPECIFICATION_TYPE))
-#define E_IS_TABLE_COLUMN_SPECIFICATION_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_COLUMN_SPECIFICATION_TYPE))
-
-typedef struct {
-	GtkObject base;
-	int model_col;
-	char *title;
-	char *pixbuf;
-
-	double expansion;
-	int minimum_width;
-	guint resizable : 1;
-
-	char *cell;
-	char *compare;
-} ETableColumnSpecification;
-
-typedef struct {
-	GtkObjectClass parent_class;
-} ETableColumnSpecificationClass;
-
-GtkType                    e_table_column_specification_get_type        (void);
-
-ETableColumnSpecification *e_table_column_specification_new             (void);
-
-void                       e_table_column_specification_load_from_node  (ETableColumnSpecification *state,
-									 const xmlNode             *node);
-xmlNode                   *e_table_column_specification_save_to_node    (ETableColumnSpecification *state,
-									 xmlNode                   *parent);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TABLE_COLUMN_SPECIFICATION_H_ */
diff --git a/widgets/table/e-table-column.c b/widgets/table/e-table-column.c
deleted file mode 100644
index a3d6201ffd..0000000000
--- a/widgets/table/e-table-column.c
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- * e-table-column.c: TableColumn implementation
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * (C) 1999 Ximian, Inc
- */
-#include <config.h>
-#include "e-table-column.h"
-
-enum {
-	STRUCTURE_CHANGE,
-	DIMENSION_CHANGE,
-	LAST_SIGNAL
-};
-
-static guint etc_signals [LAST_SIGNAL] = { 0, };
-
-static GtkObjectClass *e_table_column_parent_class;
-
-static void
-e_table_column_destroy (GtkObject *object)
-{
-	ETableColumn *etc = E_TABLE_COLUMN (object);
-	const int cols = etc->col_count;
-
-	/*
-	 * Destroy listeners
-	 */
-	for (l = etc->listeners; l; l = l->next)
-		g_free (l->data);
-	g_slist_free (etc->listeners);
-	etc->listeners = NULL;
-
-	/*
-	 * Destroy columns
-	 */
-	for (i = 0; i < cols; i++)
-		e_table_column_remove (etc, i);
-	
-	if (e_table_column_parent_class->destroy)
-		e_table_column_parent_class->destroy (object);
-}
-
-static void
-e_table_column_class_init (GtkObjectClass *object_class)
-{
-	object_class->destroy = e_table_column_destroy;
-
-	e_table_column_parent_class = (gtk_type_class (gtk_object_get_type ()));
-
-	etc_signals [STRUCTURE_CHANGE] =
-		gtk_signal_new ("structure_change",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableColumn, structure_change),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-	etc_signals [DIMENSION_CHANGE] = 
-		gtk_signal_new ("dimension_change", 
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableColumn, dimension_change),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
-
-	gtk_object_class_add_signals (object_class, etc_signals, LAST_SIGNAL);
-}
-
-GtkType
-e_table_column_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"ETableColumn",
-			sizeof (ETableColumn),
-			sizeof (ETableColumnClass),
-			(GtkClassInitFunc) e_table_column_class_init,
-			(GtkObjectInitFunc) NULL,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (gtk_object_get_type (), &info);
-	}
-
-	return type;
-}
-
-static void
-etc_do_insert (ETableColumn *etc, int pos, ETableCol *val)
-{
-	memcpy (&etc->columns [pos+1], &etc->columns [pos],
-		sizeof (ETableCol *) * (etc->col_count - pos));
-	etc->columns [pos] = val;
-}
-
-void
-e_table_column_add_column (ETableColumn *etc, ETableCol *tc, int pos)
-{
-	ETableCol **new_ptr;
-	
-	g_return_if_fail (etc != NULL);
-	g_return_if_fail (E_IS_TABLE_COLUMN (etc));
-	g_return_if_fail (tc != NULL);
-	g_return_if_fail (pos >= 0 && pos < etc->col_count);
-
-	if (pos == -1)
-		pos = etc->col_count;
-	etc->columns = g_realloc (etc->columns, sizeof (ETableCol *) * (etc->col_count + 1));
-	etc_do_insert (etc, pos, tc);
-	etc->col_count++;
-
-	gtk_signal_emit (GTK_OBJECT (etc), etc_signals [STRUCTURE_CHANGE]);
-}
-
-ETableCol *
-e_table_column_get_column (ETableColumn *etc, int column)
-{
-	g_return_val_if_fail (etc != NULL, NULL);
-	g_return_val_if_fail (E_IS_TABLE_COLUMN (etc), NULL);
-
-	if (column < 0)
-		return NULL;
-
-	if (column >= etc->col_count)
-		return NULL;
-
-	return etc->columns [column];
-}
-
-int
-e_table_column_count (ETableColumn *etc)
-{
-	g_return_val_if_fail (etc != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_COLUMN (etc), 0);
-
-	return etc->col_count;
-}
-
-int
-e_table_column_index (ETableColumn *etc, const char *identifier)
-{
-	int i;
-	
-	g_return_val_if_fail (etc != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_COLUMN (etc), 0);
-	g_return_val_if_fail (identifier != NULL, 0);
-
-	for (i = 0; i < etc->col_count; i++){
-		ETableCol *tc = etc->columns [i];
-		
-		if (strcmp (i->id, identifier) == 0)
-			return i;
-	}
-
-	return -1;
-}
-
-int
-e_table_column_get_index_at (ETableColumn *etc, int x_offset)
-{
-	int i, total;
-	
-	g_return_val_if_fail (etc != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_COLUMN (etc), 0);
-	g_return_val_if_fail (identifier != NULL, 0);
-
-	total = 0;
-	for (i = 0; i < etc->col_count; i++){
-		total += etc->columns [i]->width;
-
-		if (x_offset < total)
-			return i;
-	}
-
-	return -1;
-}
-
-ETableCol **
-e_table_column_get_columns (ETableColumn *etc)
-{
-	ETableCol **ret;
-	int i;
-	
-	g_return_val_if_fail (etc != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_COLUMN (etc), 0);
-
-	ret = g_new (ETableCol *, etc->col_count + 1);
-	memcpy (ret, etc->columns, sizeof (ETableCol *) * etc->col_count);
-	ret [etc->col_count] = NULL;
-
-	return ret;
-}
-
-gboolean
-e_table_column_selection_ok (ETableColumn *etc)
-{
-	g_return_val_if_fail (etc != NULL, FALSE);
-	g_return_val_if_fail (E_IS_TABLE_COLUMN (etc), FALSE);
-
-	return etc->selectable;
-}
-
-int
-ve_table_column_get_selected (ETableColumn *etc)
-{
-	int i;
-	int selected = 0;
-	
-	g_return_val_if_fail (etc != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_COLUMN (etc), 0);
-
-	for (i = 0; i < etc->col_count; i++){
-		if (etc->columns [i]->selected)
-			selected++;
-	}
-
-	return selected;
-}
-
-int
-e_table_column_total_width (ETableColumn *etc)
-{
-	int total;
-	
-	g_return_val_if_fail (etc != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_COLUMN (etc), 0);
-
-	total = 0;
-	for (i = 0; i < etc->col_count; i++)
-		total += etc->columns [i].width;
-
-	return total;
-}
-
-static void
-etc_do_remove (ETableColumn *etc, int idx)
-{
-	memcpy (&etc->columns [idx], &etc->columns [idx+1],
-		sizeof (ETableCol *) * etc->col_count - idx);
-	etc->col_count--;
-}
-
-void
-e_table_column_move (ETableColumn *etc, int source_index, int target_index)
-{
-	g_return_if_fail (etc != NULL);
-	g_return_if_fail (E_IS_TABLE_COLUMN (etc));
-	g_return_if_fail (source_index >= 0);
-	g_return_if_fail (target_index >= 0);
-	g_return_if_fail (source_index < etc->col_count);
-	g_return_if_fail (target_index < etc->col_count);
-
-	old = etc->columns [source_index];
-	etc_do_remove (etc, source_index);
-	etc_do_insert (etc, target_index, old);
-	gtk_signal_emit (GTK_OBJECT (etc), etc_signals [STRUCTURE_CHANGE]);
-}
-
-void
-e_table_column_remove (ETableColumn *etc, int idx)
-{
-	g_return_if_fail (etc != NULL);
-	g_return_if_fail (E_IS_TABLE_COLUMN (etc));
-	g_return_if_fail (idx >= 0);
-	g_return_if_fail (idx < etc->col_count);
-
-	etc_do_remove (etc, idx);
-	gtk_signal_emit (GTK_OBJECT (etc), etc_signals [STRUCTURE_CHANGE]);
-}
-
-void
-e_table_column_set_selection (ETableColumn *etc, gboolean allow_selection);
-{
-}
-
-void
-e_table_column_set_size (ETableColumn *etc, int idx, int size)
-{
-	g_return_if_fail (etc != NULL);
-	g_return_if_fail (E_IS_TABLE_COLUMN (etc));
-	g_return_if_fail (idx >= 0);
-	g_return_if_fail (idx < etc->col_count);
-	g_return_if_fail (size > 0);
-
-	etc->columns [idx]->width = size;
-	gtk_signal_emit (GTK_OBJECT (etc), etc_signals [SIZE_CHANGE], idx);
-}
diff --git a/widgets/table/e-table-config-field.c b/widgets/table/e-table-config-field.c
deleted file mode 100644
index d5116b1a11..0000000000
--- a/widgets/table/e-table-config-field.c
+++ /dev/null
@@ -1,278 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-config-field.c: One field of either the sort or group dialog.
- *
- * Author:
- *   Chris Lahey <clahey@ximian.com>
- *
- * (C) 2000 Ximian, Inc.
- */
-#include <config.h>
-#include <stdlib.h>
-#include "gal/util/e-util.h"
-#include "e-table-config-field.h"
-
-#define PARENT_TYPE (gtk_vbox_get_type())
-
-static GtkVBoxClass *etcf_parent_class;
-
-static void
-etcf_destroy (GtkObject *object)
-{
-	ETableConfigField *etcf = E_TABLE_CONFIG_FIELD (object);
-
-	gtk_object_unref(GTK_OBJECT(etcf->spec));
-	gtk_object_unref(GTK_OBJECT(etcf->sort_info));
-
-	GTK_OBJECT_CLASS (etcf_parent_class)->destroy (object);
-}
-
-static void
-etcf_class_init (GtkObjectClass *klass)
-{
-	etcf_parent_class = gtk_type_class (PARENT_TYPE);
-	
-	klass->destroy = etcf_destroy;
-}
-
-static void
-etcf_init (ETableConfigField *etcf)
-{
-	etcf->spec             = NULL;
-	etcf->sort_info        = NULL;
-
-	etcf->combo            = NULL;
-	etcf->radio_ascending  = NULL;
-	etcf->radio_descending = NULL;
-	etcf->child_fields     = NULL;
-}
-
-E_MAKE_TYPE(e_table_config_field, "ETableConfigField", ETableConfigField, etcf_class_init, etcf_init, PARENT_TYPE);
-
-ETableConfigField *
-e_table_config_field_new       (ETableSpecification *spec,
-				ETableSortInfo      *sort_info,
-				gboolean             grouping)
-{
-	ETableConfigField *etcf = gtk_type_new (E_TABLE_CONFIG_FIELD_TYPE);
-
-	e_table_config_field_construct (etcf, spec, sort_info, grouping);
-
-	return (ETableConfigField *) etcf;
-}
-
-inline static int
-etcf_get_count (ETableConfigField *etcf)
-{
-	if (etcf->grouping)
-		return e_table_sort_info_grouping_get_count(etcf->sort_info);
-	else
-		return e_table_sort_info_sorting_get_count(etcf->sort_info);
-}
-
-inline static ETableSortColumn
-etcf_get_nth (ETableConfigField *etcf)
-{
-	if (etcf->grouping)
-		return e_table_sort_info_grouping_get_nth(etcf->sort_info, etcf->n);
-	else
-		return e_table_sort_info_sorting_get_nth(etcf->sort_info, etcf->n);
-}
-
-inline static void
-etcf_set_nth (ETableConfigField *etcf, ETableSortColumn column)
-{
-	if (etcf->grouping)
-		e_table_sort_info_grouping_set_nth(etcf->sort_info, etcf->n, column);
-	else
-		e_table_sort_info_sorting_set_nth(etcf->sort_info, etcf->n, column);
-}
-
-inline static void
-etcf_truncate (ETableConfigField *etcf)
-{
-	if (etcf->grouping)
-		e_table_sort_info_grouping_truncate(etcf->sort_info, etcf->n);
-	else
-		e_table_sort_info_sorting_truncate(etcf->sort_info, etcf->n);
-}
-
-static void
-etcf_set_sensitivity(ETableConfigField *etcf)
-{
-	int count = etcf_get_count(etcf);
-
-	if (etcf->n >= count) {
-		gtk_widget_set_sensitive(etcf->radio_ascending, FALSE);
-		gtk_widget_set_sensitive(etcf->radio_descending, FALSE);
-		if (etcf->child_fields)
-			gtk_widget_set_sensitive(etcf->child_fields, FALSE);
-	} else {
-		gtk_widget_set_sensitive(etcf->radio_ascending, TRUE);
-		gtk_widget_set_sensitive(etcf->radio_descending, TRUE);
-		if (etcf->child_fields)
-			gtk_widget_set_sensitive(etcf->child_fields, TRUE);
-	}
-}
-
-static void
-toggled(GtkWidget *widget, ETableConfigField *etcf)
-{
-	int count;
-
-	count = etcf_get_count(etcf);
-	if (count > etcf->n) {
-		ETableSortColumn sort_column;
-
-		sort_column = etcf_get_nth(etcf);
-		sort_column.ascending = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(etcf->radio_ascending));
-		etcf_set_nth(etcf, sort_column);
-	}
-}
-
-static void
-changed(GtkWidget *widget, ETableConfigField *etcf)
-{
-	ETableColumnSpecification **column;
-	gchar *text;
-
-	text = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(etcf->combo)->entry));
-	for (column = etcf->spec->columns; *column; column++) {
-		if (!strcmp((*column)->title_, text)) {
-			ETableSortColumn sort_column;
-
-			sort_column.ascending = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(etcf->radio_ascending));
-			sort_column.column = (*column)->model_col;
-
-			etcf_set_nth(etcf, sort_column);
-			etcf_set_sensitivity(etcf);
-			return;
-		}
-	}
-	etcf_truncate(etcf);
-	etcf_set_sensitivity(etcf);
-}
-
-static void
-etcf_setup(ETableConfigField *etcf)
-{
-	int count;
-	GList *list = NULL;
-	ETableColumnSpecification **column;
-	ETableColumnSpecification *chosen_column = NULL;
-	int model_col = -1;
-
-	etcf_set_sensitivity(etcf);
-
-	count = etcf_get_count(etcf);
-
-	if (count > etcf->n) {
-		ETableSortColumn sort_column;
-
-		sort_column = etcf_get_nth(etcf);
-		model_col = sort_column.column;
-		if (sort_column.ascending)
-			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(etcf->radio_ascending), TRUE);
-		else
-			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(etcf->radio_descending), TRUE);
-	}
-
-	for (column = etcf->spec->columns; *column; column++) {
-		list = g_list_prepend(list, (*column)->title_);
-		if (count > etcf->n && chosen_column == NULL && (*column)->model_col == model_col) {
-			chosen_column = *column;
-		}
-	}
-	list = g_list_reverse(list);
-	list = g_list_prepend(list, "None");
-
-	gtk_combo_set_popdown_strings(GTK_COMBO(etcf->combo), list);
-	g_list_free(list);
-
-	if (chosen_column) {
-		gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(etcf->combo)->entry), chosen_column->title_);
-	} else {
-		gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(etcf->combo)->entry), "None");
-	}
-
-	gtk_signal_connect(GTK_OBJECT(GTK_COMBO(etcf->combo)->entry), "changed",
-			   GTK_SIGNAL_FUNC(changed), etcf);
-	gtk_signal_connect(GTK_OBJECT(etcf->radio_ascending), "toggled",
-			   GTK_SIGNAL_FUNC(toggled), etcf);
-	gtk_signal_connect(GTK_OBJECT(etcf->radio_descending), "toggled",
-			   GTK_SIGNAL_FUNC(toggled), etcf);
-}
-
-static ETableConfigField *
-e_table_config_field_construct_nth (ETableConfigField   *etcf,
-				    ETableSpecification *spec,
-				    ETableSortInfo      *sort_info,
-				    gboolean             grouping,
-				    int                  n)
-{
-	GtkWidget *frame;
-	GtkWidget *internal_hbox;
-	GtkWidget *internal_vbox1;
-	GtkWidget *internal_vbox2;
-
-	etcf->spec = spec;
-	gtk_object_ref(GTK_OBJECT(spec));
-
-	etcf->sort_info = sort_info;
-	gtk_object_ref(GTK_OBJECT(sort_info));
-
-	etcf->grouping = grouping;
-	etcf->n = n;
-
-	gtk_box_set_spacing(GTK_BOX(etcf), 6);
-
-	frame = gtk_frame_new(n > 0 ? _("Then By") : (grouping ? _("Group By") : _("Sort By")));
-	gtk_box_pack_start(GTK_BOX(etcf), frame, FALSE, FALSE, 0);
-
-	internal_hbox = gtk_hbox_new(FALSE, 6);
-	gtk_container_add(GTK_CONTAINER(frame), internal_hbox);
-	gtk_container_set_border_width(GTK_CONTAINER(internal_hbox), 6);
-
-	internal_vbox1 = gtk_vbox_new(FALSE, 6);
-	gtk_box_pack_start(GTK_BOX(internal_hbox), internal_vbox1, FALSE, FALSE, 0);
-
-	etcf->combo = gtk_combo_new();
-	gtk_box_pack_start(GTK_BOX(internal_vbox1), etcf->combo, FALSE, FALSE, 0);
-
-	internal_vbox2 = gtk_vbox_new(FALSE, 6);
-	gtk_box_pack_start(GTK_BOX(internal_hbox), internal_vbox2, FALSE, FALSE, 0);
-
-	etcf->radio_ascending = gtk_radio_button_new_with_label (NULL, _("Ascending"));
-	gtk_box_pack_start(GTK_BOX(internal_vbox2), etcf->radio_ascending, FALSE, FALSE, 0);
-
-	etcf->radio_descending = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON(etcf->radio_ascending), _("Descending"));
-	gtk_box_pack_start(GTK_BOX(internal_vbox2), etcf->radio_descending, FALSE, FALSE, 0);
-
-	if (n < 3) {
-		etcf->child_fields = GTK_WIDGET(gtk_type_new (E_TABLE_CONFIG_FIELD_TYPE));
-		e_table_config_field_construct_nth(E_TABLE_CONFIG_FIELD(etcf->child_fields), spec, sort_info, grouping, n + 1);
-		gtk_box_pack_start(GTK_BOX(etcf), etcf->child_fields, FALSE, FALSE, 0);
-		gtk_widget_show(etcf->child_fields);
-	} else
-		etcf->child_fields = NULL;
-
-	etcf_setup(etcf);
-
-	gtk_widget_show(etcf->radio_descending);
-	gtk_widget_show(etcf->radio_ascending);
-	gtk_widget_show(internal_vbox2);
-	gtk_widget_show(etcf->combo);
-	gtk_widget_show(internal_vbox1);
-	gtk_widget_show(internal_hbox);
-	gtk_widget_show(frame);
-	return etcf;
-}
-
-ETableConfigField *
-e_table_config_field_construct (ETableConfigField   *etcf,
-				ETableSpecification *spec,
-				ETableSortInfo      *sort_info,
-				gboolean             grouping)
-{
-	return e_table_config_field_construct_nth(etcf, spec, sort_info, grouping, 0);
-}
diff --git a/widgets/table/e-table-config-field.h b/widgets/table/e-table-config-field.h
deleted file mode 100644
index 9df83238ee..0000000000
--- a/widgets/table/e-table-config-field.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_CONFIG_FIELD_H_
-#define _E_TABLE_CONFIG_FIELD_H_
-
-#include <gtk/gtkvbox.h>
-#include <gal/e-table/e-table-sort-info.h>
-#include <gal/e-table/e-table-specification.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TABLE_CONFIG_FIELD_TYPE        (e_table_config_field_get_type ())
-#define E_TABLE_CONFIG_FIELD(o)          (GTK_CHECK_CAST ((o), E_TABLE_CONFIG_FIELD_TYPE, ETableConfigField))
-#define E_TABLE_CONFIG_FIELD_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_CONFIG_FIELD_TYPE, ETableConfigFieldClass))
-#define E_IS_TABLE_CONFIG_FIELD(o)       (GTK_CHECK_TYPE ((o), E_TABLE_CONFIG_FIELD_TYPE))
-#define E_IS_TABLE_CONFIG_FIELD_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_CONFIG_FIELD_TYPE))
-
-typedef struct {
-	GtkVBox base;
-
-	ETableSpecification *spec;
-	ETableSortInfo *sort_info;
-	guint grouping : 1;
-	int n;
-
-	GtkWidget *combo;
-	GtkWidget *radio_ascending;
-	GtkWidget *radio_descending;
-
-	GtkWidget *child_fields;
-} ETableConfigField;
-
-typedef struct {
-	GtkVBoxClass parent_class;
-} ETableConfigFieldClass;
-
-GtkType            e_table_config_field_get_type  (void);
-ETableConfigField *e_table_config_field_new       (ETableSpecification *spec,
-						   ETableSortInfo      *sort_info,
-						   gboolean             grouping);
-ETableConfigField *e_table_config_field_construct (ETableConfigField   *field,
-						   ETableSpecification *spec,
-						   ETableSortInfo      *sort_info,
-						   gboolean             grouping);
-
-END_GNOME_DECLS
-
-#endif /* _E_TABLE_CONFIG_FIELD_H_ */
diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c
deleted file mode 100644
index c33290b227..0000000000
--- a/widgets/table/e-table-config.c
+++ /dev/null
@@ -1,814 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-config.c: The ETable config dialog.
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *   Miguel de Icaza (miguel@ximian.com)
- *
- * FIXME:
- *    Sort Dialog: when text is selected, the toggle button switches state.
- *    Make Clear all work.
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-
-#include <config.h>
-
-#include "e-table-config.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktogglebutton.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-propertybox.h>
-#include <glade/glade.h>
-#include "gal/util/e-util.h"
-#include "gal/util/e-i18n.h"
-
-
-#define PARENT_TYPE (gtk_object_get_type())
-
-static GtkObjectClass *config_parent_class;
-
-enum {
-	CHANGED,
-	LAST_SIGNAL
-};
-
-enum {
-	ARG_0,
-	ARG_STATE,
-};
-
-static guint e_table_config_signals [LAST_SIGNAL] = { 0, };
-
-static void
-config_destroy (GtkObject *object)
-{
-	ETableConfig *config = E_TABLE_CONFIG (object);
-
-	gtk_object_destroy (GTK_OBJECT (config->state));
-	gtk_object_unref (GTK_OBJECT (config->source_state));
-	gtk_object_unref (GTK_OBJECT (config->source_spec));
-
-	g_slist_free (config->column_names);
-	config->column_names = NULL;
-	
-	GTK_OBJECT_CLASS (config_parent_class)->destroy (object);
-}
-
-static void
-config_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ETableConfig *config = E_TABLE_CONFIG (o);
-
-	switch (arg_id){
-	case ARG_STATE:
-		GTK_VALUE_OBJECT (*arg) = (GtkObject *) config->state;
-		break;
-
-	default:
-		break;
-	}
-}
-
-static void
-e_table_config_changed (ETableConfig *config, ETableState *state)
-{
-	g_return_if_fail (config != NULL);
-	g_return_if_fail (E_IS_TABLE_CONFIG (config));
-
-	
-	gtk_signal_emit(GTK_OBJECT(config),
-			e_table_config_signals [CHANGED],
-			state);
-}
-
-static void
-config_class_init (GtkObjectClass *object_class)
-{
-	ETableConfigClass *klass = E_TABLE_CONFIG_CLASS(object_class);
-
-	config_parent_class   = gtk_type_class (PARENT_TYPE);
-	
-	klass->changed        = NULL;
-
-	object_class->get_arg = config_get_arg;
-	object_class->destroy = config_destroy;
-
-	e_table_config_signals [CHANGED] =
-		gtk_signal_new ("changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableConfigClass, changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, e_table_config_signals, LAST_SIGNAL);
-
-	gtk_object_add_arg_type ("ETableConfig::state", E_TABLE_STATE_TYPE,
-				 GTK_ARG_READABLE, ARG_STATE);
-}
-
-static ETableColumnSpecification *
-find_column_in_spec (ETableSpecification *spec, int model_col)
-{
-	ETableColumnSpecification **column;
-
-	for (column = spec->columns; *column; column++){
-		if ((*column)->model_col != model_col)
-			continue;
-
-		return *column;
-	}
-
-	return NULL;
-}
-
-static int
-find_model_column_by_name (ETableSpecification *spec, const char *s)
-{
-	ETableColumnSpecification **column;
-
-	for (column = spec->columns; *column; column++){
-
-		if (g_strcasecmp ((*column)->title, s) == 0)
-			return (*column)->model_col;
-	}
-	return -1;
-}
-
-static void
-update_sort_and_group_config_dialog (ETableConfig *config, gboolean is_sort)
-{
-	ETableConfigSortWidgets *widgets;
-	int count, i;
-
-	if (is_sort){
-		count = e_table_sort_info_sorting_get_count (
-			config->temp_state->sort_info);
-		widgets = &config->sort [0];
-	} else {
-		count = e_table_sort_info_grouping_get_count (
-			config->temp_state->sort_info);
-		widgets = &config->group [0];
-	}
-	
-	for (i = 0; i < 4; i++){
-		gboolean sensitive = (i <= count);
-		char *text = "";
-		
-		gtk_widget_set_sensitive (widgets [i].frames, sensitive);
-
-		/*
-		 * Sorting is set, auto select the text
-		 */
-		gtk_signal_handler_block (
-			GTK_OBJECT (widgets [i].radio_ascending),
-			widgets [i].toggled_id);
-		gtk_signal_handler_block (
-			GTK_OBJECT (widgets [i].combo->entry),
-			widgets [i].changed_id);
-		
-		if (i < count){
-			GtkToggleButton *a, *d;
-			ETableSortColumn col =
-				is_sort
-				? e_table_sort_info_sorting_get_nth (
-					config->temp_state->sort_info,
-					i)
-				:  e_table_sort_info_grouping_get_nth (
-					config->temp_state->sort_info,
-					i);
-			
-			ETableColumnSpecification *column =
-				find_column_in_spec (config->source_spec, col.column);
-
-			if (!column){
-				/*
-				 * This is a bug in the programmer
-				 * stuff, but by the time we arrive
-				 * here, the user has been given a
-				 * warning
-				 */
-				continue;
-			}
-
-			text = gettext (column->title);
-
-			/*
-			 * Update radio buttons
-			 */
-			a = GTK_TOGGLE_BUTTON (
-				widgets [i].radio_ascending);
-			d = GTK_TOGGLE_BUTTON (
-				widgets [i].radio_descending);
-			
-			gtk_toggle_button_set_active (col.ascending ? a:d, 1);
-		} else {
-			GtkToggleButton *t;
-			
-			t = GTK_TOGGLE_BUTTON (
-				widgets [i].radio_ascending);
-
-			if (is_sort)
-				g_assert (widgets [i].radio_ascending != config->group [i].radio_ascending);
-			else
-				g_assert (widgets [i].radio_ascending != config->sort [i].radio_ascending);
-			gtk_toggle_button_set_active (t, 1);
-		}
-
-		/* Set the text */
-		gtk_combo_text_set_text (widgets [i].combo, text);
-
-		gtk_signal_handler_unblock (
-			GTK_OBJECT (widgets [i].radio_ascending),
-			widgets [i].toggled_id);
-		gtk_signal_handler_unblock (
-			GTK_OBJECT (widgets [i].combo->entry),
-			widgets [i].changed_id);
-	}
-}
-
-static void
-config_sort_info_update (ETableConfig *config)
-{
-	ETableSortInfo *info = config->state->sort_info;
-	GString *res;
-	int count, i;
-
-	count = e_table_sort_info_sorting_get_count (info);
-	res = g_string_new ("");
-
-	for (i = 0; i < count; i++) {
-		ETableSortColumn col = e_table_sort_info_sorting_get_nth (info, i);
-		ETableColumnSpecification *column;
-		
-		column = find_column_in_spec (config->source_spec, col.column);
-		if (!column){
-			g_warning ("Could not find column model in specification");
-			continue;
-		}
-		
-		g_string_append (res, gettext ((column)->title));
-		g_string_append_c (res, ' ');
-		g_string_append (
-			res,
-			col.ascending ?
-			_("(Ascending)") : _("(Descending)"));
-
-		if ((i + 1) != count)
-			g_string_append (res, ", ");
-	}
-	
-	if (res->str [0] == 0)
-		g_string_append (res, _("Not sorted"));
-	
-	gtk_label_set_text (GTK_LABEL(config->sort_label), res->str);
-
-	g_string_free (res, TRUE);
-}
-
-static void
-config_group_info_update (ETableConfig *config)
-{
-	ETableSortInfo *info = config->state->sort_info;
-	GString *res;
-	int count, i;
-
-	count = e_table_sort_info_grouping_get_count (info);
-	res = g_string_new ("");
-
-	for (i = 0; i < count; i++) {
-		ETableSortColumn col = e_table_sort_info_grouping_get_nth (info, i);
-		ETableColumnSpecification *column;
-
-		column = find_column_in_spec (config->source_spec, col.column);
-		if (!column){
-			g_warning ("Could not find model column in specification");
-			continue;
-		}
-		
-		g_string_append (res, gettext ((column)->title));
-		g_string_append_c (res, ' ');
-		g_string_append (
-			res,
-			col.ascending ?
-			_("(Ascending)") : _("(Descending)"));
-
-		if ((i+1) != count)
-			g_string_append (res, ", ");
-	}
-	if (res->str [0] == 0)
-		g_string_append (res, _("No grouping"));
-	
-	gtk_label_set_text (GTK_LABEL (config->group_label), res->str);
-	g_string_free (res, TRUE);
-}
-
-static void
-config_fields_info_update (ETableConfig *config)
-{
-	ETableColumnSpecification **column;
-	GString *res = g_string_new ("");
-	int i;
-
-	for (i = 0; i < config->state->col_count; i++){
-		for (column = config->source_spec->columns; *column; column++){
-
-			if (config->state->columns [i] != (*column)->model_col)
-				continue;
-			
-			g_string_append (res, gettext ((*column)->title));
-			if (column [1])
-				g_string_append (res, ", ");
-		}
-	}
-	
-	gtk_label_set_text (GTK_LABEL (config->fields_label), res->str);
-	g_string_free (res, TRUE);
-}
-
-static void
-do_sort_and_group_config_dialog (ETableConfig *config, gboolean is_sort)
-{
-	GnomeDialog *dialog;
-	int button, running = 1;
-
-	config->temp_state = e_table_state_duplicate (config->state);
-
-	update_sort_and_group_config_dialog (config, is_sort);
-
-	gtk_widget_grab_focus (GTK_WIDGET (
-		is_sort
-		? config->sort [0].combo
-		: config->group [0].combo));
-		
-
-	if (is_sort)
-		dialog = GNOME_DIALOG (config->dialog_sort);
-	else
-		dialog = GNOME_DIALOG (config->dialog_group_by);
-	
-	do {
-		button = gnome_dialog_run (dialog);
-		switch (button){
-		case 0:
-			if (is_sort){
-				e_table_sort_info_sorting_truncate (
-					config->state->sort_info, 0);
-			} else {
-				e_table_sort_info_grouping_truncate (
-					config->state->sort_info, 0);
-			}
-			update_sort_and_group_config_dialog (config, is_sort);
-			continue;
-
-			/* OK */
-		case 1:
-			gtk_object_unref (GTK_OBJECT (config->state));
-			config->state = config->temp_state;
-			config->temp_state = 0;
-			running = 0;
-			gnome_property_box_changed (
-				GNOME_PROPERTY_BOX (config->dialog_toplevel));
-			break;
-
-			/* CANCEL */
-		case 2:
-			gtk_object_unref (GTK_OBJECT (config->temp_state));
-			config->temp_state = 0;
-			running = 0;
-			break;
-		}
-		
-	} while (running);
-	gnome_dialog_close (GNOME_DIALOG (dialog));
-
-	if (is_sort)
-		config_sort_info_update (config);
-	else
-		config_group_info_update (config);
-}
-
-#if 0
-static GtkWidget *
-e_table_proxy_etable_new (void)
-{
-	return gtk_label_new ("Waiting for the ETable/ETree\nmerger to be commited");
-}
-#endif
-
-static void
-config_button_fields (GtkWidget *widget, ETableConfig *config)
-{
-	gnome_dialog_run (GNOME_DIALOG(config->dialog_show_fields));
-	gnome_dialog_close (GNOME_DIALOG (config->dialog_show_fields));
-}
-		
-static void
-config_button_sort (GtkWidget *widget, ETableConfig *config)
-{
-	do_sort_and_group_config_dialog (config, TRUE);
-}
-
-static void
-config_button_group (GtkWidget *widget, ETableConfig *config)
-{
-	do_sort_and_group_config_dialog (config, FALSE);
-}
-
-static void
-dialog_destroyed (GtkObject *dialog, ETableConfig *config)
-{
-	gtk_object_destroy (GTK_OBJECT (config));
-}
-
-static void
-dialog_apply (GnomePropertyBox *pbox, gint page_num, ETableConfig *config)
-{
-	if (page_num != -1)
-		return;
-
-	e_table_config_changed (config, config->state);
-}
-
-/*
- * Invoked by the Glade auto-connect code
- */
-GtkWidget *e_table_proxy_gtk_combo_text_new (void);
-GtkWidget *
-e_table_proxy_gtk_combo_text_new (void)
-{
-	return gtk_combo_text_new (TRUE);
-}
-
-#if 0
-static GtkWidget *
-configure_dialog (GladeXML *gui, const char *widget_name, ETableConfig *config)
-{
-	GtkWidget *w;
-	
-	w = glade_xml_get_widget (gui, widget_name);
-
-	return w;
-}
-#endif
-
-static void
-connect_button (ETableConfig *config, GladeXML *gui, const char *widget_name, void *cback)
-{
-	GtkWidget *button = glade_xml_get_widget (gui, widget_name);
-
-	gtk_signal_connect(
-		GTK_OBJECT (button), "clicked",
-		GTK_SIGNAL_FUNC (cback), config);
-}
-
-static void
-sort_entry_changed (GtkEntry *entry, ETableConfigSortWidgets *sort)
-{
-	ETableConfig *config = sort->e_table_config;
-	ETableSortInfo *sort_info = config->temp_state->sort_info;
-	ETableConfigSortWidgets *base = &config->sort[0];
-	int idx = sort - base;
-	
-	char *s = gtk_entry_get_text (entry);
-
-	if (s && s [0] && g_hash_table_lookup (sort->combo->elements, s)){
-		ETableSortColumn c;
-		int col;
-		
-		col = find_model_column_by_name (config->source_spec, s);
-		if (col == -1){
-			g_warning ("sort: This should not happen (%s)", s);
-			return;
-		}
-
-		c.ascending = GTK_TOGGLE_BUTTON (
-			config->sort [idx].radio_ascending)->active;
-		c.column = col;
-		e_table_sort_info_sorting_set_nth (sort_info, idx, c);
-		  
-		update_sort_and_group_config_dialog (config, TRUE);
-	}  else {
-		e_table_sort_info_sorting_truncate (sort_info, idx);
-		update_sort_and_group_config_dialog (config, TRUE);
-	}
-}
-
-static void
-sort_ascending_toggled (GtkToggleButton *t, ETableConfigSortWidgets *sort)
-{
-	ETableConfig *config = sort->e_table_config;
-	ETableSortInfo *si = config->temp_state->sort_info;
-	ETableConfigSortWidgets *base = &config->sort[0];
-	int idx = sort - base;
-	ETableSortColumn c;
-	
-	c = e_table_sort_info_sorting_get_nth (si, idx);
-	c.ascending = t->active;
-	e_table_sort_info_sorting_set_nth (si, idx, c);
-}
-
-static void
-configure_sort_dialog (ETableConfig *config, GladeXML *gui)
-{
-	GSList *l;
-	int i;
-	
-	for (i = 0; i < 4; i++){
-		char buffer [80];
-
-		snprintf (buffer, sizeof (buffer), "sort-combo-%d", i + 1);
-		config->sort [i].combo = GTK_COMBO_TEXT (
-			glade_xml_get_widget (gui, buffer));
-
-		gtk_combo_text_add_item (config->sort [i].combo, "", "");
-
-		snprintf (buffer, sizeof (buffer), "frame-sort-%d", i + 1);
-		config->sort [i].frames = 
-			glade_xml_get_widget (gui, buffer);
-
-		snprintf (
-			buffer, sizeof (buffer),
-			"radiobutton-ascending-sort-%d", i+1);
-		config->sort [i].radio_ascending = glade_xml_get_widget (
-			gui, buffer);
-
-		snprintf (
-			buffer, sizeof (buffer),
-			"radiobutton-descending-sort-%d", i+1);
-		config->sort [i].radio_descending = glade_xml_get_widget (
-			gui, buffer);
-
-		config->sort [i].e_table_config = config;
-	}
-
-	for (l = config->column_names; l; l = l->next){
-		char *label = l->data;
-
-		for (i = 0; i < 4; i++){
-			gtk_combo_text_add_item (
-				config->sort [i].combo,
-				gettext (label), label);
-		}
-	}
-
-	/*
-	 * After we have runtime modified things, signal connect
-	 */
-	for (i = 0; i < 4; i++){
-		config->sort [i].changed_id = gtk_signal_connect (
-			GTK_OBJECT (config->sort [i].combo->entry),
-			"changed", sort_entry_changed, &config->sort [i]);
-
-		config->sort [i].toggled_id = gtk_signal_connect (
-			GTK_OBJECT (config->sort [i].radio_ascending),
-			"toggled", sort_ascending_toggled, &config->sort [i]);
-	}
-}
-
-static void
-group_entry_changed (GtkEntry *entry, ETableConfigSortWidgets *group)
-{
-	ETableConfig *config = group->e_table_config;
-	ETableSortInfo *sort_info = config->temp_state->sort_info;
-	ETableConfigSortWidgets *base = &config->group[0];
-	int idx = group - base;
-	char *s = gtk_entry_get_text (entry);
-
-	if (s && s [0] && g_hash_table_lookup (group->combo->elements, s)){
-		ETableSortColumn c;
-		int col;
-		
-		col = find_model_column_by_name (config->source_spec, s);
-		if (col == -1){
-			g_warning ("grouping: this should not happen, %s", s);
-			return;
-		}
-
-		c.ascending = GTK_TOGGLE_BUTTON (
-			config->group [idx].radio_ascending)->active;
-		c.column = col;
-		e_table_sort_info_grouping_set_nth (sort_info, idx, c);
-		  
-		update_sort_and_group_config_dialog (config, FALSE);
-	}  else {
-		e_table_sort_info_grouping_truncate (sort_info, idx);
-		update_sort_and_group_config_dialog (config, FALSE);
-	}
-}
-
-static void
-group_ascending_toggled (GtkToggleButton *t, ETableConfigSortWidgets *group)
-{
-	ETableConfig *config = group->e_table_config;
-	ETableSortInfo *si = config->temp_state->sort_info;
-	ETableConfigSortWidgets *base = &config->group[0];
-	int idx = group - base;
-	ETableSortColumn c;
-	
-	c = e_table_sort_info_grouping_get_nth (si, idx);
-	c.ascending = t->active;
-	e_table_sort_info_grouping_set_nth (si, idx, c);
-}
-
-static void
-configure_group_dialog (ETableConfig *config, GladeXML *gui)
-{
-	GSList *l;
-	int i;
-	
-	for (i = 0; i < 4; i++){
-		char buffer [80];
-
-		snprintf (buffer, sizeof (buffer), "group-combo-%d", i + 1);
-		config->group [i].combo = GTK_COMBO_TEXT (
-			glade_xml_get_widget (gui, buffer));
-
-		gtk_combo_text_add_item (config->group [i].combo, "", "");
-
-		snprintf (buffer, sizeof (buffer), "frame-group-%d", i + 1);
-		config->group [i].frames = 
-			glade_xml_get_widget (gui, buffer);
-
-		snprintf (
-			buffer, sizeof (buffer),
-			"radiobutton-ascending-group-%d", i+1);
-		config->group [i].radio_ascending = glade_xml_get_widget (
-			gui, buffer);
-
-		snprintf (
-			buffer, sizeof (buffer),
-			"radiobutton-descending-group-%d", i+1);
-		config->group [i].radio_descending = glade_xml_get_widget (
-			gui, buffer);
-
-		snprintf (
-			buffer, sizeof (buffer),
-			"checkbutton-group-%d", i+1);
-		config->group [i].view_check = glade_xml_get_widget (
-			gui, buffer);
-		
-		config->group [i].e_table_config = config;
-	}
-
-	
-	for (l = config->column_names; l; l = l->next){
-		char *label = l->data;
-
-		for (i = 0; i < 4; i++){
-			gtk_combo_text_add_item (
-				config->group [i].combo,
-				gettext (label), label);
-		}
-	}
-
-	/*
-	 * After we have runtime modified things, signal connect
-	 */
-	for (i = 0; i < 4; i++){
-		config->group [i].changed_id = gtk_signal_connect (
-			GTK_OBJECT (config->group [i].combo->entry),
-			"changed", group_entry_changed, &config->group [i]);
-
-		config->group [i].toggled_id = gtk_signal_connect (
-			GTK_OBJECT (config->group [i].radio_ascending),
-			"toggled", group_ascending_toggled, &config->group [i]);
-	}
-}
-
-static void
-setup_gui (ETableConfig *config)
-{
-	GladeXML *gui = glade_xml_new_with_domain (
-		ETABLE_GLADEDIR "/e-table-config.glade", NULL, PACKAGE);
-	
-	config->dialog_toplevel = glade_xml_get_widget (
-		gui, "e-table-config");
-
-	gtk_notebook_set_show_tabs (
-		GTK_NOTEBOOK (GNOME_PROPERTY_BOX (
-			config->dialog_toplevel)->notebook),
-		FALSE);
-	
-	config->dialog_show_fields = glade_xml_get_widget (
-		gui, "dialog-show-fields");
-	config->dialog_group_by =  glade_xml_get_widget (
-		gui, "dialog-group-by");
-	config->dialog_sort = glade_xml_get_widget (
-		gui, "dialog-sort");
-
-	config->sort_label = glade_xml_get_widget (
-		gui, "label-sort");
-	config->group_label = glade_xml_get_widget (
-		gui, "label-group");
-	config->fields_label = glade_xml_get_widget (
-		gui, "label-fields");
-
-	connect_button (config, gui, "button-sort", config_button_sort);
-	connect_button (config, gui, "button-group", config_button_group);
-	connect_button (config, gui, "button-fields", config_button_fields);
-	
-	configure_sort_dialog (config, gui);
-	configure_group_dialog (config, gui);
-	
-	gtk_signal_connect (
-		GTK_OBJECT (config->dialog_toplevel), "destroy",
-		GTK_SIGNAL_FUNC (dialog_destroyed), config);
-
-	gtk_signal_connect (
-		GTK_OBJECT (config->dialog_toplevel), "apply",
-		GTK_SIGNAL_FUNC (dialog_apply), config);
-	
-	gtk_object_unref (GTK_OBJECT (gui));
-}
-
-static void
-config_init (ETableConfig *config)
-{
-	glade_gnome_init ();
-}
-
-ETableConfig *
-e_table_config_construct (ETableConfig        *config,
-			  const char          *header,
-			  ETableSpecification *spec,
-			  ETableState         *state)
-{
-	ETableColumnSpecification **column;
-
-	g_return_val_if_fail (config != NULL, NULL);
-	g_return_val_if_fail (header != NULL, NULL);
-	g_return_val_if_fail (spec != NULL, NULL);
-	g_return_val_if_fail (state != NULL, NULL);
-	
-	config->source_spec = spec;
-	config->source_state = state;
-
-	gtk_object_ref (GTK_OBJECT (config->source_spec));
-	gtk_object_ref (GTK_OBJECT (config->source_state));
-
-	config->state = e_table_state_duplicate (state);
-
-	for (column = config->source_spec->columns; *column; column++){
-		char *label = (*column)->title;
-
-		config->column_names = g_slist_append (
-			config->column_names, label);
-	}
-
-	setup_gui (config);
-
-	config_sort_info_update   (config);
-	config_group_info_update  (config);
-	config_fields_info_update (config);
-	
-	return E_TABLE_CONFIG (config);
-}
-
-/**
- * e_table_config_new:
- * @header: The title of the dialog for the ETableConfig.
- * @spec: The specification for the columns to allow.
- * @state: The current state of the configuration.
- *
- * Creates a new ETable config object.
- *
- * Returns: The config object.
- */
-ETableConfig *
-e_table_config_new (const char          *header,
-		    ETableSpecification *spec,
-		    ETableState         *state)
-{
-	ETableConfig *config = gtk_type_new (E_TABLE_CONFIG_TYPE);
-
-	if (e_table_config_construct (config, header, spec, state) == NULL){
-		gtk_object_destroy (GTK_OBJECT (config));
-		return NULL;
-	}
-
-	gtk_widget_show (config->dialog_toplevel);
-	return E_TABLE_CONFIG (config);
-}
-
-/**
- * e_table_config_raise:
- * @config: The ETableConfig object.
- *
- * Raises the dialog associated with this ETableConfig object.
- */
-void
-e_table_config_raise (ETableConfig *config)
-{
-	gdk_window_raise (GTK_WIDGET (config->dialog_toplevel)->window);
-}
-
-E_MAKE_TYPE(e_table_config, "ETableConfig", ETableConfig, config_class_init, config_init, PARENT_TYPE);
diff --git a/widgets/table/e-table-config.glade b/widgets/table/e-table-config.glade
deleted file mode 100644
index 7ed753664e..0000000000
--- a/widgets/table/e-table-config.glade
+++ /dev/null
@@ -1,1870 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>E-table</name>
-  <program_name>e-table</program_name>
-  <directory></directory>
-  <source_directory></source_directory>
-  <pixmaps_directory></pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-show-fields</name>
-  <visible>False</visible>
-  <title>Show Fields</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>True</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox3</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area3</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button20</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button22</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkVBox</class>
-      <name>vbox2</name>
-      <homogeneous>False</homogeneous>
-      <spacing>6</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkTable</class>
-	<name>table2</name>
-	<rows>1</rows>
-	<columns>5</columns>
-	<homogeneous>True</homogeneous>
-	<row_spacing>6</row_spacing>
-	<column_spacing>6</column_spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label-available</name>
-	  <label>A_vailable Fields:</label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label-displayed</name>
-	  <label>Sh_ow these fields in order:</label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>5</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkTable</class>
-	<name>table3</name>
-	<rows>1</rows>
-	<columns>5</columns>
-	<homogeneous>True</homogeneous>
-	<row_spacing>6</row_spacing>
-	<column_spacing>6</column_spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox4</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>6</spacing>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>True</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkScrolledWindow</class>
-	    <name>scrolledwindow1</name>
-	    <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
-	    <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	    <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	    <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkViewport</class>
-	      <name>viewport1</name>
-	      <shadow_type>GTK_SHADOW_IN</shadow_type>
-
-	      <widget>
-		<class>Custom</class>
-		<name>available-field-list</name>
-		<creation_function>e_table_proxy_etable_new</creation_function>
-		<int1>0</int1>
-		<int2>0</int2>
-		<last_modification_time>Sun, 18 Mar 2001 23:59:35 GMT</last_modification_time>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox5</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>6</spacing>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>5</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>True</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkScrolledWindow</class>
-	    <name>scrolledwindow2</name>
-	    <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
-	    <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	    <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	    <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkViewport</class>
-	      <name>viewport2</name>
-	      <shadow_type>GTK_SHADOW_IN</shadow_type>
-
-	      <widget>
-		<class>Custom</class>
-		<name>fields-shown</name>
-		<creation_function>e_table_proxy_etable_new</creation_function>
-		<int1>0</int1>
-		<int2>0</int2>
-		<last_modification_time>Sun, 18 Mar 2001 23:59:49 GMT</last_modification_time>
-	      </widget>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox4</name>
-	    <homogeneous>True</homogeneous>
-	    <spacing>6</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>button-up</name>
-	      <can_focus>True</can_focus>
-	      <label>Move _Up</label>
-	      <relief>GTK_RELIEF_NORMAL</relief>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>button-down</name>
-	      <can_focus>True</can_focus>
-	      <label>Move _Down</label>
-	      <relief>GTK_RELIEF_NORMAL</relief>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox6</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>6</spacing>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>True</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-add</name>
-	    <can_focus>True</can_focus>
-	    <label>_Add -&gt;</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-remove</name>
-	    <can_focus>True</can_focus>
-	    <label>&lt;- _Remove</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>Placeholder</class>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-group-by</name>
-  <visible>False</visible>
-  <title>Group</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>True</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox4</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area4</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button39</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<label>Clear All</label>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button41</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button42</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkVBox</class>
-      <name>vbox24</name>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox13</name>
-	<homogeneous>False</homogeneous>
-	<spacing>6</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame-group-1</name>
-	  <label>Group Items By</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox5</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>6</spacing>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox7</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>Custom</class>
-		<name>group-combo-1</name>
-		<creation_function>e_table_proxy_gtk_combo_text_new</creation_function>
-		<int1>0</int1>
-		<int2>0</int2>
-		<last_modification_time>Fri, 19 Jan 2001 04:52:09 GMT</last_modification_time>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>checkbutton-group-1</name>
-		<can_focus>True</can_focus>
-		<label>Show field in View</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox8</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>radiobutton-ascending-group-1</name>
-		<can_focus>True</can_focus>
-		<label>Ascending</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>g-group-1</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>radiobutton-descending-group-1</name>
-		<can_focus>True</can_focus>
-		<label>Descending</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>g-group-1</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label8</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label9</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label10</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox14</name>
-	<homogeneous>False</homogeneous>
-	<spacing>6</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label11</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame-group-2</name>
-	  <label>Then By</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox6</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>6</spacing>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox9</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>Custom</class>
-		<name>group-combo-2</name>
-		<creation_function>e_table_proxy_gtk_combo_text_new</creation_function>
-		<int1>0</int1>
-		<int2>0</int2>
-		<last_modification_time>Fri, 19 Jan 2001 04:52:14 GMT</last_modification_time>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>checkbutton-group-2</name>
-		<can_focus>True</can_focus>
-		<label>Show field in View</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox10</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>radiobutton-ascending-group-2</name>
-		<can_focus>True</can_focus>
-		<label>Ascending</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>g-group-2</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>radiobutton-descending-group-2</name>
-		<can_focus>True</can_focus>
-		<label>Descending</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>g-group-2</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label19</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label18</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox15</name>
-	<homogeneous>False</homogeneous>
-	<spacing>6</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label13</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label12</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame-group-3</name>
-	  <label>Then By</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox7</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>6</spacing>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox11</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>Custom</class>
-		<name>group-combo-3</name>
-		<creation_function>e_table_proxy_gtk_combo_text_new</creation_function>
-		<int1>0</int1>
-		<int2>0</int2>
-		<last_modification_time>Fri, 19 Jan 2001 04:52:18 GMT</last_modification_time>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>checkbutton-group-3</name>
-		<can_focus>True</can_focus>
-		<label>Show field in View</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox12</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>radiobutton-ascending-group-3</name>
-		<can_focus>True</can_focus>
-		<label>Ascending</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>g-group-3</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>radiobutton-descending-group-3</name>
-		<can_focus>True</can_focus>
-		<label>Descending</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>g-group-3</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label17</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox16</name>
-	<homogeneous>False</homogeneous>
-	<spacing>6</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label14</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label16</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label15</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame-group-4</name>
-	  <label>Then By</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox8</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>6</spacing>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox13</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>Custom</class>
-		<name>group-combo-4</name>
-		<creation_function>e_table_proxy_gtk_combo_text_new</creation_function>
-		<int1>0</int1>
-		<int2>0</int2>
-		<last_modification_time>Fri, 19 Jan 2001 04:52:21 GMT</last_modification_time>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>checkbutton-group-4</name>
-		<can_focus>True</can_focus>
-		<label>Show field in View</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox14</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>radiobutton-ascending-group-4</name>
-		<can_focus>True</can_focus>
-		<label>Ascending</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>g-group-4</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>radiobutton-descending-group-4</name>
-		<can_focus>True</can_focus>
-		<label>Descending</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>g-group-4</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-sort</name>
-  <visible>False</visible>
-  <title>Sort</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>True</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>vbox15</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>hbuttonbox1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button43</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<label>Clear All</label>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button44</name>
-	<can_default>True</can_default>
-	<has_default>True</has_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button45</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table5</name>
-      <rows>4</rows>
-      <columns>1</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>6</row_spacing>
-      <column_spacing>6</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkFrame</class>
-	<name>frame-sort-4</name>
-	<label>Then By</label>
-	<label_xalign>0</label_xalign>
-	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox9</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>6</spacing>
-
-	  <widget>
-	    <class>GtkAlignment</class>
-	    <name>alignment1</name>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xscale>1</xscale>
-	    <yscale>0</yscale>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>Custom</class>
-	      <name>sort-combo-4</name>
-	      <creation_function>e_table_proxy_gtk_combo_text_new</creation_function>
-	      <int1>0</int1>
-	      <int2>0</int2>
-	      <last_modification_time>Tue, 16 Jan 2001 08:33:52 GMT</last_modification_time>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox17</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkRadioButton</class>
-	      <name>radiobutton-ascending-sort-4</name>
-	      <can_focus>True</can_focus>
-	      <label>Ascending</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <group>group-4</group>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkRadioButton</class>
-	      <name>radiobutton-descending-sort-4</name>
-	      <can_focus>True</can_focus>
-	      <label>Descending</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <group>group-4</group>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkFrame</class>
-	<name>frame-sort-3</name>
-	<label>Then By</label>
-	<label_xalign>0</label_xalign>
-	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox10</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>6</spacing>
-
-	  <widget>
-	    <class>GtkAlignment</class>
-	    <name>alignment2</name>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xscale>1</xscale>
-	    <yscale>0</yscale>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>Custom</class>
-	      <name>sort-combo-3</name>
-	      <creation_function>e_table_proxy_gtk_combo_text_new</creation_function>
-	      <int1>0</int1>
-	      <int2>0</int2>
-	      <last_modification_time>Tue, 16 Jan 2001 05:22:22 GMT</last_modification_time>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox19</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkRadioButton</class>
-	      <name>radiobutton-ascending-sort-3</name>
-	      <can_focus>True</can_focus>
-	      <label>Ascending</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <group>group-3</group>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkRadioButton</class>
-	      <name>radiobutton-descending-sort-3</name>
-	      <can_focus>True</can_focus>
-	      <label>Descending</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <group>group-3</group>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkFrame</class>
-	<name>frame-sort-2</name>
-	<label>Then By</label>
-	<label_xalign>0</label_xalign>
-	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox11</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>6</spacing>
-
-	  <widget>
-	    <class>GtkAlignment</class>
-	    <name>alignment3</name>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xscale>1</xscale>
-	    <yscale>0</yscale>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>Custom</class>
-	      <name>sort-combo-2</name>
-	      <creation_function>e_table_proxy_gtk_combo_text_new</creation_function>
-	      <int1>0</int1>
-	      <int2>0</int2>
-	      <last_modification_time>Tue, 16 Jan 2001 05:22:15 GMT</last_modification_time>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox21</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkRadioButton</class>
-	      <name>radiobutton-ascending-sort-2</name>
-	      <can_focus>True</can_focus>
-	      <label>Ascending</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <group>group-2</group>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkRadioButton</class>
-	      <name>radiobutton-descending-sort-2</name>
-	      <can_focus>True</can_focus>
-	      <label>Descending</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <group>group-2</group>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkFrame</class>
-	<name>frame-sort-1</name>
-	<label>Sort Items By</label>
-	<label_xalign>0</label_xalign>
-	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox12</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>6</spacing>
-
-	  <widget>
-	    <class>GtkAlignment</class>
-	    <name>alignment4</name>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xscale>1</xscale>
-	    <yscale>0</yscale>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>Custom</class>
-	      <name>sort-combo-1</name>
-	      <can_focus>True</can_focus>
-	      <has_focus>True</has_focus>
-	      <creation_function>e_table_proxy_gtk_combo_text_new</creation_function>
-	      <int1>0</int1>
-	      <int2>0</int2>
-	      <last_modification_time>Tue, 16 Jan 2001 05:22:00 GMT</last_modification_time>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox23</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkRadioButton</class>
-	      <name>radiobutton-ascending-sort-1</name>
-	      <can_focus>True</can_focus>
-	      <label>Ascending</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <group>group-1</group>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkRadioButton</class>
-	      <name>radiobutton-descending-sort-1</name>
-	      <can_focus>True</can_focus>
-	      <label>Descending</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <group>group-1</group>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomePropertyBox</class>
-  <name>e-table-config</name>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkNotebook</class>
-    <child_name>GnomePropertyBox:notebook</child_name>
-    <name>notebook1</name>
-    <show_tabs>False</show_tabs>
-    <show_border>True</show_border>
-    <tab_pos>GTK_POS_TOP</tab_pos>
-    <scrollable>False</scrollable>
-    <tab_hborder>2</tab_hborder>
-    <tab_vborder>2</tab_vborder>
-    <popup_enable>False</popup_enable>
-    <child>
-      <padding>0</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkFrame</class>
-      <name>top-frame</name>
-      <border_width>2</border_width>
-      <label>Description</label>
-      <label_xalign>0</label_xalign>
-      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-
-      <widget>
-	<class>GtkTable</class>
-	<name>table1</name>
-	<border_width>2</border_width>
-	<rows>3</rows>
-	<columns>3</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>2</row_spacing>
-	<column_spacing>4</column_spacing>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label2</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label3</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label4</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-fields</name>
-	  <can_default>True</can_default>
-	  <can_focus>True</can_focus>
-	  <signal>
-	    <name>clicked</name>
-	    <handler>on_fields_clicked</handler>
-	    <last_modification_time>Tue, 03 Oct 2000 22:11:12 GMT</last_modification_time>
-	  </signal>
-	  <label>_Fields...</label>
-	  <relief>GTK_RELIEF_NORMAL</relief>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-sort</name>
-	  <can_default>True</can_default>
-	  <can_focus>True</can_focus>
-	  <signal>
-	    <name>clicked</name>
-	    <handler>on_sort_clicked</handler>
-	    <last_modification_time>Tue, 03 Oct 2000 22:10:58 GMT</last_modification_time>
-	  </signal>
-	  <label>_Sort...</label>
-	  <relief>GTK_RELIEF_NORMAL</relief>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-group</name>
-	  <can_default>True</can_default>
-	  <can_focus>True</can_focus>
-	  <signal>
-	    <name>clicked</name>
-	    <handler>on_group_by_clicked</handler>
-	    <last_modification_time>Tue, 03 Oct 2000 22:10:50 GMT</last_modification_time>
-	  </signal>
-	  <label>_Group By...</label>
-	  <relief>GTK_RELIEF_NORMAL</relief>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label-group</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>True</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label-sort</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>True</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label-fields</name>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>True</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkLabel</class>
-      <child_name>Notebook:tab</child_name>
-      <name>label20</name>
-      <label>label20</label>
-      <justify>GTK_JUSTIFY_CENTER</justify>
-      <wrap>False</wrap>
-      <xalign>0.5</xalign>
-      <yalign>0.5</yalign>
-      <xpad>0</xpad>
-      <ypad>0</ypad>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/widgets/table/e-table-config.h b/widgets/table/e-table-config.h
deleted file mode 100644
index 13b1d69f38..0000000000
--- a/widgets/table/e-table-config.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_CONFIG_H_
-#define _E_TABLE_CONFIG_H_
-
-#include <libgnome/gnome-defs.h>
-#include <gal/e-table/e-table-sort-info.h>
-#include <gal/e-table/e-table-specification.h>
-#include <gal/widgets/gtk-combo-text.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TABLE_CONFIG_TYPE        (e_table_config_get_type ())
-#define E_TABLE_CONFIG(o)          (GTK_CHECK_CAST ((o), E_TABLE_CONFIG_TYPE, ETableConfig))
-#define E_TABLE_CONFIG_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_CONFIG_TYPE, ETableConfigClass))
-#define E_IS_TABLE_CONFIG(o)       (GTK_CHECK_TYPE ((o), E_TABLE_CONFIG_TYPE))
-#define E_IS_TABLE_CONFIG_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_CONFIG_TYPE))
-
-typedef struct {
-	GtkComboText *combo;
-	GtkWidget    *frames;
-	GtkWidget    *radio_ascending;
-	GtkWidget    *radio_descending;
-	GtkWidget    *view_check; /* Only for group dialog */
-	guint         changed_id, toggled_id;
-	void *e_table_config;
-} ETableConfigSortWidgets; 
-
-
-typedef struct {
-	GtkObject parent;
-
-	/*
-	 * Our various dialog boxes
-	 */
-	GtkWidget *dialog_toplevel;
-	GtkWidget *dialog_show_fields;
-	GtkWidget *dialog_group_by;
-	GtkWidget *dialog_sort;
-
-	/*
-	 * The state we manipulate
-	 */
-	ETableSpecification *source_spec;
-	ETableState         *source_state, *state, *temp_state;
-
-	GtkWidget *sort_label;
-	GtkWidget *group_label;
-	GtkWidget *fields_label;
-
-	ETableConfigSortWidgets sort [4];
-	ETableConfigSortWidgets group [4];
-
-	/*
-	 * List of valid column names
-	 */
-	GSList *column_names;
-} ETableConfig;
-
-typedef struct {
-	GtkObjectClass parent_class;
-
-	/* Signals */
-	void        (*changed)        (ETableConfig *config);
-} ETableConfigClass;
-
-GtkType       e_table_config_get_type  (void);
-ETableConfig *e_table_config_new       (const char          *header,
-					ETableSpecification *spec,
-					ETableState         *state);
-ETableConfig *e_table_config_construct (ETableConfig        *etco,
-					const char          *header,
-					ETableSpecification *spec,
-					ETableState         *state);
-void          e_table_config_raise     (ETableConfig        *config);
-
-END_GNOME_DECLS
-
-#endif /* _E_TABLE_CONFIG_H */
diff --git a/widgets/table/e-table-defines.h b/widgets/table/e-table-defines.h
deleted file mode 100644
index 23bca8bc64..0000000000
--- a/widgets/table/e-table-defines.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef __E_TABLE_DEFINES__
-#define __E_TABLE_DEFINES__ 1
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define BUTTON_HEIGHT        10
-#define BUTTON_PADDING       2
-#define GROUP_INDENT         (BUTTON_HEIGHT + (BUTTON_PADDING * 2))
-
-/* Padding around the contents of a header button */
-#define HEADER_PADDING 1
-
-#define MIN_ARROW_SIZE 10
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif
diff --git a/widgets/table/e-table-example-1.c b/widgets/table/e-table-example-1.c
deleted file mode 100644
index bac91c3060..0000000000
--- a/widgets/table/e-table-example-1.c
+++ /dev/null
@@ -1,286 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* This code is GPL. */
-#include <stdio.h>
-#include <string.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-#include "gal/e-util/e-cursors.h"
-#include "e-table-simple.h"
-#include "e-table-header.h"
-#include "e-table-header-item.h"
-#include "e-table-item.h"
-#include "e-cell-text.h"
-#include "e-cell-checkbox.h"
-#include "e-table.h"
-
-#include "table-test.h"
-
-/*
- * One way in which we make it simpler to build an ETableModel is through
- * the ETableSimple class.  Instead of creating your own ETableModel
- * class, you simply create a new object of the ETableSimple class.  You
- * give it a bunch of functions that act as callbacks.
- * 
- * You also get to pass a void * to ETableSimple and it gets passed to
- * your callbacks.  This would be for having multiple models of the same
- * type.  This is just an example though, so we statically define all the
- * data and ignore the void *data parameter.
- * 
- * In our example we will be creating a table model with 6 columns and 10
- * rows.  This corresponds to having 6 different types of information and
- * 10 different sets of data in our database.
- * 
- * The headers will be hard coded, as will be the example data.
- *
- */
-
-/*
- * There are two different meanings to the word "column".  The first is
- * the model column.  A model column corresponds to a specific type of
- * data.  This is very much like the usage in a database table where a
- * column is a field in the database.
- *
- * The second type of column is a view column.  A view column
- * corresponds to a visually displayed column.  Each view column
- * corresponds to a specific model column, though a model column may
- * have any number of view columns associated with it, from zero to
- * greater than one.
- *
- * Also, a view column doesn't necessarily depend on only one model
- * column.  In some cases, the view column renderer can be given a
- * reference to another column to get extra information about its
- * display.
-*/
-
-#define ROWS 10
-#define COLS 4
-
-#define IMPORTANCE_COLUMN 4
-#define COLOR_COLUMN 5
-
-/*
- * Here we define the initial layout of the table.  This is an xml
- * format that allows you to change the initial ordering of the
- * columns or to do sorting or grouping initially.  This specification
- * shows all 5 columns, but moves the importance column nearer to the
- * front.  It also sorts by the "Full Name" column (ascending.)
- * Sorting and grouping take the model column as their arguments
- * (sorting is specified by the "column" argument to the leaf elemnt.
- */
-
-#define INITIAL_SPEC "<ETableSpecification>                    	       \
-	<columns-shown>                  			       \
-		<column> 0 </column>     			       \
-		<column> 4 </column>     			       \
-		<column> 1 </column>     			       \
-		<column> 2 </column>     			       \
-		<column> 3 </column>     			       \
-	</columns-shown>                 			       \
-	<grouping> <leaf column=\"1\" ascending=\"true\"/> </grouping>    \
-</ETableSpecification>"
-
-char *headers [COLS] = {
-  "Email",
-  "Full Name",
-  "Address",
-  "Phone"
-};
-
-/*
- * Virtual Column list:
- * 0   Email
- * 1   Full Name
- * 2   Address
- * 3   Phone
- */
-
-char *table_data [ROWS] [COLS];
-
-/*
- * ETableSimple callbacks
- * These are the callbacks that define the behavior of our custom model.
- */
-
-/*
- * Since our model is a constant size, we can just return its size in
- * the column and row count fields.
- */
-
-/* This function returns the number of columns in our ETableModel. */
-static int
-my_col_count (ETableModel *etc, void *data)
-{
-	return COLS;
-}
-
-/* This function returns the number of rows in our ETableModel. */
-static int
-my_row_count (ETableModel *etc, void *data)
-{
-	return ROWS;
-}
-
-/* This function returns the value at a particular point in our ETableModel. */
-static void *
-my_value_at (ETableModel *etc, int col, int row, void *data)
-{
-	return (void *) table_data [row] [col];
-}
-
-/* This function sets the value at a particular point in our ETableModel. */
-static void
-my_set_value_at (ETableModel *etc, int col, int row, const void *val, void *data)
-{
-	g_free (table_data [row] [col]);
-	table_data [row] [col] = g_strdup (val);
-}
-
-/* This function returns whether a particular cell is editable. */
-static gboolean
-my_is_cell_editable (ETableModel *etc, int col, int row, void *data)
-{
-	return TRUE;
-}
-
-/* This function duplicates the value passed to it. */
-static void *
-my_duplicate_value (ETableModel *etc, int col, const void *value, void *data)
-{
-	return g_strdup (value);
-}
-
-/* This function frees the value passed to it. */
-static void
-my_free_value (ETableModel *etc, int col, void *value, void *data)
-{
-	g_free (value);
-}
-
-/* This function creates an empty value. */
-static void *
-my_initialize_value (ETableModel *etc, int col, void *data)
-{
-	return g_strdup ("");
-}
-
-/* This function reports if a value is empty. */
-static gboolean
-my_value_is_empty (ETableModel *etc, int col, const void *value, void *data)
-{
-	return !(value && *(char *)value);
-}
-
-/* This function reports if a value is empty. */
-static char *
-my_value_to_string (ETableModel *etc, int col, const void *value, void *data)
-{
-	return g_strdup(value);
-}
-
-/* We create a window containing our new table. */
-static void
-create_table (void)
-{
-	GtkWidget *e_table, *window, *frame;
-	ECell *cell_left_just;
-	ETableHeader *e_table_header;
-	int i, j;
-	ETableModel *e_table_model = NULL;
-
-	/* First we fill in the simple data. */
-	for (i = 0; i < ROWS; i++){
-		for (j = 0; j < COLS; j++)
-			table_data [i] [j] = g_strdup ("");
-	}
-	/* Next we create our model.  This uses the functions we defined
-	   earlier. */
-	e_table_model = e_table_simple_new (
-					    my_col_count, my_row_count, my_value_at,
-					    my_set_value_at, my_is_cell_editable,
-					    my_duplicate_value, my_free_value, 
-					    my_initialize_value, my_value_is_empty,
-					    my_value_to_string,
-					    NULL);
-	/*
-	 * Next we create a header.  The ETableHeader is used in two
-	 * different way.  The first is the full_header.  This is the
-	 * list of possible columns in the view.  The second use is
-	 * completely internal.  Many of the ETableHeader functions are
-	 * for that purpose.  The only functions we really need are
-	 * e_table_header_new and e_table_header_add_col.
-	 *
-	 * First we create the header.
-	 */
-	e_table_header = e_table_header_new ();
-	
-	/*
-	 * Next we have to build renderers for all of the columns.
-	 * Since all our columns are text columns, we can simply use
-	 * the same renderer over and over again.  If we had different
-	 * types of columns, we could use a different renderer for
-	 * each column.
-	 */
-	cell_left_just = e_cell_text_new (e_table_model, NULL, GTK_JUSTIFY_LEFT);
-		
-	/*
-	 * Next we create a column object for each view column and add
-	 * them to the header.  We don't create a column object for
-	 * the importance column since it will not be shown.
-	 */
-	for (i = 0; i < COLS; i++) {
-		/* Create the column. */
-		ETableCol *ecol = e_table_col_new (
-						   i, headers [i],
-						   1.0, 20, cell_left_just,
-						   g_str_compare, TRUE);
-		/* Add it to the header. */
-		e_table_header_add_column (e_table_header, ecol, i);
-	}
-
-	/*
-	 * Here we create a window for our new table.  This window
-	 * will get shown and the person will be able to test their
-	 * item.
-	 */
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-	/* This frame is simply to get a bevel around our table. */
-	frame = gtk_frame_new (NULL);
-
-	/*
-	 * Here we create the table.  We give it the three pieces of
-	 * the table we've created, the header, the model, and the
-	 * initial layout.  It does the rest.
-	 */
-	e_table = e_table_new (e_table_header, e_table_model, INITIAL_SPEC);
-
-	/* Build the gtk widget hierarchy. */
-	gtk_container_add (GTK_CONTAINER (frame), e_table);
-	gtk_container_add (GTK_CONTAINER (window), frame);
-
-	/* Size the initial window. */
-	gtk_widget_set_usize (window, 200, 200);
-
-	/* Show it all. */
-	gtk_widget_show_all (window);
-}
-
-/* This is the main function which just initializes gnome and call our create_table function */
-
-int
-main (int argc, char *argv [])
-{
-	gnome_init ("TableExample", "TableExample", argc, argv);
-	e_cursors_init ();
-
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-
-	create_table ();
-	
-	gtk_main ();
-
-	e_cursors_shutdown ();
-	return 0;
-}
-
diff --git a/widgets/table/e-table-example-2.c b/widgets/table/e-table-example-2.c
deleted file mode 100644
index 2d892f0589..0000000000
--- a/widgets/table/e-table-example-2.c
+++ /dev/null
@@ -1,329 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* This code is GPL. */
-#include <stdio.h>
-#include <string.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-#include "gal/e-util/e-cursors.h"
-#include "e-table-simple.h"
-#include "e-table-header.h"
-#include "e-table-header-item.h"
-#include "e-table-item.h"
-#include "e-cell-text.h"
-#include "e-cell-checkbox.h"
-#include "e-table.h"
-
-#include "table-test.h"
-
-/*
-One way in which we make it simpler to build an ETableModel is through
-the ETableSimple class.  Instead of creating your own ETableModel
-class, you simply create a new object of the ETableSimple class.  You
-give it a bunch of functions that act as callbacks.
-
-You also get to pass a void * to ETableSimple and it gets passed to
-your callbacks.  This would be for having multiple models of the same
-type.  This is just an example though, so we statically define all the
-data and ignore the void *data parameter.
-
-In our example we will be creating a table model with 6 columns and 10
-rows.  This corresponds to having 6 different types of information and
-10 different sets of data in our database.
-
-The headers will be hard coded, as will be the example data.
-
-*/
-
-/*
-  There are two different meanings to the word "column".  The first is
-  the model column.  A model column corresponds to a specific type of
-  data.  This is very much like the usage in a database table where a
-  column is a field in the database.
-
-  The second type of column is a view column.  A view column
-  corresponds to a visually displayed column.  Each view column
-  corresponds to a specific model column, though a model column may
-  have any number of view columns associated with it, from zero to
-  greater than one.
-
-  Also, a view column doesn't necessarily depend on only one model
-  column.  In some cases, the view column renderer can be given a
-  reference to another column to get extra information about its
-  display.
-*/
-
-#define ROWS 10
-#define VIEW_COLS 4
-#define PHYSICAL_COLS 5
-#define VIRTUAL_COLS 6
-
-#define IMPORTANCE_COLUMN 4
-#define COLOR_COLUMN 5
-
-/* Here we define the initial layout of the table.  This is an xml
-   format that allows you to change the initial ordering of the
-   columns or to do sorting or grouping initially.  This specification
-   shows all 5 columns, but moves the importance column nearer to the
-   front.  It also sorts by the "Full Name" column (ascending.)
-   Sorting and grouping take the model column as their arguments
-   (sorting is specified by the "column" argument to the leaf elemnt. */
-#define INITIAL_SPEC "<ETableSpecification>                    	       \
-	<columns-shown>                  			       \
-		<column> 0 </column>     			       \
-		<column> 4 </column>     			       \
-		<column> 1 </column>     			       \
-		<column> 2 </column>     			       \
-		<column> 3 </column>     			       \
-	</columns-shown>                 			       \
-	<grouping> <leaf column=\"1\" ascending=\"true\"/> </grouping> \
-</ETableSpecification>"
-
-char *headers[VIEW_COLS] = {
-  "Email",
-  "Full Name",
-  "Address",
-  "Phone"
-};
-
-/* Virtual Column list:
-   0   Full Name
-   1   Email
-   2   Address
-   3   Phone
-   4   Importance field.  This field will be a boolean.  It also has a
-       special header, so doesn't appear in the headers list.
-   5   Color field.  This column is also not displayed.  It is also
-       not stored in the database.  It's calculated based on the
-       Importance field.
-*/
-
-char *table_data[ROWS][VIEW_COLS];
-gboolean importance_data[ROWS];
-
-/*
- * ETableSimple callbacks
- * These are the callbacks that define the behavior of our custom model.
- */
-
-/* Since our model is a constant size, we can just return its size in
-   the column and row count fields. */
-
-static GdkColor *color1;
-static GdkColor *color2;
-
-static int
-my_col_count (ETableModel *etc, void *data)
-{
-	return VIRTUAL_COLS;
-}
-
-static int
-my_row_count (ETableModel *etc, void *data)
-{
-	return ROWS;
-}
-
-static void *
-my_value_at (ETableModel *etc, int col, int row, void *data)
-{
-	if (col == COLOR_COLUMN){
-		if (importance_data[row]){
-			return color1;
-		} else {
-			return color2;
-		}
-	} else if (col == IMPORTANCE_COLUMN){
-		return (gpointer) importance_data[row];
-	} else {
-		return (void *) table_data [row][col];
-	}
-}
-
-static void
-my_set_value_at (ETableModel *etc, int col, int row, const void *val, void *data)
-{
-	if (col == COLOR_COLUMN){ 
-	} else if (col == IMPORTANCE_COLUMN){
-		importance_data[row] = (gboolean) val;
-	} else {
-		g_free (table_data [row][col]);
-		table_data [row][col] = g_strdup (val);
-	}
-}
-
-static gboolean
-my_is_cell_editable (ETableModel *etc, int col, int row, void *data)
-{
-	if (col == IMPORTANCE_COLUMN)
-		return FALSE;
-	else
-		return TRUE;
-}
-
-static void *
-my_duplicate_value (ETableModel *etc, int col, const void *value, void *data)
-{
-	if (col == COLOR_COLUMN){
-		return (void *) value;
-	} else if (col == IMPORTANCE_COLUMN){
-		return (void *) value;
-	} else {
-		return g_strdup (value);
-	}
-}
-
-static void
-my_free_value (ETableModel *etc, int col, void *value, void *data)
-{
-	if (col == COLOR_COLUMN){
-	} else if (col == IMPORTANCE_COLUMN){
-	} else {
-		g_free (value);
-	}
-}
-
-static void *
-my_initialize_value (ETableModel *etc, int col, void *data)
-{
-	if (col == COLOR_COLUMN){
-		return NULL;
-	} else if (col == IMPORTANCE_COLUMN){
-		return NULL;
-	} else {
-		return g_strdup ("");
-	}
-}
-
-static gboolean
-my_value_is_empty (ETableModel *etc, int col, const void *value, void *data)
-{
-	if (col == COLOR_COLUMN){
-		return value == NULL;
-	} else if (col == IMPORTANCE_COLUMN){
-		return value == NULL;
-	} else {
-		return !(value && *(char *)value);
-	}
-}
-
-static char *
-my_value_to_string (ETableModel *etc, int col, const void *value, void *data)
-{
-	if (col == COLOR_COLUMN){
-		return g_strdup_printf("%d", (int) value);
-	} else if (col == IMPORTANCE_COLUMN){
-		return g_strdup_printf("%d", (int) value);
-	} else {
-		return g_strdup(value);
-	}
-}
-
-/* We create a window containing our new table. */
-static void
-create_table ()
-{
-	GtkWidget *e_table, *window, *frame;
-	ECell *cell_left_just;
-	ECell *cell_checkbox;
-	ETableHeader *e_table_header;
-	int i, j;
-	ETableModel *e_table_model = NULL;
-	ETableCol *ecol;
-	GdkPixbuf *pixbuf;
-
-	/* First we fill in the simple data. */
-	for (i = 0; i < ROWS; i++){
-		for (j = 0; j < VIEW_COLS; j++){
-			table_data[i][j] = g_strdup ("");
-		}
-		importance_data[i] = FALSE;
-	}
-	/* Next we create our model.  This uses the functions we defined
-	   earlier. */
-	e_table_model = e_table_simple_new (
-					    my_col_count, my_row_count, my_value_at,
-					    my_set_value_at, my_is_cell_editable,
-					    my_duplicate_value, my_free_value,
-					    my_initialize_value, my_value_is_empty,
-					    my_value_to_string,
-					    NULL);
-	/*
-	  Next we create a header.  The ETableHeader is used in two
-	  different way.  The first is the full_header.  This is the
-	  list of possible columns in the view.  The second use is
-	  completely internal.  Many of the ETableHeader functions are
-	  for that purpose.  The only functions we really need are
-	  e_table_header_new and e_table_header_add_col.
-
-	  First we create the header.  */
-	e_table_header = e_table_header_new ();
-	
-	/* Next we have to build renderers for all of the columns.
-	   Since all our columns are text columns, we can simply use
-	   the same renderer over and over again.  If we had different
-	   types of columns, we could use a different renderer for
-	   each column. */
-	cell_left_just = e_cell_text_new (e_table_model, NULL, GTK_JUSTIFY_LEFT);
-		
-	/* Next we create a column object for each view column and add
-	   them to the header.  We don't create a column object for
-	   the importance column since it will not be shown. */
-	for (i = 0; i < VIEW_COLS; i++){
-		/* Create the column. */
-		ETableCol *ecol = e_table_col_new (
-						   i, headers [i],
-						   1.0, 20, cell_left_just,
-						   g_str_compare, TRUE);
-		/* Add it to the header. */
-		e_table_header_add_column (e_table_header, ecol, i);
-	}
-       
-	/* Next we add a special column for the check box. */
-
-	cell_checkbox = e_cell_checkbox_new ();
-	pixbuf = gdk_pixbuf_new_from_file ("clip.png");
-	ecol = e_table_col_new_with_pixbuf (i, pixbuf, 0.0, 18, cell_checkbox, g_int_compare, TRUE);
-	e_table_header_add_column (e_table_header, ecol, i);
-
-	/*
-	 * Setup GUI
-	 */
-	/* Here we create a window for our new table.  This window
-	   will get shown and the person will be able to test their
-	   item. */
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	/* This frame is simply to get a bevel around our table. */
-	frame = gtk_frame_new (NULL);
-	/* Here we create the table.  We give it the three pieces of
-	   the table we've created, the header, the model, and the
-	   initial layout.  It does the rest.  */
-	e_table = e_table_new (e_table_header, e_table_model, INITIAL_SPEC);
-
-	/* Build the gtk widget hierarchy. */
-	gtk_container_add (GTK_CONTAINER (frame), e_table);
-	gtk_container_add (GTK_CONTAINER (window), frame);
-
-	/* Size the initial window. */
-	gtk_widget_set_usize (window, 200, 200);
-	/* Show it all. */
-	gtk_widget_show_all (window);
-}
-
-
-
-int
-main (int argc, char *argv [])
-{
-	gnome_init ("TableExample", "TableExample", argc, argv);
-	e_cursors_init ();
-
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-
-	create_table ();
-	
-	gtk_main ();
-
-	e_cursors_shutdown ();
-	return 0;
-}
diff --git a/widgets/table/e-table-extras.c b/widgets/table/e-table-extras.c
deleted file mode 100644
index 85945a8109..0000000000
--- a/widgets/table/e-table-extras.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-extras.c: Pair of hash table sort of thingies.
- *
- * Author:
- *   Chris Lahey <clahey@ximian.com>
- *
- * (C) 2000 Ximian, Inc.
- */
-#include <config.h>
-#include <stdlib.h>
-#include <gtk/gtksignal.h>
-#include "gal/util/e-util.h"
-#include "gal/e-table/e-cell-text.h"
-#include "gal/e-table/e-cell-checkbox.h"
-#include "gal/e-table/e-cell-date.h"
-#include "gal/e-table/e-cell-number.h"
-#include "gal/e-table/e-cell-pixbuf.h"
-#include "gal/e-table/e-cell-size.h"
-#include "gal/e-table/e-cell-tree.h"
-#include "e-table-extras.h"
-
-#define PARENT_TYPE (gtk_object_get_type())
-
-static GtkObjectClass *ete_parent_class;
-
-static void
-cell_hash_free(gchar	*key,
-	       ECell    *cell,
-	       gpointer	user_data)
-{
-	g_free(key);
-	if (cell)
-		gtk_object_unref( GTK_OBJECT (cell));
-}
-
-static void
-pixbuf_hash_free(gchar	*key,
-		 GdkPixbuf *pixbuf,
-		 gpointer	user_data)
-{
-	g_free(key);
-	if (pixbuf)
-		gdk_pixbuf_unref(pixbuf);
-}
-
-static void
-ete_destroy (GtkObject *object)
-{
-	ETableExtras *ete = E_TABLE_EXTRAS (object);
-
-	g_hash_table_foreach (ete->cells, (GHFunc) cell_hash_free, NULL);
-	g_hash_table_foreach (ete->compares, (GHFunc) g_free, NULL);
-	g_hash_table_foreach (ete->pixbufs, (GHFunc) pixbuf_hash_free, NULL);
-
-	g_hash_table_destroy (ete->cells);
-	g_hash_table_destroy (ete->compares);
-	g_hash_table_destroy (ete->pixbufs);
-
-	ete->cells = NULL;
-	ete->compares = NULL;
-	ete->pixbufs = NULL;
-
-	GTK_OBJECT_CLASS (ete_parent_class)->destroy (object);
-}
-
-static void
-ete_class_init (GtkObjectClass *klass)
-{
-	ete_parent_class = gtk_type_class (PARENT_TYPE);
-	
-	klass->destroy = ete_destroy;
-}
-
-static gint
-e_strint_compare(gconstpointer data1, gconstpointer data2)
-{
-	int int1 = atoi(data1);
-	int int2 = atoi(data2);
-
-	return g_int_compare(GINT_TO_POINTER(int1), GINT_TO_POINTER(int2));
-}
-
-static void
-ete_init (ETableExtras *extras)
-{
-	extras->cells = g_hash_table_new(g_str_hash, g_str_equal);
-	extras->compares = g_hash_table_new(g_str_hash, g_str_equal);
-	extras->pixbufs = g_hash_table_new(g_str_hash, g_str_equal);
-
-	e_table_extras_add_compare(extras, "string", g_str_compare);
-	e_table_extras_add_compare(extras, "integer", g_int_compare);
-	e_table_extras_add_compare(extras, "string-integer", e_strint_compare);
-
-	e_table_extras_add_cell(extras, "checkbox", e_cell_checkbox_new());
-	e_table_extras_add_cell(extras, "date", e_cell_date_new (NULL, GTK_JUSTIFY_LEFT));
-	e_table_extras_add_cell(extras, "number", e_cell_number_new (NULL, GTK_JUSTIFY_RIGHT));
-	e_table_extras_add_cell(extras, "pixbuf", e_cell_pixbuf_new ());
-	e_table_extras_add_cell(extras, "size", e_cell_size_new (NULL, GTK_JUSTIFY_RIGHT));
-	e_table_extras_add_cell(extras, "string", e_cell_text_new (NULL, GTK_JUSTIFY_LEFT));
-	e_table_extras_add_cell(extras, "tree-string", e_cell_tree_new (NULL, NULL, TRUE, e_cell_text_new (NULL, GTK_JUSTIFY_LEFT)));
-}
-
-E_MAKE_TYPE(e_table_extras, "ETableExtras", ETableExtras, ete_class_init, ete_init, PARENT_TYPE);
-
-ETableExtras *
-e_table_extras_new (void)
-{
-	ETableExtras *ete = gtk_type_new (E_TABLE_EXTRAS_TYPE);
-
-	return (ETableExtras *) ete;
-}
-
-void
-e_table_extras_add_cell     (ETableExtras *extras,
-			     char         *id,
-			     ECell        *cell)
-{
-	gchar *old_key;
-	ECell *old_cell;
-
-	if (g_hash_table_lookup_extended (extras->cells, id, (gpointer *)&old_key, (gpointer *)&old_cell)) {
-		g_hash_table_remove (extras->cells, old_key);
-		g_free (old_key);
-		if (old_cell)
-			gtk_object_unref (GTK_OBJECT(old_cell));
-	}
-
-	if (cell) {
-		gtk_object_ref (GTK_OBJECT (cell));
-		gtk_object_sink (GTK_OBJECT (cell));
-	}
-	g_hash_table_insert (extras->cells, g_strdup(id), cell);
-}
-
-ECell *
-e_table_extras_get_cell     (ETableExtras *extras,
-			     char         *id)
-{
-	return g_hash_table_lookup(extras->cells, id);
-}
-
-void
-e_table_extras_add_compare  (ETableExtras *extras,
-			     char         *id,
-			     GCompareFunc  compare)
-{
-	gchar *old_key;
-	GCompareFunc old_compare;
-
-	if (g_hash_table_lookup_extended (extras->cells, id, (gpointer *)&old_key, (gpointer *)&old_compare)) {
-		g_hash_table_remove (extras->cells, old_key);
-		g_free (old_key);
-	}
-
-	g_hash_table_insert(extras->compares, g_strdup(id), compare);
-}
-
-GCompareFunc
-e_table_extras_get_compare  (ETableExtras *extras,
-			     char         *id)
-{
-	return g_hash_table_lookup(extras->compares, id);
-}
-
-void
-e_table_extras_add_pixbuf     (ETableExtras *extras,
-			       char         *id,
-			       GdkPixbuf    *pixbuf)
-{
-	gchar *old_key;
-	GdkPixbuf *old_pixbuf;
-
-	if (g_hash_table_lookup_extended (extras->pixbufs, id, (gpointer *)&old_key, (gpointer *)&old_pixbuf)) {
-		g_hash_table_remove (extras->cells, old_key);
-		g_free (old_key);
-		if (old_pixbuf)
-			gdk_pixbuf_unref (old_pixbuf);
-	}
-
-	if (pixbuf)
-		gdk_pixbuf_ref(pixbuf);
-	g_hash_table_insert (extras->pixbufs, g_strdup(id), pixbuf);
-}
-
-GdkPixbuf *
-e_table_extras_get_pixbuf     (ETableExtras *extras,
-			       char         *id)
-{
-	return g_hash_table_lookup(extras->pixbufs, id);
-}
diff --git a/widgets/table/e-table-extras.h b/widgets/table/e-table-extras.h
deleted file mode 100644
index d39fe9066f..0000000000
--- a/widgets/table/e-table-extras.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_EXTRAS_H_
-#define _E_TABLE_EXTRAS_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/e-table/e-cell.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TABLE_EXTRAS_TYPE        (e_table_extras_get_type ())
-#define E_TABLE_EXTRAS(o)          (GTK_CHECK_CAST ((o), E_TABLE_EXTRAS_TYPE, ETableExtras))
-#define E_TABLE_EXTRAS_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_EXTRAS_TYPE, ETableExtrasClass))
-#define E_IS_TABLE_EXTRAS(o)       (GTK_CHECK_TYPE ((o), E_TABLE_EXTRAS_TYPE))
-#define E_IS_TABLE_EXTRAS_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_EXTRAS_TYPE))
-
-typedef struct {
-	GtkObject base;
-
-	GHashTable *cells;
-	GHashTable *compares;
-	GHashTable *pixbufs;
-} ETableExtras;
-
-typedef struct {
-	GtkObjectClass parent_class;
-} ETableExtrasClass;
-
-GtkType       e_table_extras_get_type     (void);
-ETableExtras *e_table_extras_new          (void);
-
-void          e_table_extras_add_cell     (ETableExtras *extras,
-					   char         *id,
-					   ECell        *cell);
-ECell        *e_table_extras_get_cell     (ETableExtras *extras,
-					   char         *id);
-
-void          e_table_extras_add_compare  (ETableExtras *extras,
-					   char         *id,
-					   GCompareFunc  compare);
-GCompareFunc  e_table_extras_get_compare  (ETableExtras *extras,
-					   char         *id);
-
-void          e_table_extras_add_pixbuf   (ETableExtras *extras,
-					   char         *id,
-					   GdkPixbuf    *pixbuf);
-GdkPixbuf    *e_table_extras_get_pixbuf   (ETableExtras *extras,
-					   char         *id);
-
-END_GNOME_DECLS
-
-#endif /* _E_TABLE_EXTRAS_H_ */
diff --git a/widgets/table/e-table-field-chooser-dialog.c b/widgets/table/e-table-field-chooser-dialog.c
deleted file mode 100644
index 2e1525b7c0..0000000000
--- a/widgets/table/e-table-field-chooser-dialog.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-table-field-chooser-dialog.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include "e-table-field-chooser-dialog.h"
-#include <libgnomeui/gnome-stock.h>
-#include "gal/util/e-i18n.h"
-
-static void e_table_field_chooser_dialog_init		(ETableFieldChooserDialog		 *card);
-static void e_table_field_chooser_dialog_class_init	(ETableFieldChooserDialogClass	 *klass);
-static void e_table_field_chooser_dialog_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_table_field_chooser_dialog_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_table_field_chooser_dialog_destroy (GtkObject *object);
-static void e_table_field_chooser_dialog_clicked (GnomeDialog *dialog, gint button);
-
-static GnomeDialogClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_DND_CODE,
-	ARG_FULL_HEADER,
-};
-
-GtkType
-e_table_field_chooser_dialog_get_type (void)
-{
-	static GtkType table_field_chooser_dialog_type = 0;
-
-	if (!table_field_chooser_dialog_type)
-		{
-			static const GtkTypeInfo table_field_chooser_dialog_info =
-			{
-
-				"ETableFieldChooserDialog",
-				sizeof (ETableFieldChooserDialog),
-				sizeof (ETableFieldChooserDialogClass),
-				(GtkClassInitFunc) e_table_field_chooser_dialog_class_init,
-				(GtkObjectInitFunc) e_table_field_chooser_dialog_init,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-				(GtkClassInitFunc) NULL,
-			};
-
-			table_field_chooser_dialog_type = gtk_type_unique (gnome_dialog_get_type (), &table_field_chooser_dialog_info);
-		}
-
-	return table_field_chooser_dialog_type;
-}
-
-static void
-e_table_field_chooser_dialog_class_init (ETableFieldChooserDialogClass *klass)
-{
-	GtkObjectClass *object_class;
-	GnomeDialogClass *dialog_class;
-
-	object_class = (GtkObjectClass*) klass;
-	dialog_class = GNOME_DIALOG_CLASS (klass);
-
-	parent_class = gtk_type_class (gnome_dialog_get_type ());
-
-	object_class->destroy = e_table_field_chooser_dialog_destroy;
-	object_class->set_arg = e_table_field_chooser_dialog_set_arg;
-	object_class->get_arg = e_table_field_chooser_dialog_get_arg;
-
-	dialog_class->clicked = e_table_field_chooser_dialog_clicked;
-
-	gtk_object_add_arg_type ("ETableFieldChooserDialog::dnd_code", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_DND_CODE);
-	gtk_object_add_arg_type ("ETableFieldChooserDialog::full_header", GTK_TYPE_OBJECT,
-				 GTK_ARG_READWRITE, ARG_FULL_HEADER);
-}
-
-static void
-e_table_field_chooser_dialog_init (ETableFieldChooserDialog *e_table_field_chooser_dialog)
-{
-	GtkWidget *widget;
-
-	e_table_field_chooser_dialog->etfc = NULL;
-	e_table_field_chooser_dialog->dnd_code = g_strdup("");
-	e_table_field_chooser_dialog->full_header = NULL;
-
-	gnome_dialog_append_buttons(GNOME_DIALOG(e_table_field_chooser_dialog),
-				    GNOME_STOCK_BUTTON_CLOSE,
-				    NULL);
-
-	gtk_window_set_policy(GTK_WINDOW(e_table_field_chooser_dialog), FALSE, TRUE, FALSE);
-
-	widget = e_table_field_chooser_new();
-	e_table_field_chooser_dialog->etfc = E_TABLE_FIELD_CHOOSER(widget);
-	
-	gtk_object_set(GTK_OBJECT(widget),
-		       "dnd_code", e_table_field_chooser_dialog->dnd_code,
-		       "full_header", e_table_field_chooser_dialog->full_header,
-		       NULL);
-	
-	gtk_box_pack_start(GTK_BOX(GNOME_DIALOG(e_table_field_chooser_dialog)->vbox),
-			   widget, TRUE, TRUE, 0);
-
-	gtk_widget_show(GTK_WIDGET(widget));
-
-	gtk_window_set_title (GTK_WINDOW (e_table_field_chooser_dialog), _("Add a column..."));
-}
-
-GtkWidget*
-e_table_field_chooser_dialog_new (void)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_table_field_chooser_dialog_get_type ()));
-	return widget;
-}
-
-static void
-e_table_field_chooser_dialog_destroy (GtkObject *object)
-{
-	ETableFieldChooserDialog *etfcd = E_TABLE_FIELD_CHOOSER_DIALOG (object);
-	g_free(etfcd->dnd_code);
-	if (etfcd->full_header)
-		gtk_object_unref(GTK_OBJECT(etfcd->full_header));
-}
-
-static void
-e_table_field_chooser_dialog_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ETableFieldChooserDialog *etfcd = E_TABLE_FIELD_CHOOSER_DIALOG(object);
-	switch (arg_id){
-	case ARG_DND_CODE:
-		g_free(etfcd->dnd_code);
-		etfcd->dnd_code = g_strdup(GTK_VALUE_STRING (*arg));
-		if (etfcd->etfc)
-			gtk_object_set(GTK_OBJECT(etfcd->etfc),
-				       "dnd_code", etfcd->dnd_code,
-				       NULL);
-		break;
-	case ARG_FULL_HEADER:
-		if (etfcd->full_header)
-			gtk_object_unref(GTK_OBJECT(etfcd->full_header));
-		if (GTK_VALUE_OBJECT(*arg))
-			etfcd->full_header = E_TABLE_HEADER(GTK_VALUE_OBJECT(*arg));
-		else
-			etfcd->full_header = NULL;
-		if (etfcd->full_header)
-			gtk_object_ref(GTK_OBJECT(etfcd->full_header));
-		if (etfcd->etfc)
-			gtk_object_set(GTK_OBJECT(etfcd->etfc),
-				       "full_header", etfcd->full_header,
-				       NULL);
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-e_table_field_chooser_dialog_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ETableFieldChooserDialog *etfcd = E_TABLE_FIELD_CHOOSER_DIALOG(object);
-	switch (arg_id) {
-	case ARG_DND_CODE:
-		GTK_VALUE_STRING (*arg) = g_strdup (etfcd->dnd_code);
-		break;
-	case ARG_FULL_HEADER:
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(etfcd->full_header);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-e_table_field_chooser_dialog_clicked (GnomeDialog *dialog, int button)
-{
-	if (button == 0)
-		gnome_dialog_close(dialog);
-}
diff --git a/widgets/table/e-table-field-chooser-dialog.h b/widgets/table/e-table-field-chooser-dialog.h
deleted file mode 100644
index 4e8992f54a..0000000000
--- a/widgets/table/e-table-field-chooser-dialog.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-table-field-chooser-dialog.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_TABLE_FIELD_CHOOSER_DIALOG_H__
-#define __E_TABLE_FIELD_CHOOSER_DIALOG_H__
-
-#include <libgnomeui/gnome-dialog.h>
-#include <gal/e-table/e-table-field-chooser.h>
-#include <gal/e-table/e-table-header.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* ETableFieldChooserDialog - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- */
-
-#define E_TABLE_FIELD_CHOOSER_DIALOG_TYPE			(e_table_field_chooser_dialog_get_type ())
-#define E_TABLE_FIELD_CHOOSER_DIALOG(obj)			(GTK_CHECK_CAST ((obj), E_TABLE_FIELD_CHOOSER_DIALOG_TYPE, ETableFieldChooserDialog))
-#define E_TABLE_FIELD_CHOOSER_DIALOG_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TABLE_FIELD_CHOOSER_DIALOG_TYPE, ETableFieldChooserDialogClass))
-#define E_IS_TABLE_FIELD_CHOOSER_DIALOG(obj)		(GTK_CHECK_TYPE ((obj), E_TABLE_FIELD_CHOOSER_DIALOG_TYPE))
-#define E_IS_TABLE_FIELD_CHOOSER_DIALOG_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_TABLE_FIELD_CHOOSER_DIALOG_TYPE))
-
-
-typedef struct _ETableFieldChooserDialog       ETableFieldChooserDialog;
-typedef struct _ETableFieldChooserDialogClass  ETableFieldChooserDialogClass;
-
-struct _ETableFieldChooserDialog
-{
-	GnomeDialog parent;
-	
-	/* item specific fields */
-	ETableFieldChooser *etfc;
-	gchar              *dnd_code;
-	ETableHeader       *full_header;
-};
-
-struct _ETableFieldChooserDialogClass
-{
-	GnomeDialogClass parent_class;
-};
-
-
-GtkWidget *e_table_field_chooser_dialog_new(void);
-GtkType    e_table_field_chooser_dialog_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_TABLE_FIELD_CHOOSER_DIALOG_H__ */
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
deleted file mode 100644
index a551f75c6a..0000000000
--- a/widgets/table/e-table-field-chooser-item.c
+++ /dev/null
@@ -1,561 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-column-view.c: A canvas item based view of the ETableColumn.
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * Copyright 1999, 2000 Ximian, Inc.
- */
-#include <config.h>
-#include <string.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkdnd.h>
-#include <libgnomeui/gnome-canvas.h>
-#include <libgnomeui/gnome-canvas-util.h>
-#include <libgnomeui/gnome-canvas-polygon.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-#include "gal/util/e-xml-utils.h"
-#include "gal/widgets/e-canvas.h"
-
-#include "e-table-header.h"
-#include "e-table-col-dnd.h"
-#include "e-table-defines.h"
-#include "e-table-header-utils.h"
-
-#include "e-table-field-chooser-item.h"
-
-#if 0
-enum {
-	BUTTON_PRESSED,
-	LAST_SIGNAL
-};
-
-static guint etfci_signals [LAST_SIGNAL] = { 0, };
-#endif
-
-#define PARENT_OBJECT_TYPE gnome_canvas_item_get_type ()
-
-#define ELEMENTS(x) (sizeof (x) / sizeof (x[0]))
-
-static GnomeCanvasItemClass *etfci_parent_class;
-
-static void etfci_drop_table_header (ETableFieldChooserItem *etfci);
-
-enum {
-	ARG_0,
-	ARG_FULL_HEADER,
-	ARG_DND_CODE,
-	ARG_WIDTH,
-	ARG_HEIGHT,
-};
-
-static void
-etfci_destroy (GtkObject *object){
-	ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (object);
-
-	etfci_drop_table_header (etfci);
-	
-	gdk_font_unref(etfci->font);
-
-	if (GTK_OBJECT_CLASS (etfci_parent_class)->destroy)
-		(*GTK_OBJECT_CLASS (etfci_parent_class)->destroy) (object);
-}
-
-static gint
-etfci_find_button (ETableFieldChooserItem *etfci, double loc)
-{
-	int i;
-	int count;
-	double height = 0;
-	GtkStyle *style;
-
-	style = GTK_WIDGET (GNOME_CANVAS_ITEM (etfci)->canvas)->style;
-
-	count = e_table_header_count(etfci->full_header);
-	for (i = 0; i < count; i++) {
-		ETableCol *ecol;
-
-		ecol = e_table_header_get_column (etfci->full_header, i);
-		height += e_table_header_compute_height (ecol, style, etfci->font);
-		if (height > loc)
-			return i;
-	}
-	return MAX(0, count - 1);
-}
-
-static void
-etfci_reflow (GnomeCanvasItem *item, gint flags)
-{
-	ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (item);
-	double old_height;
-	int i;
-	int count;
-	double height = 0;
-	GtkStyle *style;
-
-	style = GTK_WIDGET (GNOME_CANVAS_ITEM (etfci)->canvas)->style;
-
-	old_height = etfci->height;
-
-	count = e_table_header_count(etfci->full_header);
-	for (i = 0; i < count; i++) {
-		ETableCol *ecol;
-
-		ecol = e_table_header_get_column (etfci->full_header, i);
-		height += e_table_header_compute_height (ecol, style, etfci->font);
-	}
-
-	etfci->height = height;
-	
-	if (old_height != etfci->height)
-		e_canvas_item_request_parent_reflow(item);
-	
-	gnome_canvas_item_request_update(item);
-}
-
-static void
-etfci_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags)
-{
-	ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (item);
-	double   i2c [6];
-	ArtPoint c1, c2, i1, i2;
-	
-	if (GNOME_CANVAS_ITEM_CLASS (etfci_parent_class)->update)
-		(*GNOME_CANVAS_ITEM_CLASS (etfci_parent_class)->update)(item, affine, clip_path, flags);
-
-	i1.x = i1.y = 0;
-	i2.x = etfci->width;
-	i2.y = etfci->height;
-
-	gnome_canvas_item_i2c_affine (item, i2c);
-	art_affine_point (&c1, &i1, i2c);
-	art_affine_point (&c2, &i2, i2c);
-
-	if (item->x1 != c1.x ||
-	     item->y1 != c1.y ||
-	     item->x2 != c2.x ||
-	     item->y2 != c2.y)
-		{
-			gnome_canvas_request_redraw (item->canvas, item->x1, item->y1, item->x2, item->y2);
-			item->x1 = c1.x;
-			item->y1 = c1.y;
-			item->x2 = c2.x;
-			item->y2 = c2.y;
-
-			gnome_canvas_group_child_bounds (GNOME_CANVAS_GROUP (item->parent), item);
-		}
-	gnome_canvas_request_redraw (item->canvas, item->x1, item->y1, item->x2, item->y2);
-}
-
-static void
-etfci_font_load (ETableFieldChooserItem *etfci, char *font)
-{
-	if (etfci->font)
-		gdk_font_unref (etfci->font);
-	etfci->font = NULL;
-	
-	if (font)
-		etfci->font = gdk_fontset_load (font);
-
-	if (etfci->font == NULL) {
-		etfci->font = GTK_WIDGET(GNOME_CANVAS_ITEM(etfci)->canvas)->style->font;
-		gdk_font_ref(etfci->font);
-	}
-}
-
-static void
-etfci_drop_table_header (ETableFieldChooserItem *etfci)
-{
-	GtkObject *header;
-	
-	if (!etfci->full_header)
-		return;
-
-	header = GTK_OBJECT (etfci->full_header);
-	if (etfci->structure_change_id)
-		gtk_signal_disconnect (header, etfci->structure_change_id);
-	if (etfci->dimension_change_id)
-		gtk_signal_disconnect (header, etfci->dimension_change_id);
-	etfci->structure_change_id = 0;
-	etfci->dimension_change_id = 0;
-
-	if (header)
-		gtk_object_unref (header);
-	etfci->full_header = NULL;
-	etfci->height = 0;
-	e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(etfci));
-}
-
-static void 
-structure_changed (ETableHeader *header, ETableFieldChooserItem *etfci)
-{
-	e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(etfci));
-}
-
-static void
-dimension_changed (ETableHeader *header, int col, ETableFieldChooserItem *etfci)
-{
-	e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(etfci));
-}
-
-static void
-etfci_add_table_header (ETableFieldChooserItem *etfci, ETableHeader *header)
-{
-	etfci->full_header = header;
-	gtk_object_ref (GTK_OBJECT (etfci->full_header));
-
-	etfci->structure_change_id = gtk_signal_connect (
-		GTK_OBJECT (header), "structure_change",
-		GTK_SIGNAL_FUNC(structure_changed), etfci);
-	etfci->dimension_change_id = gtk_signal_connect (
-		GTK_OBJECT (header), "dimension_change",
-		GTK_SIGNAL_FUNC(dimension_changed), etfci);
-	e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(etfci));
-}
-
-static void
-etfci_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	ETableFieldChooserItem *etfci;
-
-	item = GNOME_CANVAS_ITEM (o);
-	etfci = E_TABLE_FIELD_CHOOSER_ITEM (o);
-
-	switch (arg_id){
-	case ARG_FULL_HEADER:
-		etfci_drop_table_header (etfci);
-		if (GTK_VALUE_OBJECT (*arg))
-			etfci_add_table_header (etfci, E_TABLE_HEADER(GTK_VALUE_OBJECT (*arg)));
-		break;
-
-	case ARG_DND_CODE:
-		g_free(etfci->dnd_code);
-		etfci->dnd_code = g_strdup(GTK_VALUE_STRING (*arg));
-		break;
-
-	case ARG_WIDTH:
-		etfci->width = GTK_VALUE_DOUBLE (*arg);
-		gnome_canvas_item_request_update(item);
-		break;
-	}
-}
-
-static void
-etfci_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	ETableFieldChooserItem *etfci;
-
-	item = GNOME_CANVAS_ITEM (o);
-	etfci = E_TABLE_FIELD_CHOOSER_ITEM (o);
-
-	switch (arg_id){
-
-	case ARG_DND_CODE:
-		GTK_VALUE_STRING (*arg) = g_strdup (etfci->dnd_code);
-		break;
-	case ARG_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = etfci->width;
-		break;
-	case ARG_HEIGHT:
-		GTK_VALUE_DOUBLE (*arg) = etfci->height;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-etfci_drag_data_get (GtkWidget          *widget,
-		     GdkDragContext     *context,
-		     GtkSelectionData   *selection_data,
-		     guint               info,
-		     guint               time,
-		     ETableFieldChooserItem *etfci)
-{
-	if (etfci->drag_col != -1) {
-		gchar *string = g_strdup_printf("%d", etfci->drag_col);
-		gtk_selection_data_set(selection_data,
-				       GDK_SELECTION_TYPE_STRING,
-				       sizeof(string[0]),
-				       string,
-				       strlen(string));
-		g_free(string);
-	}
-}
-
-static void
-etfci_drag_end (GtkWidget      *canvas, 
-		GdkDragContext *context,
-		ETableFieldChooserItem *etfci)
-{
-	etfci->drag_col = -1;
-}
-
-static void
-etfci_realize (GnomeCanvasItem *item)
-{
-	ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (item);
-	GdkWindow *window;
-
-	if (GNOME_CANVAS_ITEM_CLASS (etfci_parent_class)-> realize)
-		(*GNOME_CANVAS_ITEM_CLASS (etfci_parent_class)->realize)(item);
-
-	window = GTK_WIDGET (item->canvas)->window;
-
-	if (!etfci->font)
-		etfci_font_load (etfci, NULL);
-
-	etfci->drag_end_id = gtk_signal_connect (
-		GTK_OBJECT (item->canvas), "drag_end",
-		GTK_SIGNAL_FUNC (etfci_drag_end), etfci);
-	etfci->drag_data_get_id = gtk_signal_connect (
-		GTK_OBJECT (item->canvas), "drag_data_get",
-		GTK_SIGNAL_FUNC (etfci_drag_data_get), etfci);
-	e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(etfci));
-}
-
-static void
-etfci_unrealize (GnomeCanvasItem *item)
-{
-	ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (item);
-
-	if (etfci->font)
-		gdk_font_unref (etfci->font);
-	etfci->font = NULL;
-
-	gtk_signal_disconnect (GTK_OBJECT (item->canvas), etfci->drag_end_id);
-	etfci->drag_end_id = 0;
-	gtk_signal_disconnect (GTK_OBJECT (item->canvas), etfci->drag_data_get_id);
-	etfci->drag_data_get_id = 0;
-	
-	if (GNOME_CANVAS_ITEM_CLASS (etfci_parent_class)->unrealize)
-		(*GNOME_CANVAS_ITEM_CLASS (etfci_parent_class)->unrealize)(item);
-}
-
-static void
-etfci_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, int height)
-{
-	ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (item);
-	GnomeCanvas *canvas = item->canvas;
-	const int rows = e_table_header_count (etfci->full_header);
-	int y1, y2;
-	int row;
-	GtkStyle *style;
-	GtkStateType state;
-
-	style = GTK_WIDGET (canvas)->style;
-	state = GTK_WIDGET_STATE (canvas);
-
-	y1 = y2 = 0;
-	for (row = 0; row < rows; row++, y1 = y2){
-		ETableCol *ecol;
-
-		ecol = e_table_header_get_column (etfci->full_header, row);
-
-		y2 += e_table_header_compute_height (ecol, style, etfci->font);
-		
-		if (y1 > (y + height))
-			break;
-
-		if (y2 < y)
-			continue;
-
-		e_table_header_draw_button (drawable, ecol,
-					    style, etfci->font, state,
-					    GTK_WIDGET (canvas), style->fg_gc[GTK_STATE_NORMAL],
-					    -x, y1 - y,
-					    width, height,
-					    etfci->width, y2 - y1,
-					    E_TABLE_COL_ARROW_NONE);
-	}
-}
-
-static double
-etfci_point (GnomeCanvasItem *item, double x, double y, int cx, int cy,
-	    GnomeCanvasItem **actual_item)
-{
-	*actual_item = item;
-	return 0.0;
-}
-
-static gboolean
-etfci_maybe_start_drag (ETableFieldChooserItem *etfci, double x, double y)
-{
-	if (!etfci->maybe_drag)
-		return FALSE;
-
-	if (MAX (abs (etfci->click_x - x),
-		 abs (etfci->click_y - y)) <= 3)
-		return FALSE;
-
-	return TRUE;
-}
-
-static void
-etfci_start_drag (ETableFieldChooserItem *etfci, GdkEvent *event, double x, double y)
-{
-	GtkWidget *widget = GTK_WIDGET (GNOME_CANVAS_ITEM (etfci)->canvas);
-	GtkTargetList *list;
-	GdkDragContext *context;
-	ETableCol *ecol;
-	GdkPixmap *pixmap;
-	int drag_col;
-	int button_height;
-
-	GtkTargetEntry  etfci_drag_types [] = {
-		{ TARGET_ETABLE_COL_TYPE, 0, TARGET_ETABLE_COL_HEADER },
-	};
-
-	drag_col = etfci_find_button(etfci, y);
-
-	if (drag_col < 0 || drag_col > e_table_header_count(etfci->full_header))
-		return;
-
-	ecol = e_table_header_get_column (etfci->full_header, drag_col);
-
-	etfci->drag_col = ecol->col_idx;
-
-	etfci_drag_types[0].target = g_strdup_printf("%s-%s", etfci_drag_types[0].target, etfci->dnd_code);
-	list = gtk_target_list_new (etfci_drag_types, ELEMENTS (etfci_drag_types));
-	context = gtk_drag_begin (widget, list, GDK_ACTION_MOVE, 1, event);
-	g_free(etfci_drag_types[0].target);
-
-	button_height = e_table_header_compute_height (ecol, widget->style, etfci->font);
-	pixmap = gdk_pixmap_new (widget->window, etfci->width, button_height, -1);
-
-	e_table_header_draw_button (pixmap, e_table_header_get_column (etfci->full_header, drag_col),
-				    widget->style, etfci->font, GTK_WIDGET_STATE (widget),
-				    widget, widget->style->fg_gc[GTK_STATE_NORMAL],
-				    0, 0,
-				    etfci->width, button_height,
-				    etfci->width, button_height,
-				    E_TABLE_COL_ARROW_NONE);
-
-	gtk_drag_set_icon_pixmap        (context,
-					 gdk_window_get_colormap (widget->window),
-					 pixmap,
-					 NULL,
-					 etfci->width / 2,
-					 button_height / 2);
-	gdk_pixmap_unref (pixmap);
-	etfci->maybe_drag = FALSE;
-}
-
-/*
- * Handles the events on the ETableFieldChooserItem
- */
-static int
-etfci_event (GnomeCanvasItem *item, GdkEvent *e)
-{
-	ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (item);
-	GnomeCanvas *canvas = item->canvas;
-	int x, y;
-	
-	switch (e->type){
-	case GDK_MOTION_NOTIFY:
-		gnome_canvas_w2c (canvas, e->motion.x, e->motion.y, &x, &y);
-
-		if (etfci_maybe_start_drag (etfci, x, y))
-			etfci_start_drag (etfci, e, x, y);
-		break;
-		
-	case GDK_BUTTON_PRESS:
-		gnome_canvas_w2c (canvas, e->button.x, e->button.y, &x, &y);
-		
-		if (e->button.button == 1){
-			etfci->click_x = x;
-			etfci->click_y = y;
-			etfci->maybe_drag = TRUE;
-		}
-		break;
-		
-	case GDK_BUTTON_RELEASE: {
-		etfci->maybe_drag = FALSE;
-		break;
-	}
-	
-	default:
-		return FALSE;
-	}
-	return TRUE;
-}
-
-static void
-etfci_class_init (GtkObjectClass *object_class)
-{
-	GnomeCanvasItemClass *item_class = (GnomeCanvasItemClass *) object_class;
-
-	etfci_parent_class = gtk_type_class (PARENT_OBJECT_TYPE);
-	
-	object_class->destroy = etfci_destroy;
-	object_class->set_arg = etfci_set_arg;
-	object_class->get_arg = etfci_get_arg;
-
-	item_class->update      = etfci_update;
-	item_class->realize     = etfci_realize;
-	item_class->unrealize   = etfci_unrealize;
-	item_class->draw        = etfci_draw;
-	item_class->point       = etfci_point;
-	item_class->event       = etfci_event;
-	
-	gtk_object_add_arg_type ("ETableFieldChooserItem::dnd_code", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_DND_CODE);
-	gtk_object_add_arg_type ("ETableFieldChooserItem::full_header", GTK_TYPE_OBJECT,
-				 GTK_ARG_WRITABLE, ARG_FULL_HEADER);
-	gtk_object_add_arg_type ("ETableFieldChooserItem::width", GTK_TYPE_DOUBLE,
-				 GTK_ARG_READWRITE, ARG_WIDTH);
-	gtk_object_add_arg_type ("ETableFieldChooserItem::height", GTK_TYPE_DOUBLE,
-				 GTK_ARG_READABLE, ARG_HEIGHT);
-}
-
-static void
-etfci_init (GnomeCanvasItem *item)
-{
-	ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (item);
-
-	etfci->full_header = NULL;
-	
-	etfci->height = etfci->width = 0;
-
-	etfci->font = NULL;
-
-	etfci->structure_change_id = 0;
-	etfci->dimension_change_id = 0;
-
-	etfci->dnd_code = NULL;
-
-	etfci->maybe_drag = 0;
-	etfci->drag_end_id = 0;
-
-	e_canvas_item_set_reflow_callback(item, etfci_reflow);
-}
-
-GtkType
-e_table_field_chooser_item_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"ETableFieldChooserItem",
-			sizeof (ETableFieldChooserItem),
-			sizeof (ETableFieldChooserItemClass),
-			(GtkClassInitFunc) etfci_class_init,
-			(GtkObjectInitFunc) etfci_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_OBJECT_TYPE, &info);
-	}
-
-	return type;
-}
-
diff --git a/widgets/table/e-table-field-chooser-item.h b/widgets/table/e-table-field-chooser-item.h
deleted file mode 100644
index d91c36d52b..0000000000
--- a/widgets/table/e-table-field-chooser-item.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_FIELD_CHOOSER_ITEM_H_
-#define _E_TABLE_FIELD_CHOOSER_ITEM_H_
-
-#include <libgnomeui/gnome-canvas.h>
-#include <gnome-xml/tree.h>
-#include <gal/e-table/e-table-header.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TABLE_FIELD_CHOOSER_ITEM_TYPE        (e_table_field_chooser_item_get_type ())
-#define E_TABLE_FIELD_CHOOSER_ITEM(o)          (GTK_CHECK_CAST ((o), E_TABLE_FIELD_CHOOSER_ITEM_TYPE, ETableFieldChooserItem))
-#define E_TABLE_FIELD_CHOOSER_ITEM_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_FIELD_CHOOSER_ITEM_TYPE, ETableFieldChooserItemClass))
-#define E_IS_TABLE_FIELD_CHOOSER_ITEM(o)       (GTK_CHECK_TYPE ((o), E_TABLE_FIELD_CHOOSER_ITEM_TYPE))
-#define E_IS_TABLE_FIELD_CHOOSER_ITEM_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_FIELD_CHOOSER_ITEM_TYPE))
-
-typedef struct {
-	GnomeCanvasItem  parent;
-	ETableHeader    *full_header;
-
-	double           height, width;
-
-	GdkFont         *font;
-
-	/*
-	 * Ids
-	 */
-	int structure_change_id, dimension_change_id;
-
-	gchar           *dnd_code;
-
-	/*
-	 * For dragging columns
-	 */
-	guint            maybe_drag:1;
-	int              click_x, click_y;
-	int              drag_col;
-	guint            drag_data_get_id;
-        guint            drag_end_id;
-} ETableFieldChooserItem;
-
-typedef struct {
-	GnomeCanvasItemClass parent_class;
-} ETableFieldChooserItemClass;
-
-GtkType    e_table_field_chooser_item_get_type (void);
-
-END_GNOME_DECLS
-
-#endif /* _E_TABLE_FIELD_CHOOSER_ITEM_H_ */
diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c
deleted file mode 100644
index 345883cb89..0000000000
--- a/widgets/table/e-table-field-chooser.c
+++ /dev/null
@@ -1,248 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-table-field-chooser.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include "e-table-field-chooser.h"
-#include "e-table-field-chooser-item.h"
-
-static void e_table_field_chooser_init		(ETableFieldChooser		 *card);
-static void e_table_field_chooser_class_init	(ETableFieldChooserClass	 *klass);
-static void e_table_field_chooser_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_table_field_chooser_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_table_field_chooser_destroy (GtkObject *object);
-
-static GtkVBoxClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_FULL_HEADER,
-	ARG_DND_CODE,
-};
-
-GtkType
-e_table_field_chooser_get_type (void)
-{
-	static GtkType table_field_chooser_type = 0;
-
-	if (!table_field_chooser_type)
-		{
-			static const GtkTypeInfo table_field_chooser_info =
-			{
-				"ETableFieldChooser",
-				sizeof (ETableFieldChooser),
-				sizeof (ETableFieldChooserClass),
-				(GtkClassInitFunc) e_table_field_chooser_class_init,
-				(GtkObjectInitFunc) e_table_field_chooser_init,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-				(GtkClassInitFunc) NULL,
-			};
-
-			table_field_chooser_type = gtk_type_unique (gtk_vbox_get_type (), &table_field_chooser_info);
-		}
-
-	return table_field_chooser_type;
-}
-
-static void
-e_table_field_chooser_class_init (ETableFieldChooserClass *klass)
-{
-	GtkObjectClass *object_class;
-	GtkVBoxClass *vbox_class;
-
-	object_class = (GtkObjectClass*) klass;
-	vbox_class = (GtkVBoxClass *) klass;
-
-	glade_gnome_init();
-
-	parent_class = gtk_type_class (gtk_vbox_get_type ());
-
-	object_class->set_arg = e_table_field_chooser_set_arg;
-	object_class->get_arg = e_table_field_chooser_get_arg;
-	object_class->destroy = e_table_field_chooser_destroy;
-	gtk_object_add_arg_type ("ETableFieldChooser::dnd_code", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_DND_CODE);
-	gtk_object_add_arg_type ("ETableFieldChooser::full_header", GTK_TYPE_OBJECT,
-				 GTK_ARG_READWRITE, ARG_FULL_HEADER);
-}
-
-static void allocate_callback(GtkWidget *canvas, GtkAllocation *allocation, ETableFieldChooser *etfc)
-{
-	double height;
-	etfc->last_alloc = *allocation;
-	gnome_canvas_item_set( etfc->item,
-			       "width", (double) allocation->width,
-			       NULL );
-	gtk_object_get(GTK_OBJECT(etfc->item),
-		       "height", &height,
-		       NULL);
-	height = MAX(height, allocation->height);
-	gnome_canvas_set_scroll_region(GNOME_CANVAS( etfc->canvas ), 0, 0, allocation->width - 1, height - 1);
-	gnome_canvas_item_set( etfc->rect,
-			       "x2", (double) allocation->width,
-			       "y2", (double) height,
-			       NULL );
-}
-
-static void resize(GnomeCanvas *canvas, ETableFieldChooser *etfc)
-{
-	double height;
-	gtk_object_get(GTK_OBJECT(etfc->item),
-		       "height", &height,
-		       NULL);
-
-	height = MAX(height, etfc->last_alloc.height);
-
-	gnome_canvas_set_scroll_region (GNOME_CANVAS(etfc->canvas), 0, 0, etfc->last_alloc.width - 1, height - 1);
-	gnome_canvas_item_set( etfc->rect,
-			       "x2", (double) etfc->last_alloc.width,
-			       "y2", (double) height,
-			       NULL );	
-}
-
-static void
-e_table_field_chooser_init (ETableFieldChooser *etfc)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-
-	gui = glade_xml_new_with_domain (ETABLE_GLADEDIR "/e-table-field-chooser.glade", NULL, PACKAGE);
-	etfc->gui = gui;
-
-	widget = glade_xml_get_widget(gui, "vbox-top");
-	if (!widget) {
-		return;
-	}
-	gtk_widget_reparent(widget,
-			    GTK_WIDGET(etfc));
-
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-
-	etfc->canvas = GNOME_CANVAS(glade_xml_get_widget(gui, "canvas-buttons"));
-
-	etfc->rect = gnome_canvas_item_new(gnome_canvas_root( GNOME_CANVAS( etfc->canvas ) ),
-					   gnome_canvas_rect_get_type(),
-					   "x1", (double) 0,
-					   "y1", (double) 0,
-					   "x2", (double) 100,
-					   "y2", (double) 100,
-					   "fill_color", "white",
-					   NULL );
-
-	etfc->item = gnome_canvas_item_new(gnome_canvas_root(etfc->canvas),
-					   e_table_field_chooser_item_get_type(),
-					   "width", (double) 100,
-					   "full_header", etfc->full_header,
-					   "dnd_code", etfc->dnd_code,
-					   NULL );
-
-	gtk_signal_connect( GTK_OBJECT( etfc->canvas ), "reflow",
-			    GTK_SIGNAL_FUNC( resize ),
-			    etfc);
-
-	gnome_canvas_set_scroll_region ( GNOME_CANVAS( etfc->canvas ),
-					 0, 0,
-					 100, 100 );
-
-	/* Connect the signals */
-	gtk_signal_connect (GTK_OBJECT (etfc->canvas), "size_allocate",
-			    GTK_SIGNAL_FUNC (allocate_callback),
-			    etfc);
-
-	gtk_widget_pop_visual ();
-	gtk_widget_pop_colormap ();
-	gtk_widget_show(widget);
-}
-
-static void
-e_table_field_chooser_destroy (GtkObject *object)
-{
-	ETableFieldChooser *etfc = E_TABLE_FIELD_CHOOSER(object);
-
-	g_free(etfc->dnd_code);
-	if (etfc->full_header)
-		gtk_object_unref(GTK_OBJECT(etfc->full_header));
-
-	if (etfc->gui)
-		gtk_object_unref(GTK_OBJECT(etfc->gui));
-}
-
-GtkWidget*
-e_table_field_chooser_new (void)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_table_field_chooser_get_type ()));
-	return widget;
-}
-
-static void
-e_table_field_chooser_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ETableFieldChooser *etfc = E_TABLE_FIELD_CHOOSER(object);
-
-	switch (arg_id){
-	case ARG_DND_CODE:
-		g_free(etfc->dnd_code);
-		etfc->dnd_code = g_strdup(GTK_VALUE_STRING (*arg));
-		if (etfc->item)
-			gtk_object_set(GTK_OBJECT(etfc->item),
-				       "dnd_code", etfc->dnd_code,
-				       NULL);
-		break;
-	case ARG_FULL_HEADER:
-		if (etfc->full_header)
-			gtk_object_unref(GTK_OBJECT(etfc->full_header));
-		if (GTK_VALUE_OBJECT(*arg))
-			etfc->full_header = E_TABLE_HEADER(GTK_VALUE_OBJECT(*arg));
-		else
-			etfc->full_header = NULL;
-		if (etfc->full_header)
-			gtk_object_ref(GTK_OBJECT(etfc->full_header));
-		if (etfc->item)
-			gtk_object_set(GTK_OBJECT(etfc->item),
-				       "full_header", etfc->full_header,
-				       NULL);
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-e_table_field_chooser_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ETableFieldChooser *etfc = E_TABLE_FIELD_CHOOSER(object);
-
-	switch (arg_id) {
-	case ARG_DND_CODE:
-		GTK_VALUE_STRING (*arg) = g_strdup (etfc->dnd_code);
-		break;
-	case ARG_FULL_HEADER:
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(etfc->full_header);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
diff --git a/widgets/table/e-table-field-chooser.glade b/widgets/table/e-table-field-chooser.glade
deleted file mode 100644
index e09d618a7f..0000000000
--- a/widgets/table/e-table-field-chooser.glade
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>e-table-field-chooser</name>
-  <program_name>e-table-field-chooser</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <gnome_help_support>True</gnome_help_support>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-field-chooser</name>
-  <visible>False</visible>
-  <title>Field Chooser</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CLOSE</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkVBox</class>
-      <name>vbox-top</name>
-      <homogeneous>False</homogeneous>
-      <spacing>4</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label1</name>
-	<label>To add a column to your table, drag it into
-the location in which you want it to appear.</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkScrolledWindow</class>
-	<name>scrolledwindow1</name>
-	<width>200</width>
-	<height>200</height>
-	<hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
-	<vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>canvas-buttons</name>
-	  <creation_function>e_canvas_new</creation_function>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 08 Jun 2000 07:27:33 GMT</last_modification_time>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/widgets/table/e-table-field-chooser.h b/widgets/table/e-table-field-chooser.h
deleted file mode 100644
index ff24ebbab4..0000000000
--- a/widgets/table/e-table-field-chooser.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor-fullname.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_TABLE_FIELD_CHOOSER_H__
-#define __E_TABLE_FIELD_CHOOSER_H__
-
-#include <glade/glade.h>
-#include <gal/e-table/e-table-header.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* ETableFieldChooser - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- */
-
-#define E_TABLE_FIELD_CHOOSER_TYPE			(e_table_field_chooser_get_type ())
-#define E_TABLE_FIELD_CHOOSER(obj)			(GTK_CHECK_CAST ((obj), E_TABLE_FIELD_CHOOSER_TYPE, ETableFieldChooser))
-#define E_TABLE_FIELD_CHOOSER_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TABLE_FIELD_CHOOSER_TYPE, ETableFieldChooserClass))
-#define E_IS_TABLE_FIELD_CHOOSER(obj)		(GTK_CHECK_TYPE ((obj), E_TABLE_FIELD_CHOOSER_TYPE))
-#define E_IS_TABLE_FIELD_CHOOSER_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_TABLE_FIELD_CHOOSER_TYPE))
-
-
-typedef struct _ETableFieldChooser       ETableFieldChooser;
-typedef struct _ETableFieldChooserClass  ETableFieldChooserClass;
-
-struct _ETableFieldChooser
-{
-	GtkVBox parent;
-	
-	/* item specific fields */
-	GladeXML *gui;
-	GnomeCanvas *canvas;
-	GnomeCanvasItem *item;
-
-	GnomeCanvasItem *rect;
-	GtkAllocation last_alloc;
-
-	gchar *dnd_code;
-	ETableHeader *full_header;
-};
-
-struct _ETableFieldChooserClass
-{
-	GtkVBoxClass parent_class;
-};
-
-
-GtkWidget *e_table_field_chooser_new(void);
-GtkType    e_table_field_chooser_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_TABLE_FIELD_CHOOSER_H__ */
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
deleted file mode 100644
index 034c5625b8..0000000000
--- a/widgets/table/e-table-group-container.c
+++ /dev/null
@@ -1,1411 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-Table-Group.c: Implements the grouping objects for elements on a table
- *
- * Author:
- *   Chris Lahey <clahey@ximian.com>
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * Copyright 1999, 2000 Ximian, Inc.
- */
-
-#include <config.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtksignal.h>
-#include <libgnome/libgnome.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include "e-table-group-container.h"
-#include "e-table-group-leaf.h"
-#include "e-table-item.h"
-#include "gal/util/e-util.h"
-#include "gal/widgets/e-canvas.h"
-#include "gal/widgets/e-canvas-utils.h"
-#include "gal/e-text/e-text.h"
-#include "e-table-defines.h"
-
-#define TITLE_HEIGHT         16
-
-#define PARENT_TYPE e_table_group_get_type ()
-
-static GnomeCanvasGroupClass *etgc_parent_class;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_HEIGHT,
-	ARG_WIDTH,
-	ARG_MINIMUM_WIDTH,
-	ARG_FROZEN,
-	ARG_TABLE_ALTERNATING_ROW_COLORS,
-	ARG_TABLE_HORIZONTAL_DRAW_GRID,
-	ARG_TABLE_VERTICAL_DRAW_GRID,
-	ARG_TABLE_DRAW_FOCUS,
-	ARG_CURSOR_MODE,
-	ARG_SELECTION_MODEL,
-	ARG_LENGTH_THRESHOLD,
-};
-
-typedef struct {
-	ETableGroup *child;
-	void *key;
-	char *string;
-	GnomeCanvasItem *text;
-	GnomeCanvasItem *rect;
-	gint count;
-} ETableGroupContainerChildNode;
-
-static EPrintable *
-etgc_get_printable (ETableGroup *etg);
-
-
-static void
-e_table_group_container_child_node_free (ETableGroupContainer          *etgc,
-					ETableGroupContainerChildNode *child_node)
-{
-	ETableGroup *etg = E_TABLE_GROUP (etgc);
-	ETableGroup *child = child_node->child;
-
-	gtk_object_destroy (GTK_OBJECT (child));
-	e_table_model_free_value (etg->model, etgc->ecol->col_idx,
-				  child_node->key);
-	g_free(child_node->string);
-	gtk_object_destroy (GTK_OBJECT (child_node->text));
-	gtk_object_destroy (GTK_OBJECT (child_node->rect));
-}
-
-static void
-e_table_group_container_list_free (ETableGroupContainer *etgc)
-{
-	ETableGroupContainerChildNode *child_node;
-	GList *list;
-
-	for (list = etgc->children; list; list = g_list_next (list)) {
-		child_node = (ETableGroupContainerChildNode *) list->data;
-		e_table_group_container_child_node_free (etgc, child_node);
-	}
-
-	g_list_free (etgc->children);
-}
-
-static void
-etgc_destroy (GtkObject *object)
-{
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (object);
-
-	if (etgc->font)
-		gdk_font_unref (etgc->font);
-		etgc->font = NULL;
-
-	if (etgc->ecol)
-		gtk_object_unref (GTK_OBJECT(etgc->ecol));
-
-	if (etgc->sort_info)
-		gtk_object_unref (GTK_OBJECT(etgc->sort_info));
-
-	if (etgc->selection_model)
-		gtk_object_unref (GTK_OBJECT(etgc->selection_model));
-
-	if (etgc->rect)
-		gtk_object_destroy (GTK_OBJECT(etgc->rect));
-
-	e_table_group_container_list_free (etgc);
-
-	GTK_OBJECT_CLASS (etgc_parent_class)->destroy (object);
-}
-
-/** 
- * e_table_group_container_construct
- * @parent: The %GnomeCanvasGroup to create a child of.
- * @etgc: The %ETableGroupContainer.
- * @full_header: The full header of the %ETable.
- * @header: The current header of the %ETable.
- * @model: The %ETableModel of the %ETable.
- * @sort_info: The %ETableSortInfo of the %ETable.
- * @n: Which grouping level this is (Starts at 0 and sends n + 1 to any child %ETableGroups.
- *
- * This routine constructs the new %ETableGroupContainer.
- */
-void
-e_table_group_container_construct (GnomeCanvasGroup *parent, ETableGroupContainer *etgc,
-				   ETableHeader *full_header,
-				   ETableHeader     *header,
-				   ETableModel *model, ETableSortInfo *sort_info, int n)
-{
-	ETableCol *col;
-	ETableSortColumn column = e_table_sort_info_grouping_get_nth(sort_info, n);
-
-	col = e_table_header_get_column_by_col_idx(full_header, column.column);
-	if (col == NULL)
-		col = e_table_header_get_column (full_header, e_table_header_count (full_header) - 1);
-
-	e_table_group_construct (parent, E_TABLE_GROUP (etgc), full_header, header, model);
-	etgc->ecol = col;
-	gtk_object_ref (GTK_OBJECT(etgc->ecol));
-	etgc->sort_info = sort_info;
-	gtk_object_ref (GTK_OBJECT(etgc->sort_info));
-	etgc->n = n;
-	etgc->ascending = column.ascending;
-
-	
-	etgc->font = gdk_font_load ("lucidasans-10");
-	if (!etgc->font){
-		etgc->font = GTK_WIDGET (GNOME_CANVAS_ITEM (etgc)->canvas)->style->font;
-		
-		gdk_font_ref (etgc->font);
-	}
-	etgc->open = TRUE;
-}
-
-/** 
- * e_table_group_container_new
- * @parent: The %GnomeCanvasGroup to create a child of.
- * @full_header: The full header of the %ETable.
- * @header: The current header of the %ETable.
- * @model: The %ETableModel of the %ETable.
- * @sort_info: The %ETableSortInfo of the %ETable.
- * @n: Which grouping level this is (Starts at 0 and sends n + 1 to any child %ETableGroups.
- *
- * %ETableGroupContainer is an %ETableGroup which groups by the nth
- * grouping of the %ETableSortInfo.  It creates %ETableGroups as
- * children.
- *
- * Returns: The new %ETableGroupContainer.
- */
-ETableGroup *
-e_table_group_container_new (GnomeCanvasGroup *parent, ETableHeader *full_header,
-			     ETableHeader     *header,
-			     ETableModel *model, ETableSortInfo *sort_info, int n)
-{
-	ETableGroupContainer *etgc;
-
-	g_return_val_if_fail (parent != NULL, NULL);
-	
-	etgc = gtk_type_new (e_table_group_container_get_type ());
-
-	e_table_group_container_construct (parent, etgc, full_header, header,
-					   model, sort_info, n);
-	return E_TABLE_GROUP (etgc);
-}
-
-
-static int
-etgc_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(item);
-	gboolean return_val = TRUE;
-	gboolean change_focus = FALSE;
-	gboolean use_col = FALSE;
-	gint start_col = 0;
-	gint old_col;
-	EFocus direction = E_FOCUS_START;
-
-	switch (event->type) {
-	case GDK_KEY_PRESS:
-		if (event->key.keyval == GDK_Tab || 
-		    event->key.keyval == GDK_KP_Tab || 
-		    event->key.keyval == GDK_ISO_Left_Tab) {
-			change_focus = TRUE;
-			use_col      = TRUE;
-			start_col    = (event->key.state & GDK_SHIFT_MASK) ? -1 : 0;
-			direction    = (event->key.state & GDK_SHIFT_MASK) ? E_FOCUS_END : E_FOCUS_START;
-		} else if (event->key.keyval == GDK_Left ||
-			   event->key.keyval == GDK_KP_Left) {
-			change_focus = TRUE;
-			use_col      = TRUE;
-			start_col    = -1;
-			direction    = E_FOCUS_END;
-		} else if (event->key.keyval == GDK_Right ||
-			   event->key.keyval == GDK_KP_Right) {
-			change_focus = TRUE;
-			use_col   = TRUE;
-			start_col = 0;
-			direction = E_FOCUS_START;
-		} else if (event->key.keyval == GDK_Down ||
-			   event->key.keyval == GDK_KP_Down) {
-			change_focus = TRUE;
-			use_col      = FALSE;
-			direction    = E_FOCUS_START;
-		} else if (event->key.keyval == GDK_Up ||
-			   event->key.keyval == GDK_KP_Up) {
-			change_focus = TRUE;
-			use_col      = FALSE;
-			direction    = E_FOCUS_END;
-		} else if (event->key.keyval == GDK_Return ||
-			   event->key.keyval == GDK_KP_Enter) {
-			change_focus = TRUE;
-			use_col      = FALSE;
-			direction    = E_FOCUS_START;
-		}
-		if (change_focus){		
-			GList *list;
-			for (list = etgc->children; list; list = list->next) {
-				ETableGroupContainerChildNode *child_node;
-				ETableGroup                   *child;
-
-				child_node = (ETableGroupContainerChildNode *)list->data;
-				child      = child_node->child;
-
-				if (e_table_group_get_focus (child)) {
-					old_col = e_table_group_get_focus_column (child);
-					if (old_col == -1)
-						old_col = 0;
-					if (start_col == -1)
-						start_col = e_table_header_count (e_table_group_get_header (child)) - 1;
-					
-					if (direction == E_FOCUS_END)
-						list = list->prev;
-					else
-						list = list->next;
-					
-					if (list) {
-						child_node = (ETableGroupContainerChildNode *)list->data;
-						child = child_node->child;
-						if (use_col)
-							e_table_group_set_focus (child, direction, start_col);
-						else
-							e_table_group_set_focus (child, direction, old_col);
-						return 1;
-					} else {
-						return 0;
-					}
-				}
-			}
-			if (direction == E_FOCUS_END)
-				list = g_list_last(etgc->children);
-			else
-				list = etgc->children;
-			if (list) {
-				ETableGroupContainerChildNode *child_node;
-				ETableGroup                   *child;
-
-				child_node = (ETableGroupContainerChildNode *)list->data;
-				child = child_node->child;
-
-				if (start_col == -1)
-					start_col = e_table_header_count (e_table_group_get_header (child)) - 1;
-
-				e_table_group_set_focus (child, direction, start_col);
-				return 1;
-			}
-		}
-		return_val = FALSE;
-		break;
-	default:
-		return_val = FALSE;
-		break;
-	}
-	if (return_val == FALSE) {
-		if (GNOME_CANVAS_ITEM_CLASS(etgc_parent_class)->event)
-			return GNOME_CANVAS_ITEM_CLASS (etgc_parent_class)->event (item, event);
-	}
-	return return_val;
-	
-}
-
-/* Realize handler for the text item */
-static void
-etgc_realize (GnomeCanvasItem *item)
-{
-	ETableGroupContainer *etgc;
-
-	if (GNOME_CANVAS_ITEM_CLASS (etgc_parent_class)->realize)
-		(* GNOME_CANVAS_ITEM_CLASS (etgc_parent_class)->realize) (item);
-
-	etgc = E_TABLE_GROUP_CONTAINER (item);
-
-	e_canvas_item_request_reflow (GNOME_CANVAS_ITEM (etgc));
-}
-
-/* Unrealize handler for the etgc item */
-static void
-etgc_unrealize (GnomeCanvasItem *item)
-{
-	ETableGroupContainer *etgc;
-
-	etgc = E_TABLE_GROUP_CONTAINER (item);
-	
-	if (GNOME_CANVAS_ITEM_CLASS (etgc_parent_class)->unrealize)
-		(* GNOME_CANVAS_ITEM_CLASS (etgc_parent_class)->unrealize) (item);
-}
-
-static void
-compute_text (ETableGroupContainer *etgc, ETableGroupContainerChildNode *child_node)
-{
-	gchar *text;
-	if (etgc->ecol->text)
-		text = g_strdup_printf ((child_node->count == 1)
-					? _("%s : %s (%d item)")
-					: _("%s : %s (%d items)"),
-					etgc->ecol->text,
-					child_node->string,
-					(gint) child_node->count);
-	else
-		text = g_strdup_printf ((child_node->count == 1)
-					? _("%s (%d item)")
-					: _("%s (%d items)"),
-					child_node->string,
-					(gint) child_node->count);
-	gnome_canvas_item_set (child_node->text, 
-			       "text", text,
-			       NULL);
-	g_free (text);
-}
-
-static void
-child_cursor_change (ETableGroup *etg, int row,
-		    ETableGroupContainer *etgc)
-{
-	e_table_group_cursor_change (E_TABLE_GROUP (etgc), row);
-}
-
-static void
-child_cursor_activated (ETableGroup *etg, int row,
-		    ETableGroupContainer *etgc)
-{
-	e_table_group_cursor_activated (E_TABLE_GROUP (etgc), row);
-}
-
-static void
-child_double_click (ETableGroup *etg, int row, int col, GdkEvent *event,
-		    ETableGroupContainer *etgc)
-{
-	e_table_group_double_click (E_TABLE_GROUP (etgc), row, col, event);
-}
-
-static gint
-child_right_click (ETableGroup *etg, int row, int col, GdkEvent *event,
-		   ETableGroupContainer *etgc)
-{
-	return e_table_group_right_click (E_TABLE_GROUP (etgc), row, col, event);
-}
-
-static gint
-child_click (ETableGroup *etg, int row, int col, GdkEvent *event,
-		   ETableGroupContainer *etgc)
-{
-	return e_table_group_click (E_TABLE_GROUP (etgc), row, col, event);
-}
-
-static gint
-child_key_press (ETableGroup *etg, int row, int col, GdkEvent *event,
-		 ETableGroupContainer *etgc)
-{
-	return e_table_group_key_press (E_TABLE_GROUP (etgc), row, col, event);
-}
-
-static ETableGroupContainerChildNode *
-create_child_node (ETableGroupContainer *etgc, void *val)
-{
-	ETableGroup *child;
-	ETableGroupContainerChildNode *child_node;
-	ETableGroup *etg = E_TABLE_GROUP(etgc);
-
-	child_node = g_new (ETableGroupContainerChildNode, 1);
-	child_node->rect = gnome_canvas_item_new (GNOME_CANVAS_GROUP (etgc),
-						  gnome_canvas_rect_get_type (),
-						  "fill_color", "grey70",
-						  "outline_color", "grey50",
-						  NULL);
-	child_node->text = gnome_canvas_item_new (GNOME_CANVAS_GROUP (etgc),
-						  e_text_get_type (),
-						  "font_gdk", etgc->font,
-						  "anchor", GTK_ANCHOR_SW,
-						  "fill_color", "black",
-						  "draw_background", FALSE,
-						  NULL);
-	child = e_table_group_new (GNOME_CANVAS_GROUP (etgc), etg->full_header,
-				   etg->header, etg->model, etgc->sort_info, etgc->n + 1);
-	gnome_canvas_item_set(GNOME_CANVAS_ITEM(child),
-			      "alternating_row_colors", etgc->alternating_row_colors,
-			      "horizontal_draw_grid", etgc->horizontal_draw_grid,
-			      "vertical_draw_grid", etgc->vertical_draw_grid,
-			      "drawfocus", etgc->draw_focus,
-			      "cursor_mode", etgc->cursor_mode,
-			      "selection_model", etgc->selection_model,
-			      "length_threshold", etgc->length_threshold,
-			      "minimum_width", etgc->minimum_width - GROUP_INDENT,
-			      NULL);
-
-	gtk_signal_connect (GTK_OBJECT (child), "cursor_change",
-			    GTK_SIGNAL_FUNC (child_cursor_change), etgc);
-	gtk_signal_connect (GTK_OBJECT (child), "cursor_activated",
-			    GTK_SIGNAL_FUNC (child_cursor_activated), etgc);
-	gtk_signal_connect (GTK_OBJECT (child), "double_click",
-			    GTK_SIGNAL_FUNC (child_double_click), etgc);
-	gtk_signal_connect (GTK_OBJECT (child), "right_click",
-			    GTK_SIGNAL_FUNC (child_right_click), etgc);
-	gtk_signal_connect (GTK_OBJECT (child), "click",
-			    GTK_SIGNAL_FUNC (child_click), etgc);
-	gtk_signal_connect (GTK_OBJECT (child), "key_press",
-			    GTK_SIGNAL_FUNC (child_key_press), etgc);
-	child_node->child = child;
-	child_node->key = e_table_model_duplicate_value (etg->model, etgc->ecol->col_idx, val);
-	child_node->string = e_table_model_value_to_string (etg->model, etgc->ecol->col_idx, val);
-	child_node->count = 0;
-
-	return child_node;
-}
-
-static void
-etgc_add (ETableGroup *etg, gint row)
-{
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (etg);
-	void *val = e_table_model_value_at (etg->model, etgc->ecol->col_idx, row);
-	GCompareFunc comp = etgc->ecol->compare;
-	GList *list = etgc->children;
-	ETableGroup *child;
-	ETableGroupContainerChildNode *child_node;
-	int i = 0;
-
-	for (; list; list = g_list_next (list), i++){
-		int comp_val;
-
-		child_node = list->data;
-		comp_val = (*comp)(child_node->key, val);
-		if (comp_val == 0) {
-			child = child_node->child;
-			child_node->count ++;
-			e_table_group_add (child, row);
-			compute_text (etgc, child_node);
-			return;
-		}
-		if ((comp_val > 0 && etgc->ascending) ||
-		    (comp_val < 0 && (!etgc->ascending)))
-			break;
-	}
-	child_node = create_child_node (etgc, val);
-	child = child_node->child;
-	child_node->count = 1;
-	e_table_group_add (child, row);
-
-	if (list)
-		etgc->children = g_list_insert (etgc->children, child_node, i);
-	else
-		etgc->children = g_list_append (etgc->children, child_node);
-
-	compute_text (etgc, child_node);
-	e_canvas_item_request_reflow (GNOME_CANVAS_ITEM (etgc));
-}
-
-static void
-etgc_add_array (ETableGroup *etg, const int *array, int count)
-{
-	int i;
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (etg);
-	void *lastval = 0;
-	int laststart = 0;
-	GCompareFunc comp = etgc->ecol->compare;
-	ETableGroupContainerChildNode *child_node;
-	ETableGroup *child;
-
-	if (count <= 0)
-		return;
-
-	e_table_group_container_list_free (etgc);
-	etgc->children = NULL;
-
-	lastval = e_table_model_value_at (etg->model, etgc->ecol->col_idx, array[0]);
-
-	for (i = 1; i < count; i++) {
-		void *val = e_table_model_value_at (etg->model, etgc->ecol->col_idx, array[i]);
-		int comp_val;
-
-		comp_val = (*comp)(lastval, val);
-		if (comp_val != 0) {
-			child_node = create_child_node(etgc, lastval);
-			child = child_node->child;
-
-			e_table_group_add_array(child, array + laststart, i - laststart);
-			child_node->count = i - laststart;
-
-			etgc->children = g_list_append (etgc->children, child_node);
-			compute_text (etgc, child_node);
-			laststart = i;
-			lastval = val;
-		}
-	}
-
-	child_node = create_child_node(etgc, lastval);
-	child = child_node->child;
-
-	e_table_group_add_array(child, array + laststart, i - laststart);
-	child_node->count = i - laststart;
-
-	etgc->children = g_list_append (etgc->children, child_node);
-	compute_text (etgc, child_node);
-
-	e_canvas_item_request_reflow (GNOME_CANVAS_ITEM (etgc));
-}
-
-static void
-etgc_add_all (ETableGroup *etg)
-{
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (etg);
-	ESorter *sorter = etgc->selection_model->sorter;
-	int *array;
-	int count;
-
-	e_sorter_get_sorted_to_model_array(sorter, &array, &count);
-
-	etgc_add_array(etg, array, count);
-}
-
-static gboolean
-etgc_remove (ETableGroup *etg, gint row)
-{
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg);
-	GList *list;
-
-	for (list = etgc->children ; list; list = g_list_next (list)) {
-		ETableGroupContainerChildNode *child_node = list->data;
-		ETableGroup                   *child = child_node->child;
-
-		if (e_table_group_remove (child, row)) {
-			child_node->count --;
-			if (child_node->count == 0) {
-				e_table_group_container_child_node_free (etgc, child_node);
-				etgc->children = g_list_remove (etgc->children, child_node);
-				g_free (child_node);
-			} else
-				compute_text (etgc, child_node);
-
-			e_canvas_item_request_reflow (GNOME_CANVAS_ITEM (etgc));
-
-			return TRUE;
-		}
-	}
-	return FALSE;
-}
-
-static int
-etgc_row_count (ETableGroup *etg)
-{
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg);
-	GList *list;
-	gint count = 0;
-	for (list = etgc->children; list; list = g_list_next(list)) {
-		ETableGroup *group = ((ETableGroupContainerChildNode *)list->data)->child;
-		gint this_count = e_table_group_row_count(group);
-		count += this_count;
-	}
-	return count;
-}
-
-static void
-etgc_increment (ETableGroup *etg, gint position, gint amount)
-{
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg);
-	GList *list = etgc->children;
-
-	for (list = etgc->children ; list; list = g_list_next (list))
-		e_table_group_increment (((ETableGroupContainerChildNode *)list->data)->child,
-					 position, amount);
-}
-
-static void
-etgc_decrement (ETableGroup *etg, gint position, gint amount)
-{
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg);
-	GList *list = etgc->children;
-
-	for (list = etgc->children ; list; list = g_list_next (list))
-		e_table_group_decrement (((ETableGroupContainerChildNode *)list->data)->child,
-					 position, amount);
-}
-
-static void
-etgc_set_focus (ETableGroup *etg, EFocus direction, gint view_col)
-{
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg);
-	if (etgc->children) {
-		if (direction == E_FOCUS_END)
-			e_table_group_set_focus (((ETableGroupContainerChildNode *)g_list_last (etgc->children)->data)->child,
-						 direction, view_col);
-		else
-			e_table_group_set_focus (((ETableGroupContainerChildNode *)etgc->children->data)->child,
-						 direction, view_col);
-	}
-}
-
-static gint
-etgc_get_focus_column (ETableGroup *etg)
-{
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg);
-	if (etgc->children) {
-		GList *list;
-		for (list = etgc->children; list; list = list->next) {
-			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data;
-			ETableGroup *child = child_node->child;
-			if (e_table_group_get_focus (child)) {
-				return e_table_group_get_focus_column (child);
-			}
-		}
-	}
-	return 0;
-}
-
-static void
-etgc_compute_location (ETableGroup *etg, int *x, int *y, int *row, int *col)
-{
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg);
-
-	if (row)
-		*row = -1;
-	if (col)
-		*col = -1;
-
-	*x -= GROUP_INDENT;
-	*y -= TITLE_HEIGHT;
-
-	if (*x >= 0 && *y >= 0 && etgc->children) {
-		GList *list;
-		for (list = etgc->children; list; list = list->next) {
-			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data;
-			ETableGroup *child = child_node->child;
-
-			e_table_group_compute_location (child, x, y, row, col);
-			if ((*row != -1) && (*col != -1))
-				return;
-		}
-	}
-}
-
-static void
-etgc_get_cell_geometry (ETableGroup *etg, int *row, int *col, int *x, int *y, int *width, int *height)
-{
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg);
-
-	int ypos;
-
-	ypos = 0;
-
-	if (etgc->children) {
-		GList *list;
-		for (list = etgc->children; list; list = list->next) {
-			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data;
-			ETableGroup *child = child_node->child;
-			int thisy;
-
-			e_table_group_get_cell_geometry (child, row, col, x, &thisy, width, height);
-			ypos += thisy;
-			if ((*row == -1) || (*col == -1)) {
-				ypos += TITLE_HEIGHT;
-				*x += GROUP_INDENT;
-				*y = ypos;
-				return;
-			}
-		}
-	}
-}
-
-static void etgc_thaw (ETableGroup *etg)
-{
-	e_canvas_item_request_reflow (GNOME_CANVAS_ITEM(etg));
-}
-
-static void
-etgc_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ETableGroup *etg = E_TABLE_GROUP (object);
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (object);
-	GList *list;
-
-	switch (arg_id) {
-	case ARG_FROZEN:
-		if (GTK_VALUE_BOOL (*arg))
-			etg->frozen = TRUE;
-		else {
-			etg->frozen = FALSE;
-			etgc_thaw (etg);
-		}
-		break;
-	case ARG_MINIMUM_WIDTH:
-	case ARG_WIDTH:
-		etgc->minimum_width = GTK_VALUE_DOUBLE(*arg);
-
-		for (list = etgc->children; list; list = g_list_next (list)) {
-			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data;
-			gtk_object_set (GTK_OBJECT(child_node->child),
-					"minimum_width", etgc->minimum_width - GROUP_INDENT,
-					NULL);
-		}
-		break;
-	case ARG_LENGTH_THRESHOLD:
-		etgc->length_threshold = GTK_VALUE_INT (*arg);
-		for (list = etgc->children; list; list = g_list_next (list)) {
-			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data;
-			gtk_object_set (GTK_OBJECT(child_node->child),
-					"length_threshold", GTK_VALUE_INT (*arg),
-					NULL);
-		}
-		break;
-
-	case ARG_SELECTION_MODEL:
-		if (etgc->selection_model)
-			gtk_object_unref(GTK_OBJECT(etgc->selection_model));
-		etgc->selection_model = E_SELECTION_MODEL(GTK_VALUE_OBJECT (*arg));
-		if (etgc->selection_model)
-			gtk_object_ref(GTK_OBJECT(etgc->selection_model));
-		for (list = etgc->children; list; list = g_list_next (list)) {
-			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data;
-			gtk_object_set (GTK_OBJECT(child_node->child),
-					"selection_model", etgc->selection_model,
-					NULL);
-		}
-		break;
-
-	case ARG_TABLE_ALTERNATING_ROW_COLORS:
-		etgc->alternating_row_colors = GTK_VALUE_BOOL (*arg);
-		for (list = etgc->children; list; list = g_list_next (list)) {
-			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data;
-			gtk_object_set (GTK_OBJECT(child_node->child),
-					"alternating_row_colors", GTK_VALUE_BOOL (*arg),
-					NULL);
-		}
-		break;
-
-	case ARG_TABLE_HORIZONTAL_DRAW_GRID:
-		etgc->horizontal_draw_grid = GTK_VALUE_BOOL (*arg);
-		for (list = etgc->children; list; list = g_list_next (list)) {
-			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data;
-			gtk_object_set (GTK_OBJECT(child_node->child),
-					"horizontal_draw_grid", GTK_VALUE_BOOL (*arg),
-					NULL);
-		}
-		break;
-
-	case ARG_TABLE_VERTICAL_DRAW_GRID:
-		etgc->vertical_draw_grid = GTK_VALUE_BOOL (*arg);
-		for (list = etgc->children; list; list = g_list_next (list)) {
-			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data;
-			gtk_object_set (GTK_OBJECT(child_node->child),
-					"vertical_draw_grid", GTK_VALUE_BOOL (*arg),
-					NULL);
-		}
-		break;
-
-	case ARG_TABLE_DRAW_FOCUS:
-		etgc->draw_focus = GTK_VALUE_BOOL (*arg);
-		for (list = etgc->children; list; list = g_list_next (list)) {
-			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data;
-			gtk_object_set (GTK_OBJECT(child_node->child),
-					"drawfocus", GTK_VALUE_BOOL (*arg),
-					NULL);
-		}
-		break;
-
-	case ARG_CURSOR_MODE:
-		etgc->cursor_mode = GTK_VALUE_INT (*arg);
-		for (list = etgc->children; list; list = g_list_next (list)) {
-			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data;
-			gtk_object_set (GTK_OBJECT(child_node->child),
-					"cursor_mode", GTK_VALUE_INT (*arg),
-					NULL);
-		}
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-etgc_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ETableGroup *etg = E_TABLE_GROUP (object);
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (object);
-
-	switch (arg_id) {
-	case ARG_FROZEN:
-		GTK_VALUE_BOOL (*arg) = etg->frozen;
-		break;
-	case ARG_HEIGHT:
-		GTK_VALUE_DOUBLE (*arg) = etgc->height;
-		break;
-	case ARG_WIDTH:	
-		GTK_VALUE_DOUBLE (*arg) = etgc->width;
-		break;
-	case ARG_MINIMUM_WIDTH:
-		etgc->minimum_width = GTK_VALUE_DOUBLE(*arg);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-etgc_class_init (GtkObjectClass *object_class)
-{
-	GnomeCanvasItemClass *item_class = (GnomeCanvasItemClass *) object_class;
-	ETableGroupClass *e_group_class = E_TABLE_GROUP_CLASS(object_class);
-
-	object_class->destroy = etgc_destroy;
-	object_class->set_arg = etgc_set_arg;
-	object_class->get_arg = etgc_get_arg;
-
-	item_class->event = etgc_event;
-	item_class->realize = etgc_realize;
-	item_class->unrealize = etgc_unrealize;
-
-	etgc_parent_class = gtk_type_class (PARENT_TYPE);
-
-	e_group_class->add = etgc_add;
-	e_group_class->add_array = etgc_add_array;
-	e_group_class->add_all = etgc_add_all;
-	e_group_class->remove = etgc_remove;
-	e_group_class->increment  = etgc_increment;
-	e_group_class->decrement  = etgc_decrement;
-	e_group_class->row_count  = etgc_row_count;
-	e_group_class->set_focus  = etgc_set_focus;
-	e_group_class->get_focus_column = etgc_get_focus_column;
-	e_group_class->get_printable = etgc_get_printable;
-	e_group_class->compute_location = etgc_compute_location;
-	e_group_class->get_cell_geometry = etgc_get_cell_geometry;
-
-	gtk_object_add_arg_type ("ETableGroupContainer::alternating_row_colors", GTK_TYPE_BOOL,
-				 GTK_ARG_WRITABLE, ARG_TABLE_ALTERNATING_ROW_COLORS);
-	gtk_object_add_arg_type ("ETableGroupContainer::horizontal_draw_grid", GTK_TYPE_BOOL,
-				 GTK_ARG_WRITABLE, ARG_TABLE_HORIZONTAL_DRAW_GRID);
-	gtk_object_add_arg_type ("ETableGroupContainer::vertical_draw_grid", GTK_TYPE_BOOL,
-				 GTK_ARG_WRITABLE, ARG_TABLE_VERTICAL_DRAW_GRID);
-	gtk_object_add_arg_type ("ETableGroupContainer::drawfocus", GTK_TYPE_BOOL,
-				 GTK_ARG_WRITABLE, ARG_TABLE_DRAW_FOCUS);
-	gtk_object_add_arg_type ("ETableGroupContainer::cursor_mode", GTK_TYPE_INT,
-				 GTK_ARG_WRITABLE, ARG_CURSOR_MODE);
-	gtk_object_add_arg_type ("ETableGroupContainer::selection_model", E_SELECTION_MODEL_TYPE,
-				 GTK_ARG_WRITABLE, ARG_SELECTION_MODEL);
-	gtk_object_add_arg_type ("ETableGroupContainer::length_threshold", GTK_TYPE_INT,
-				 GTK_ARG_WRITABLE, ARG_LENGTH_THRESHOLD);
-
-	gtk_object_add_arg_type ("ETableGroupContainer::frozen", GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE, ARG_FROZEN);
-	gtk_object_add_arg_type ("ETableGroupContainer::height", GTK_TYPE_DOUBLE, 
-				 GTK_ARG_READABLE, ARG_HEIGHT);
-	gtk_object_add_arg_type ("ETableGroupContainer::width", GTK_TYPE_DOUBLE, 
-				 GTK_ARG_READWRITE, ARG_WIDTH);
-	gtk_object_add_arg_type ("ETableGroupContainer::minimum_width", GTK_TYPE_DOUBLE,
-				 GTK_ARG_READWRITE, ARG_MINIMUM_WIDTH);
-}
-
-static void
-etgc_reflow (GnomeCanvasItem *item, gint flags)
-{
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(item);
-	gboolean frozen;
-
-        gtk_object_get (GTK_OBJECT(etgc), 
-			"frozen", &frozen,
-			NULL);
-
-	if (frozen)
-		return;
-	
-
-	if (GTK_OBJECT_FLAGS(etgc)& GNOME_CANVAS_ITEM_REALIZED){
-		gdouble running_height = 0;
-		gdouble running_width = 0;
-		gdouble old_height;
-		gdouble old_width;
-		
-		old_height = etgc->height;
-		old_width = etgc->width;
-		if (etgc->children == NULL){
-		} else {
-			GList *list;
-			gdouble extra_height = 0;
-			gdouble item_height = 0;
-			gdouble item_width = 0;
-			
-			if (etgc->font)
-				extra_height += etgc->font->ascent + etgc->font->descent + BUTTON_PADDING * 2;
-			
-			extra_height = MAX(extra_height, BUTTON_HEIGHT + BUTTON_PADDING * 2);
-				
-			running_height = extra_height;
-			
-			for ( list = etgc->children; list; list = g_list_next (list)){
-				ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *) list->data;
-				ETableGroup *child = child_node->child;
-				
-				gtk_object_get (GTK_OBJECT(child),
-						"width", &item_width,
-						NULL);
-
-				if (item_width > running_width)
-					running_width = item_width;
-			}
-			for ( list = etgc->children; list; list = g_list_next (list)){
-				ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *) list->data;
-				ETableGroup *child = child_node->child;
-				gtk_object_get (GTK_OBJECT(child),
-						"height", &item_height,
-						NULL);
-				
-				e_canvas_item_move_absolute (GNOME_CANVAS_ITEM(child_node->text),
-							    GROUP_INDENT,
-							    running_height - BUTTON_PADDING);
-				
-				e_canvas_item_move_absolute (GNOME_CANVAS_ITEM(child),
-							    GROUP_INDENT,
-							    running_height);
-				
-				gnome_canvas_item_set (GNOME_CANVAS_ITEM(child_node->rect),
-						      "x1", (double) 0,
-						      "x2", (double) running_width + GROUP_INDENT,
-						      "y1", (double) running_height - extra_height,
-						      "y2", (double) running_height + item_height,
-						      NULL);
-				
-				running_height += item_height + extra_height;
-			}
-			running_height -= extra_height;
-		}
-		if (running_height != old_height || running_width != old_width) {
-			etgc->height = running_height;
-			etgc->width = running_width;
-			e_canvas_item_request_parent_reflow (item);
-		}
-	}
-}
-
-static void
-etgc_init (GtkObject *object)
-{
-	ETableGroupContainer *container = E_TABLE_GROUP_CONTAINER(object);
-	container->children = FALSE;
-	
-	e_canvas_item_set_reflow_callback (GNOME_CANVAS_ITEM(object), etgc_reflow);
-
-	container->alternating_row_colors = 1;
-	container->horizontal_draw_grid = 1;
-	container->vertical_draw_grid = 1;
-	container->draw_focus = 1;
-	container->cursor_mode = E_CURSOR_SIMPLE;
-	container->length_threshold = -1;
-	container->selection_model = NULL;
-}
-
-E_MAKE_TYPE (e_table_group_container, "ETableGroupContainer", ETableGroupContainer, etgc_class_init, etgc_init, PARENT_TYPE);
-
-void
-e_table_group_apply_to_leafs (ETableGroup *etg, ETableGroupLeafFn fn, void *closure)
-{
-	if (E_IS_TABLE_GROUP_CONTAINER (etg)){
-		ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (etg);
-		GList *list = etgc->children;
-
-		/* Protect from unrefs in the callback functions */
-		gtk_object_ref (GTK_OBJECT (etg));
-
-		for (list = etgc->children; list; list = list->next){
-			ETableGroupContainerChildNode *child_node = list->data;
-
-			e_table_group_apply_to_leafs (child_node->child, fn, closure);
-		}
-
-		gtk_object_unref (GTK_OBJECT (etg));
-	} else if (E_IS_TABLE_GROUP_LEAF (etg)){
-		(*fn) (E_TABLE_GROUP_LEAF (etg)->item, closure);
-	} else {
-		g_error ("Unknown ETableGroup found: %s",
-			 gtk_type_name (GTK_OBJECT (etg)->klass->type));
-	}
-}
-
-
-typedef struct {
-	ETableGroupContainer *etgc;
-	GList *child;
-	EPrintable *child_printable;
-} ETGCPrintContext;
-
-#if 0
-#define CHECK(x) if((x) == -1) return -1;
-
-static gint
-gp_draw_rect (GnomePrintContext *context, gdouble x, gdouble y, gdouble width, gdouble height, gdouble r, gdouble g, gdouble b)
-{
-	CHECK(gnome_print_moveto(context, x, y));
-	CHECK(gnome_print_lineto(context, x + width, y));
-	CHECK(gnome_print_lineto(context, x + width, y - height));
-	CHECK(gnome_print_lineto(context, x, y - height));
-	CHECK(gnome_print_lineto(context, x, y));
-	return gnome_print_fill(context);
-}
-#endif
-
-#define CHECK(x) if((x) == -1) return -1;
-
-static gint
-gp_draw_rect (GnomePrintContext *context, gdouble x, gdouble y, gdouble width, gdouble height)
-{
-	CHECK(gnome_print_moveto(context, x, y));
-	CHECK(gnome_print_lineto(context, x + width, y));
-	CHECK(gnome_print_lineto(context, x + width, y - height));
-	CHECK(gnome_print_lineto(context, x, y - height));
-	CHECK(gnome_print_lineto(context, x, y));
-	return gnome_print_fill(context);
-}
-
-#define TEXT_HEIGHT (12)
-#define TEXT_AREA_HEIGHT (TEXT_HEIGHT + 4)
-
-static void
-e_table_group_container_print_page  (EPrintable *ep,
-				     GnomePrintContext *context,
-				     gdouble width,
-				     gdouble height,
-				     gboolean quantize,
-				     ETGCPrintContext *groupcontext)
-{
-	gdouble yd = height;
-	gdouble child_height;
-	ETableGroupContainerChildNode *child_node;
-	GList *child;
-	EPrintable *child_printable;
-	gchar *string;
-
-	GnomeFont *font = gnome_font_new ("Helvetica", TEXT_HEIGHT);
-
-	child_printable = groupcontext->child_printable;
-	child = groupcontext->child;
-
-	if (child_printable) {
-		if (child)
-			child_node = child->data;
-		else
-			child_node = NULL;
-		gtk_object_ref(GTK_OBJECT(child_printable));
-	} else {
-		if (!child) {
-			return;
-		} else {
-			child_node = child->data;
-			child_printable = e_table_group_get_printable(child_node->child);
-			if (child_printable)
-				gtk_object_ref(GTK_OBJECT(child_printable));
-			e_printable_reset(child_printable);
-		}
-	}
-
-	while (1) {
-		child_height = e_printable_height(child_printable, context, width - 36, yd - TEXT_AREA_HEIGHT, quantize);
-
-		if (gnome_print_gsave(context) == -1)
-			/* FIXME */;
-		if (gnome_print_moveto(context, 0, yd - child_height - TEXT_AREA_HEIGHT) == -1)
-			/* FIXME */;
-		if (gnome_print_lineto(context, 36, yd - child_height - TEXT_AREA_HEIGHT) == -1)
-			/* FIXME */;
-		if (gnome_print_lineto(context, 36, yd - TEXT_AREA_HEIGHT) == -1)
-			/* FIXME */;
-		if (gnome_print_lineto(context, width, yd - TEXT_AREA_HEIGHT) == -1)
-			/* FIXME */;
-		if (gnome_print_lineto(context, width, yd) == -1)
-			/* FIXME */;
-		if (gnome_print_lineto(context, 0, yd) == -1)
-			/* FIXME */;
-		if (gnome_print_lineto(context, 0, yd - child_height - TEXT_AREA_HEIGHT) == -1)
-			/* FIXME */;
-		if (gnome_print_setrgbcolor(context, .7, .7, .7) == -1)
-			/* FIXME */;
-		if (gnome_print_fill(context) == -1)
-			/* FIXME */;
-		if (gnome_print_grestore(context) == -1)
-			/* FIXME */;
-
-		if (gnome_print_gsave(context) == -1)
-			/* FIXME */;
-		if (gnome_print_moveto(context, 0, yd - TEXT_AREA_HEIGHT) == -1)
-			/* FIXME */;
-		if (gnome_print_lineto(context, width, yd - TEXT_AREA_HEIGHT) == -1)
-			/* FIXME */;
-		if (gnome_print_lineto(context, width, yd) == -1)
-			/* FIXME */;
-		if (gnome_print_lineto(context, 0, yd) == -1)
-			/* FIXME */;
-		if (gnome_print_lineto(context, 0, yd - TEXT_AREA_HEIGHT) == -1)
-			/* FIXME */;
-		if (gnome_print_clip(context) == -1)
-			/* FIXME */;
-
-		if (gnome_print_moveto(context, 2, yd - (TEXT_AREA_HEIGHT + gnome_font_get_ascender(font) - gnome_font_get_descender(font)) / 2) == -1)
-			/* FIXME */;
-		if (gnome_print_setfont(context, font))
-			/* FIXME */;
-		if (groupcontext->etgc->ecol->text)
-			string = g_strdup_printf ("%s : %s (%d item%s)",
-						  groupcontext->etgc->ecol->text,
-						  child_node->string,
-						  (gint) child_node->count,
-						  child_node->count == 1 ? "" : "s");
-		else
-			string = g_strdup_printf ("%s (%d item%s)",
-						  child_node->string,
-						  (gint) child_node->count,
-						  child_node->count == 1 ? "" : "s");
-		if (gnome_print_show(context, string))
-			/* FIXME */;
-		g_free(string);
-		if (gnome_print_grestore(context) == -1)
-			/* FIXME */;
-
-		if (gnome_print_gsave(context) == -1)
-			/* FIXME */;
-		if (gnome_print_translate(context, 36, yd - TEXT_AREA_HEIGHT - child_height) == -1)
-			/* FIXME */;
-		if (gnome_print_moveto(context, 0, 0) == -1)
-			/* FIXME */;
-		if (gnome_print_lineto(context, width - 36, 0) == -1)
-			/* FIXME */;
-		if (gnome_print_lineto(context, width - 36, child_height) == -1)
-			/* FIXME */;
-		if (gnome_print_lineto(context, 0, child_height) == -1)
-			/* FIXME */;
-		if (gnome_print_lineto(context, 0, 0) == -1)
-			/* FIXME */;
-		if (gnome_print_clip(context) == -1)
-			/* FIXME */;
-		e_printable_print_page(child_printable, context, width - 36, child_height, quantize);
-		if (gnome_print_grestore(context) == -1)
-			/* FIXME */;
-
-		gp_draw_rect(context, 0, yd - child_height - TEXT_AREA_HEIGHT + 1, width, 1);
-		gp_draw_rect(context, width - 1, yd, 1, yd - child_height - TEXT_AREA_HEIGHT);
-		gp_draw_rect(context, 0, yd, 1, yd - child_height - TEXT_AREA_HEIGHT);
-
-		yd -= child_height + TEXT_AREA_HEIGHT;
-
-		if (e_printable_data_left(child_printable))
-			break;
-
-		child = child->next;
-		if (!child) {
-			child_printable = NULL;
-			break;
-		}
-
-		child_node = child->data;
-		if (child_printable)
-			gtk_object_unref(GTK_OBJECT(child_printable));
-		child_printable = e_table_group_get_printable(child_node->child);
-		if (child_printable)
-			gtk_object_ref(GTK_OBJECT(child_printable));
-		e_printable_reset(child_printable);
-	}
-
-	gp_draw_rect(context, 0, height, width, 1);
-
-	if (groupcontext->child_printable)
-		gtk_object_unref(GTK_OBJECT(groupcontext->child_printable));
-	groupcontext->child_printable = child_printable;
-	groupcontext->child = child;
-			
-}
-
-static gboolean
-e_table_group_container_data_left   (EPrintable *ep,
-				     ETGCPrintContext *groupcontext)
-{
-	gtk_signal_emit_stop_by_name(GTK_OBJECT(ep), "data_left");
-	return groupcontext->child != NULL;
-}
-
-static void
-e_table_group_container_reset       (EPrintable *ep,
-				     ETGCPrintContext *groupcontext)
-{
-	groupcontext->child = groupcontext->etgc->children;
-	if (groupcontext->child_printable)
-		gtk_object_unref(GTK_OBJECT(groupcontext->child_printable));
-	groupcontext->child_printable = NULL;
-}
-
-static gdouble
-e_table_group_container_height      (EPrintable *ep,
-				     GnomePrintContext *context,
-				     gdouble width,
-				     gdouble max_height,
-				     gboolean quantize,
-				     ETGCPrintContext *groupcontext)
-{
-	gdouble height = 0;
-	gdouble child_height;
-	gdouble yd = max_height;
-	ETableGroupContainerChildNode *child_node;
-	GList *child;
-	EPrintable *child_printable;
-
-	child_printable = groupcontext->child_printable;
-	child = groupcontext->child;
-
-	if (child_printable)
-		gtk_object_ref(GTK_OBJECT(child_printable));
-	else {
-		if (!child) {
-			gtk_signal_emit_stop_by_name(GTK_OBJECT(ep), "height");
-			return 0;
-		} else {
-			child_node = child->data;
-			child_printable = e_table_group_get_printable(child_node->child);
-			if (child_printable)
-				gtk_object_ref(GTK_OBJECT(child_printable));
-			e_printable_reset(child_printable);
-		}
-	}
-
-	if (yd != -1 && yd < TEXT_AREA_HEIGHT)
-		return 0;
-	
-	while (1) {
-		child_height = e_printable_height(child_printable, context, width - 36, yd - (yd == -1 ? 0 : TEXT_AREA_HEIGHT), quantize);
-
-		height += child_height + TEXT_AREA_HEIGHT;
-
-		if (yd != -1) {
-			if (!e_printable_will_fit(child_printable, context, width - 36, yd - (yd == -1 ? 0 : TEXT_AREA_HEIGHT), quantize)) {
-				break;
-			}
-
-			yd -= child_height + TEXT_AREA_HEIGHT;
-		}
-
-		child = child->next;
-		if (!child) {
-			break;
-		}
-		
-		child_node = child->data;
-		if (child_printable)
-			gtk_object_unref(GTK_OBJECT(child_printable));
-		child_printable = e_table_group_get_printable(child_node->child);
-		if (child_printable)
-			gtk_object_ref(GTK_OBJECT(child_printable));
-		e_printable_reset(child_printable);
-	}
-	if (child_printable)
-		gtk_object_unref(GTK_OBJECT(child_printable));
-	gtk_signal_emit_stop_by_name(GTK_OBJECT(ep), "height");
-	return height;
-}
-
-static gboolean
-e_table_group_container_will_fit      (EPrintable *ep,
-				       GnomePrintContext *context,
-				       gdouble width,
-				       gdouble max_height,
-				       gboolean quantize,
-				       ETGCPrintContext *groupcontext)
-{
-	gboolean will_fit = TRUE;
-	gdouble child_height;
-	gdouble yd = max_height;
-	ETableGroupContainerChildNode *child_node;
-	GList *child;
-	EPrintable *child_printable;
-
-	child_printable = groupcontext->child_printable;
-	child = groupcontext->child;
-
-	if (child_printable)
-		gtk_object_ref(GTK_OBJECT(child_printable));
-	else {
-		if (!child) {
-			gtk_signal_emit_stop_by_name(GTK_OBJECT(ep), "will_fit");
-			return will_fit;
-		} else {
-			child_node = child->data;
-			child_printable = e_table_group_get_printable(child_node->child);
-			if (child_printable)
-				gtk_object_ref(GTK_OBJECT(child_printable));
-			e_printable_reset(child_printable);
-		}
-	}
-	
-	if (yd != -1 && yd < TEXT_AREA_HEIGHT)
-		will_fit = FALSE;
-	else {
-		while (1) {
-			child_height = e_printable_height(child_printable, context, width - 36, yd - (yd == -1 ? 0 : TEXT_AREA_HEIGHT), quantize);
-			
-			if (yd != -1) {
-				if (!e_printable_will_fit(child_printable, context, width - 36, yd - (yd == -1 ? 0 : TEXT_AREA_HEIGHT), quantize)) {
-					will_fit = FALSE;
-					break;
-				}
-				
-				yd -= child_height + TEXT_AREA_HEIGHT;
-			}
-			
-			child = child->next;
-			if (!child) {
-				break;
-			}
-			
-			child_node = child->data;
-			if (child_printable)
-				gtk_object_unref(GTK_OBJECT(child_printable));
-			child_printable = e_table_group_get_printable(child_node->child);
-			if (child_printable)
-				gtk_object_ref(GTK_OBJECT(child_printable));
-			e_printable_reset(child_printable);
-		}
-	}
-
-	if (child_printable)
-		gtk_object_unref(GTK_OBJECT(child_printable));
-
-	gtk_signal_emit_stop_by_name(GTK_OBJECT(ep), "will_fit");
-	return will_fit;
-}
-
-static void
-e_table_group_container_printable_destroy (GtkObject *object,
-				ETGCPrintContext *groupcontext)
-{
-	gtk_object_unref(GTK_OBJECT(groupcontext->etgc));
-	if (groupcontext->child_printable)
-		gtk_object_ref(GTK_OBJECT(groupcontext->child_printable));
-	g_free(groupcontext);
-}
-
-static EPrintable *
-etgc_get_printable (ETableGroup *etg)
-{
-	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg);
-	EPrintable *printable = e_printable_new();
-	ETGCPrintContext *groupcontext;
-
-	groupcontext = g_new(ETGCPrintContext, 1);
-	groupcontext->etgc = etgc;
-	gtk_object_ref(GTK_OBJECT(etgc));
-	groupcontext->child = etgc->children;
-	groupcontext->child_printable = NULL;
-
-	gtk_signal_connect (GTK_OBJECT(printable),
-			    "print_page",
-			    GTK_SIGNAL_FUNC(e_table_group_container_print_page),
-			    groupcontext);
-	gtk_signal_connect (GTK_OBJECT(printable),
-			    "data_left",
-			    GTK_SIGNAL_FUNC(e_table_group_container_data_left),
-			    groupcontext);
-	gtk_signal_connect (GTK_OBJECT(printable),
-			    "reset",
-			    GTK_SIGNAL_FUNC(e_table_group_container_reset),
-			    groupcontext);
-	gtk_signal_connect (GTK_OBJECT(printable),
-			    "height",
-			    GTK_SIGNAL_FUNC(e_table_group_container_height),
-			    groupcontext);
-	gtk_signal_connect (GTK_OBJECT(printable),
-			    "will_fit",
-			    GTK_SIGNAL_FUNC(e_table_group_container_will_fit),
-			    groupcontext);
-	gtk_signal_connect (GTK_OBJECT(printable),
-			    "destroy",
-			    GTK_SIGNAL_FUNC(e_table_group_container_printable_destroy),
-			    groupcontext);
-
-	return printable;
-}
diff --git a/widgets/table/e-table-group-container.h b/widgets/table/e-table-group-container.h
deleted file mode 100644
index d7e314d517..0000000000
--- a/widgets/table/e-table-group-container.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_GROUP_CONTAINER_H_
-#define _E_TABLE_GROUP_CONTAINER_H_
-
-#include <libgnomeui/gnome-canvas.h>
-#include <gal/e-table/e-table-model.h>
-#include <gal/e-table/e-table-header.h>
-#include <gal/e-table/e-table-group.h>
-#include <gal/e-table/e-table-item.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TABLE_GROUP_CONTAINER_TYPE        (e_table_group_container_get_type ())
-#define E_TABLE_GROUP_CONTAINER(o)          (GTK_CHECK_CAST ((o), E_TABLE_GROUP_CONTAINER_TYPE, ETableGroupContainer))
-#define E_TABLE_GROUP_CONTAINER_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_GROUP_CONTAINER_TYPE, ETableGroupContainerClass))
-#define E_IS_TABLE_GROUP_CONTAINER(o)       (GTK_CHECK_TYPE ((o), E_TABLE_GROUP_CONTAINER_TYPE))
-#define E_IS_TABLE_GROUP_CONTAINER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_GROUP_CONTAINER_TYPE))
-
-typedef struct {
-	ETableGroup group;
-
-	/*
-	 * The ETableCol used to group this set
-	 */
-	ETableCol    *ecol;
-	gint          ascending;
-
-	/*
-	 * List of ETableGroups we stack
-	 */
-	GList *children;
-
-	/*
-	 * The canvas rectangle that contains the children
-	 */
-	GnomeCanvasItem *rect;
-
-	GdkFont *font;
-
-	gdouble width, height, minimum_width;
-
-	ETableSortInfo *sort_info;
-	int n;
-	int length_threshold;
-
-	ESelectionModel *selection_model;
-
-	guint alternating_row_colors : 1;
-	guint horizontal_draw_grid : 1;
-	guint vertical_draw_grid : 1;
-	guint draw_focus : 1;
-	ECursorMode cursor_mode;
-
-	/*
-	 * State: the ETableGroup is open or closed
-	 */
-	guint open:1;
-} ETableGroupContainer;
-
-typedef struct {
-	ETableGroupClass parent_class;
-} ETableGroupContainerClass;
-
-ETableGroup *e_table_group_container_new       (GnomeCanvasGroup *parent, ETableHeader *full_header, ETableHeader     *header,
-						ETableModel *model, ETableSortInfo *sort_info, int n);
-void         e_table_group_container_construct (GnomeCanvasGroup *parent, ETableGroupContainer *etgc,
-						ETableHeader *full_header,
-						ETableHeader     *header,
-						ETableModel *model, ETableSortInfo *sort_info, int n);
-
-GtkType      e_table_group_container_get_type  (void);
-
-END_GNOME_DECLS
-
-#endif /* _E_TABLE_GROUP_CONTAINER_H_ */
diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c
deleted file mode 100644
index d527991a41..0000000000
--- a/widgets/table/e-table-group-leaf.c
+++ /dev/null
@@ -1,499 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-Table-Group.c: Implements the grouping objects for elements on a table
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org ()
- *
- * Copyright 1999, Ximian, Inc.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include "e-table-group-leaf.h"
-#include "e-table-item.h"
-#include "e-table-sorted-variable.h"
-#include "e-table-sorted.h"
-#include "gal/util/e-util.h"
-#include "gal/widgets/e-canvas.h"
-
-#define PARENT_TYPE e_table_group_get_type ()
-
-static GnomeCanvasGroupClass *etgl_parent_class;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_HEIGHT,
-	ARG_WIDTH,
-	ARG_MINIMUM_WIDTH,
-	ARG_FROZEN,
-	ARG_TABLE_ALTERNATING_ROW_COLORS,
-	ARG_TABLE_HORIZONTAL_DRAW_GRID,
-	ARG_TABLE_VERTICAL_DRAW_GRID,
-	ARG_TABLE_DRAW_FOCUS,
-	ARG_CURSOR_MODE,
-	ARG_LENGTH_THRESHOLD,
-	ARG_SELECTION_MODEL,
-};
-
-static void etgl_set_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void etgl_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-
-static void
-etgl_destroy (GtkObject *object)
-{
-	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF(object);
-	if (etgl->ets)
-		gtk_object_unref (GTK_OBJECT(etgl->ets));
-	if (etgl->item)
-		gtk_object_destroy (GTK_OBJECT(etgl->item));
-	if (etgl->selection_model)
-		gtk_object_unref (GTK_OBJECT(etgl->selection_model));
-	if (GTK_OBJECT_CLASS (etgl_parent_class)->destroy)
-		GTK_OBJECT_CLASS (etgl_parent_class)->destroy (object);
-}
-
-static void
-e_table_group_leaf_construct (GnomeCanvasGroup *parent,
-			      ETableGroupLeaf  *etgl,
-			      ETableHeader     *full_header,
-			      ETableHeader     *header,
-			      ETableModel      *model,
-			      ETableSortInfo   *sort_info)
-{
-	etgl->is_grouped = e_table_sort_info_grouping_get_count(sort_info);
-	if (etgl->is_grouped)
-		etgl->ets = E_TABLE_SUBSET(e_table_sorted_variable_new (model, full_header, sort_info));
-	else
-		etgl->ets = E_TABLE_SUBSET(e_table_sorted_new (model, full_header, sort_info));
-	gtk_object_ref(GTK_OBJECT(etgl->ets));
-	gtk_object_sink(GTK_OBJECT(etgl->ets));
-	e_table_group_construct (parent, E_TABLE_GROUP (etgl), full_header, header, model);
-}
-
-/** 
- * e_table_group_leaf_new
- * @parent: The %GnomeCanvasGroup to create a child of.
- * @full_header: The full header of the %ETable.
- * @header: The current header of the %ETable.
- * @model: The %ETableModel of the %ETable.
- * @sort_info: The %ETableSortInfo of the %ETable.
- *
- * %ETableGroupLeaf is an %ETableGroup which simply contains an
- * %ETableItem.
- *
- * Returns: The new %ETableGroupLeaf.
- */
-ETableGroup *
-e_table_group_leaf_new       (GnomeCanvasGroup *parent,
-			      ETableHeader     *full_header,
-			      ETableHeader     *header,
-			      ETableModel      *model,
-			      ETableSortInfo   *sort_info)
-{
-	ETableGroupLeaf *etgl;
-
-	g_return_val_if_fail (parent != NULL, NULL);
-	
-	etgl = gtk_type_new (e_table_group_leaf_get_type ());
-
-	e_table_group_leaf_construct (parent, etgl, full_header,
-				      header, model, sort_info);
-	return E_TABLE_GROUP (etgl);
-}
-
-static void
-etgl_cursor_change (GtkObject *object, gint row, ETableGroupLeaf *etgl)
-{
-	if (row < E_TABLE_SUBSET(etgl->ets)->n_map)
-		e_table_group_cursor_change (E_TABLE_GROUP(etgl), E_TABLE_SUBSET(etgl->ets)->map_table[row]);
-}
-
-static void
-etgl_cursor_activated (GtkObject *object, gint row, ETableGroupLeaf *etgl)
-{
-	if (row < E_TABLE_SUBSET(etgl->ets)->n_map)
-		e_table_group_cursor_activated (E_TABLE_GROUP(etgl), E_TABLE_SUBSET(etgl->ets)->map_table[row]);
-}
-
-static void
-etgl_double_click (GtkObject *object, gint row, gint col, GdkEvent *event, ETableGroupLeaf *etgl)
-{
-	e_table_group_double_click (E_TABLE_GROUP(etgl), row, col, event);
-}
-
-static gint
-etgl_key_press (GtkObject *object, gint row, gint col, GdkEvent *event, ETableGroupLeaf *etgl)
-{
-	if (row < E_TABLE_SUBSET(etgl->ets)->n_map)
-		return e_table_group_key_press (E_TABLE_GROUP(etgl), E_TABLE_SUBSET(etgl->ets)->map_table[row], col, event);
-	else
-		return 0;
-}
-
-static gint
-etgl_right_click (GtkObject *object, gint row, gint col, GdkEvent *event, ETableGroupLeaf *etgl)
-{
-	if (row < E_TABLE_SUBSET(etgl->ets)->n_map)
-		return e_table_group_right_click (E_TABLE_GROUP(etgl), E_TABLE_SUBSET(etgl->ets)->map_table[row], col, event);
-	else
-		return 0;
-}
-
-static gint
-etgl_click (GtkObject *object, gint row, gint col, GdkEvent *event, ETableGroupLeaf *etgl)
-{
-	if (row < E_TABLE_SUBSET(etgl->ets)->n_map)
-		return e_table_group_click (E_TABLE_GROUP(etgl), E_TABLE_SUBSET(etgl->ets)->map_table[row], col, event);
-	else
-		return 0;
-}
-
-static void
-etgl_reflow (GnomeCanvasItem *item, gint flags)
-{
-	ETableGroupLeaf *leaf = E_TABLE_GROUP_LEAF(item);
-	gtk_object_get(GTK_OBJECT(leaf->item),
-		       "height", &leaf->height,
-		       NULL);
-	gtk_object_get(GTK_OBJECT(leaf->item),
-		       "width", &leaf->width,
-		       NULL);
-	e_canvas_item_request_parent_reflow (item);
-}
-
-static void
-etgl_realize (GnomeCanvasItem *item)
-{
-	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF(item);
-
-	if (GNOME_CANVAS_ITEM_CLASS (etgl_parent_class)->realize)
-		GNOME_CANVAS_ITEM_CLASS (etgl_parent_class)->realize (item);
-
-	etgl->item = E_TABLE_ITEM(gnome_canvas_item_new (GNOME_CANVAS_GROUP(etgl),
-							 e_table_item_get_type (),
-							 "ETableHeader", E_TABLE_GROUP(etgl)->header,
-							 "ETableModel", etgl->ets,
-							 "alternating_row_colors", etgl->alternating_row_colors,
-							 "horizontal_draw_grid", etgl->horizontal_draw_grid,
-							 "vertical_draw_grid", etgl->vertical_draw_grid,
-							 "drawfocus", etgl->draw_focus,
-							 "cursor_mode", etgl->cursor_mode,
-							 "minimum_width", etgl->minimum_width,
-							 "length_threshold", etgl->length_threshold,
-							 "selection_model", etgl->selection_model,
-							 NULL));
-	
-	gtk_signal_connect (GTK_OBJECT(etgl->item), "cursor_change",
-			    GTK_SIGNAL_FUNC(etgl_cursor_change), etgl);
-	gtk_signal_connect (GTK_OBJECT(etgl->item), "cursor_activated",
-			    GTK_SIGNAL_FUNC(etgl_cursor_activated), etgl);
-	gtk_signal_connect (GTK_OBJECT(etgl->item), "double_click",
-			    GTK_SIGNAL_FUNC(etgl_double_click), etgl);
-	gtk_signal_connect (GTK_OBJECT(etgl->item), "right_click",
-			    GTK_SIGNAL_FUNC(etgl_right_click), etgl);
-	gtk_signal_connect (GTK_OBJECT(etgl->item), "click",
-			    GTK_SIGNAL_FUNC(etgl_click), etgl);
-	gtk_signal_connect (GTK_OBJECT(etgl->item), "key_press",
-			    GTK_SIGNAL_FUNC(etgl_key_press), etgl);
-	e_canvas_item_request_reflow(item);
-}
-
-static void
-etgl_add (ETableGroup *etg, gint row)
-{
-	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
-	if (E_IS_TABLE_SUBSET_VARIABLE(etgl->ets)) {
-		e_table_subset_variable_add (E_TABLE_SUBSET_VARIABLE(etgl->ets), row);
-	}
-}
-
-static void
-etgl_add_array (ETableGroup *etg, const gint *array, gint count)
-{
-	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
-	if (E_IS_TABLE_SUBSET_VARIABLE(etgl->ets)) {
-		e_table_subset_variable_add_array (E_TABLE_SUBSET_VARIABLE(etgl->ets), array, count);
-	}
-}
-
-static void
-etgl_add_all (ETableGroup *etg)
-{
-	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
-	if (E_IS_TABLE_SUBSET_VARIABLE(etgl->ets)) {
-		e_table_subset_variable_add_all (E_TABLE_SUBSET_VARIABLE(etgl->ets));
-	}
-}
-
-static gboolean
-etgl_remove (ETableGroup *etg, gint row)
-{
-	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
-	if (E_IS_TABLE_SUBSET_VARIABLE(etgl->ets)) {
-		return e_table_subset_variable_remove (E_TABLE_SUBSET_VARIABLE(etgl->ets), row);
-	}
-	return FALSE;
-}
-
-static void
-etgl_increment (ETableGroup *etg, gint position, gint amount)
-{
-	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
-	if (E_IS_TABLE_SUBSET_VARIABLE(etgl->ets)) {
-		e_table_subset_variable_increment (E_TABLE_SUBSET_VARIABLE(etgl->ets), position, amount);
-	}
-}
-
-static void
-etgl_decrement (ETableGroup *etg, gint position, gint amount)
-{
-	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
-	if (E_IS_TABLE_SUBSET_VARIABLE(etgl->ets)) {
-		e_table_subset_variable_decrement (E_TABLE_SUBSET_VARIABLE(etgl->ets), position, amount);
-	}
-}
-
-static int
-etgl_row_count (ETableGroup *etg)
-{
-	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
-	return e_table_model_row_count(E_TABLE_MODEL(etgl->ets));
-}
-
-static void
-etgl_set_focus (ETableGroup *etg, EFocus direction, gint view_col)
-{
-	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
-	if (direction == E_FOCUS_END) {
-		e_table_item_set_cursor (etgl->item, view_col, e_table_model_row_count(E_TABLE_MODEL(etgl->ets)) - 1);
-	} else {
-		e_table_item_set_cursor (etgl->item, view_col, 0);
-	}
-}
-
-static gint
-etgl_get_focus_column (ETableGroup *etg)
-{
-	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
-	return e_table_item_get_focused_column (etgl->item);
-}
-
-static EPrintable *
-etgl_get_printable (ETableGroup *etg)
-{
-	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
-	return e_table_item_get_printable (etgl->item);
-}
-
-static void
-etgl_compute_location (ETableGroup *etg, int *x, int *y, int *row, int *col)
-{
-	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
-	e_table_item_compute_location (etgl->item, x, y, row, col);
-}
-
-static void
-etgl_get_cell_geometry (ETableGroup *etg, int *row, int *col, int *x, int *y, int *width, int *height)
-{
-	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
-	e_table_item_get_cell_geometry (etgl->item, row, col, x, y, width, height);
-}
-
-static void
-etgl_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ETableGroup *etg = E_TABLE_GROUP (object);
-	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (object);
-
-	switch (arg_id) {
-	case ARG_FROZEN:
-		if (GTK_VALUE_BOOL (*arg))
-			etg->frozen = TRUE;
-		else {
-			etg->frozen = FALSE;
-		}
-		break;
-	case ARG_MINIMUM_WIDTH:
-	case ARG_WIDTH:
-		etgl->minimum_width = GTK_VALUE_DOUBLE(*arg);
-		if (etgl->item) {
-			gnome_canvas_item_set (GNOME_CANVAS_ITEM(etgl->item),
-					       "minimum_width", etgl->minimum_width,
-					       NULL);
-		}
-		break;
-	case ARG_LENGTH_THRESHOLD:
-		etgl->length_threshold = GTK_VALUE_INT (*arg);
-		if (etgl->item) {
-			gnome_canvas_item_set (GNOME_CANVAS_ITEM(etgl->item),
-					       "length_threshold", GTK_VALUE_INT (*arg),
-					       NULL);
-		}
-		break;
-	case ARG_SELECTION_MODEL:
-		if (etgl->selection_model)
-			gtk_object_unref(GTK_OBJECT(etgl->selection_model));
-		etgl->selection_model = E_SELECTION_MODEL(GTK_VALUE_OBJECT (*arg));
-		if (etgl->selection_model)
-			gtk_object_ref(GTK_OBJECT(etgl->selection_model));
-		if (etgl->item) {
-			gnome_canvas_item_set (GNOME_CANVAS_ITEM(etgl->item),
-					       "selection_model", etgl->selection_model,
-					       NULL);
-		}
-		break;
-
-	case ARG_TABLE_ALTERNATING_ROW_COLORS:
-		etgl->alternating_row_colors = GTK_VALUE_BOOL (*arg);
-		if (etgl->item) {
-			gnome_canvas_item_set (GNOME_CANVAS_ITEM(etgl->item),
-					       "alternating_row_colors", GTK_VALUE_BOOL (*arg),
-					       NULL);
-		}
-		break;
-
-	case ARG_TABLE_HORIZONTAL_DRAW_GRID:
-		etgl->horizontal_draw_grid = GTK_VALUE_BOOL (*arg);
-		if (etgl->item) {
-			gnome_canvas_item_set (GNOME_CANVAS_ITEM(etgl->item),
-					       "horizontal_draw_grid", GTK_VALUE_BOOL (*arg),
-					       NULL);
-		}
-		break;
-
-	case ARG_TABLE_VERTICAL_DRAW_GRID:
-		etgl->vertical_draw_grid = GTK_VALUE_BOOL (*arg);
-		if (etgl->item) {
-			gnome_canvas_item_set (GNOME_CANVAS_ITEM(etgl->item),
-					       "vertical_draw_grid", GTK_VALUE_BOOL (*arg),
-					       NULL);
-		}
-		break;
-
-	case ARG_TABLE_DRAW_FOCUS:
-		etgl->draw_focus = GTK_VALUE_BOOL (*arg);
-		if (etgl->item) {
-			gnome_canvas_item_set (GNOME_CANVAS_ITEM(etgl->item),
-					"drawfocus", GTK_VALUE_BOOL (*arg),
-					NULL);
-		}
-		break;
-
-	case ARG_CURSOR_MODE:
-		etgl->cursor_mode = GTK_VALUE_INT (*arg);
-		if (etgl->item) {
-			gnome_canvas_item_set (GNOME_CANVAS_ITEM(etgl->item),
-					"cursor_mode", GTK_VALUE_INT (*arg),
-					NULL);
-		}
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-etgl_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ETableGroup *etg = E_TABLE_GROUP (object);
-	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (object);
-
-	switch (arg_id) {
-	case ARG_FROZEN:
-		GTK_VALUE_BOOL (*arg) = etg->frozen;
-		break;
-	case ARG_HEIGHT:
-		GTK_VALUE_DOUBLE (*arg) = etgl->height;
-		break;
-	case ARG_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = etgl->width;
-		break;
-	case ARG_MINIMUM_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = etgl->minimum_width;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-etgl_class_init (GtkObjectClass *object_class)
-{
-	GnomeCanvasItemClass *item_class = (GnomeCanvasItemClass *) object_class;
-	ETableGroupClass *e_group_class = E_TABLE_GROUP_CLASS(object_class);
-
-	object_class->destroy = etgl_destroy;
-	object_class->set_arg = etgl_set_arg;
-	object_class->get_arg = etgl_get_arg;
-
-	item_class->realize = etgl_realize;
-	
-	etgl_parent_class = gtk_type_class (PARENT_TYPE);
-
-	e_group_class->add = etgl_add;
-	e_group_class->add_array = etgl_add_array;
-	e_group_class->add_all = etgl_add_all;
-	e_group_class->remove = etgl_remove;
-	e_group_class->increment  = etgl_increment;
-	e_group_class->decrement  = etgl_decrement;
-	e_group_class->row_count  = etgl_row_count;
-	e_group_class->set_focus  = etgl_set_focus;
-	e_group_class->get_focus_column = etgl_get_focus_column;
-	e_group_class->get_printable = etgl_get_printable;
-	e_group_class->compute_location = etgl_compute_location;
-	e_group_class->get_cell_geometry = etgl_get_cell_geometry;
-
-	gtk_object_add_arg_type ("ETableGroupLeaf::alternating_row_colors", GTK_TYPE_BOOL,
-				 GTK_ARG_WRITABLE, ARG_TABLE_ALTERNATING_ROW_COLORS);
-	gtk_object_add_arg_type ("ETableGroupLeaf::horizontal_draw_grid", GTK_TYPE_BOOL,
-				 GTK_ARG_WRITABLE, ARG_TABLE_HORIZONTAL_DRAW_GRID);
-	gtk_object_add_arg_type ("ETableGroupLeaf::vertical_draw_grid", GTK_TYPE_BOOL,
-				 GTK_ARG_WRITABLE, ARG_TABLE_VERTICAL_DRAW_GRID);
-	gtk_object_add_arg_type ("ETableGroupLeaf::drawfocus", GTK_TYPE_BOOL,
-				 GTK_ARG_WRITABLE, ARG_TABLE_DRAW_FOCUS);
-	gtk_object_add_arg_type ("ETableGroupLeaf::cursor_mode", GTK_TYPE_INT,
-				 GTK_ARG_WRITABLE, ARG_CURSOR_MODE);
-	gtk_object_add_arg_type ("ETableGroupLeaf::length_threshold", GTK_TYPE_INT,
-				 GTK_ARG_WRITABLE, ARG_LENGTH_THRESHOLD);
-	gtk_object_add_arg_type ("ETableGroupLeaf::selection_model", E_SELECTION_MODEL_TYPE,
-				 GTK_ARG_WRITABLE, ARG_SELECTION_MODEL);
-
-	gtk_object_add_arg_type ("ETableGroupLeaf::height", GTK_TYPE_DOUBLE, 
-				 GTK_ARG_READABLE, ARG_HEIGHT);
-	gtk_object_add_arg_type ("ETableGroupLeaf::width", GTK_TYPE_DOUBLE, 
-				 GTK_ARG_READWRITE, ARG_WIDTH);
-	gtk_object_add_arg_type ("ETableGroupLeaf::minimum_width", GTK_TYPE_DOUBLE,
-				 GTK_ARG_READWRITE, ARG_MINIMUM_WIDTH);
-	gtk_object_add_arg_type ("ETableGroupLeaf::frozen", GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE, ARG_FROZEN);
-}
-
-static void
-etgl_init (GtkObject *object)
-{
-	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (object);
-
-	etgl->width = 1;
-	etgl->height = 1;
-	etgl->minimum_width = 0;
-
-	etgl->ets = NULL;
-	etgl->item = NULL;
-	
-	etgl->alternating_row_colors = 1;
-	etgl->horizontal_draw_grid = 1;
-	etgl->vertical_draw_grid = 1;
-	etgl->draw_focus = 1;
-	etgl->cursor_mode = E_CURSOR_SIMPLE;
-	etgl->length_threshold = -1;
-
-	etgl->selection_model = NULL;
-
-	e_canvas_item_set_reflow_callback (GNOME_CANVAS_ITEM(object), etgl_reflow);
-}
-
-E_MAKE_TYPE (e_table_group_leaf, "ETableGroupLeaf", ETableGroupLeaf, etgl_class_init, etgl_init, PARENT_TYPE);
diff --git a/widgets/table/e-table-group-leaf.h b/widgets/table/e-table-group-leaf.h
deleted file mode 100644
index de6a63013b..0000000000
--- a/widgets/table/e-table-group-leaf.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_GROUP_LEAF_H_
-#define _E_TABLE_GROUP_LEAF_H_
-
-#include <libgnomeui/gnome-canvas.h>
-#include <gal/e-table/e-table-group.h>
-#include <gal/e-table/e-table-subset.h>
-#include <gal/e-table/e-table-item.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TABLE_GROUP_LEAF_TYPE        (e_table_group_leaf_get_type ())
-#define E_TABLE_GROUP_LEAF(o)          (GTK_CHECK_CAST ((o), E_TABLE_GROUP_LEAF_TYPE, ETableGroupLeaf))
-#define E_TABLE_GROUP_LEAF_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_GROUP_LEAF_TYPE, ETableGroupLeafClass))
-#define E_IS_TABLE_GROUP_LEAF(o)       (GTK_CHECK_TYPE ((o), E_TABLE_GROUP_LEAF_TYPE))
-#define E_IS_TABLE_GROUP_LEAF_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_GROUP_LEAF_TYPE))
-
-typedef struct {
-	ETableGroup group;
-
-	/* 
-	 * Item.
-	 */
-	ETableItem *item;
-
-	gdouble height;
-	gdouble width;
-	gdouble minimum_width;
-
-	int length_threshold;
-
-	ETableSubset *ets;
-	guint is_grouped : 1;
-
-	guint alternating_row_colors : 1;
-	guint horizontal_draw_grid : 1;
-	guint vertical_draw_grid : 1;
-	guint draw_focus : 1;
-	ECursorMode cursor_mode;
-
-	ESelectionModel *selection_model;
-} ETableGroupLeaf;
-
-typedef struct {
-	ETableGroupClass parent_class;
-} ETableGroupLeafClass;
-
-ETableGroup *e_table_group_leaf_new       (GnomeCanvasGroup *parent,
-					   ETableHeader *full_header,
-					   ETableHeader     *header,
-					   ETableModel *model,
-					   ETableSortInfo *sort_info);
-GtkType      e_table_group_leaf_get_type  (void);
-
-
-END_GNOME_DECLS
-
-#endif /* _E_TABLE_GROUP_LEAF_H_ */
-
diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c
deleted file mode 100644
index c31be579d4..0000000000
--- a/widgets/table/e-table-group.c
+++ /dev/null
@@ -1,656 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-Table-Group.c: Implements the grouping objects for elements on a table
- *
- * Author:
- *   Miguel de Icaza (miguel@ximian.com)
- *   Chris Lahey (clahey@ximian.com)
- *
- * Copyright 1999, 2000 Ximian, Inc.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include "e-table-group.h"
-#include "e-table-group-container.h"
-#include "e-table-group-leaf.h"
-#include "e-table-item.h"
-#include "gal/util/e-util.h"
-
-#define PARENT_TYPE gnome_canvas_group_get_type ()
-
-#define ETG_CLASS(e) (E_TABLE_GROUP_CLASS(GTK_OBJECT(e)->klass))
-
-static GnomeCanvasGroupClass *etg_parent_class;
-
-enum {
-	CURSOR_CHANGE,
-	CURSOR_ACTIVATED,
-	DOUBLE_CLICK,
-	RIGHT_CLICK,
-	CLICK,
-	KEY_PRESS,
-	LAST_SIGNAL
-};
-
-static gint etg_signals [LAST_SIGNAL] = { 0, };
-
-static gboolean etg_get_focus (ETableGroup      *etg);
-static void etg_destroy (GtkObject *object);
-
-static void
-etg_destroy (GtkObject *object)
-{
-	ETableGroup *etg = E_TABLE_GROUP(object);
-	if (etg->header)
-		gtk_object_unref (GTK_OBJECT(etg->header));
-	if (etg->full_header)
-		gtk_object_unref (GTK_OBJECT(etg->full_header));
-	if (etg->model)
-		gtk_object_unref (GTK_OBJECT(etg->model));
-	if (GTK_OBJECT_CLASS (etg_parent_class)->destroy)
-		GTK_OBJECT_CLASS (etg_parent_class)->destroy (object);
-}
-
-/** 
- * e_table_group_new
- * @parent: The %GnomeCanvasGroup to create a child of.
- * @full_header: The full header of the %ETable.
- * @header: The current header of the %ETable.
- * @model: The %ETableModel of the %ETable.
- * @sort_info: The %ETableSortInfo of the %ETable.
- * @n: The grouping information object to group by.
- *
- * %ETableGroup is a collection of rows of an %ETable.  It's a
- * %GnomeCanvasItem.  There are two different forms.  If n < the
- * number of groupings in the given %ETableSortInfo, then the
- * %ETableGroup will need to contain other %ETableGroups, thus it
- * creates an %ETableGroupContainer.  Otherwise, it will just contain
- * an %ETableItem, and thus it creates an %ETableGroupLeaf.
- *
- * Returns: The new %ETableGroup.
- */
-ETableGroup *
-e_table_group_new (GnomeCanvasGroup *parent,
-		   ETableHeader     *full_header,
-		   ETableHeader     *header,
-		   ETableModel      *model,
-		   ETableSortInfo   *sort_info,
-		   int               n)
-{
-	g_return_val_if_fail (model != NULL, NULL);
-	
-	if (n < e_table_sort_info_grouping_get_count(sort_info)) {
-		return e_table_group_container_new (parent, full_header, header, model, sort_info, n);
-	} else {
-		return e_table_group_leaf_new (parent, full_header, header, model, sort_info);
-	}
-	return NULL;
-}
-
-/** 
- * e_table_group_construct
- * @parent: The %GnomeCanvasGroup to create a child of.
- * @etg: The %ETableGroup to construct.
- * @full_header: The full header of the %ETable.
- * @header: The current header of the %ETable.
- * @model: The %ETableModel of the %ETable.
- *
- * This routine does the base construction of the %ETableGroup.
- */
-void
-e_table_group_construct (GnomeCanvasGroup *parent,
-			 ETableGroup      *etg,
-			 ETableHeader     *full_header,
-			 ETableHeader     *header,
-			 ETableModel      *model)
-{
-	etg->full_header = full_header;
-	gtk_object_ref (GTK_OBJECT(etg->full_header));
-	etg->header = header;
-	gtk_object_ref (GTK_OBJECT(etg->header));
-	etg->model = model;
-	gtk_object_ref (GTK_OBJECT(etg->model));
-	gnome_canvas_item_constructv (GNOME_CANVAS_ITEM (etg), parent, 0, NULL);
-}
-
-/** 
- * e_table_group_add
- * @etg: The %ETableGroup to add a row to
- * @row: The row to add.
- *
- * This routine adds the given row from the %ETableModel to this set
- * of rows.
- */
-void
-e_table_group_add (ETableGroup *etg,
-		   gint row)
-{
-	g_return_if_fail (etg != NULL);
-	g_return_if_fail (E_IS_TABLE_GROUP (etg));
-
-	if (ETG_CLASS (etg)->add)
-		ETG_CLASS (etg)->add (etg, row);
-}
-
-/** 
- * e_table_group_add_array
- * @etg: The %ETableGroup to add to
- * @array: The array to add.
- * @count: The number of times to add
- *
- * This routine adds all the rows in the array to this set of rows.
- * It assumes that the array is already sorted properly.
- */
-void
-e_table_group_add_array (ETableGroup *etg,
-			 const int *array,
-			 int count)
-{
-	g_return_if_fail (etg != NULL);
-	g_return_if_fail (E_IS_TABLE_GROUP (etg));
-
-	if (ETG_CLASS (etg)->add_array)
-		ETG_CLASS (etg)->add_array (etg, array, count);
-}
-
-/** 
- * e_table_group_add_all
- * @etg: The %ETableGroup to add to
- *
- * This routine adds all the rows from the %ETableModel to this set
- * of rows.
- */
-void
-e_table_group_add_all (ETableGroup *etg)
-{
-	g_return_if_fail (etg != NULL);
-	g_return_if_fail (E_IS_TABLE_GROUP (etg));
-
-	if (ETG_CLASS (etg)->add_all)
-		ETG_CLASS (etg)->add_all (etg);
-}
-
-/** 
- * e_table_group_remove
- * @etg: The %ETableGroup to remove a row from
- * @row: The row to remove.
- *
- * This routine removes the given row from the %ETableModel from this
- * set of rows.
- *
- * Returns: TRUE if the row was deleted and FALSE if the row was not
- * found.
- */
-gboolean
-e_table_group_remove (ETableGroup *etg,
-		      gint row)
-{
-	g_return_val_if_fail (etg != NULL, FALSE);
-	g_return_val_if_fail (E_IS_TABLE_GROUP (etg), FALSE);
-
-	if (ETG_CLASS (etg)->remove)
-		return ETG_CLASS (etg)->remove (etg, row);
-	else
-		return FALSE;
-}
-
-/** 
- * e_table_group_increment
- * @etg: The %ETableGroup to increment
- * @position: The position to increment from
- * @amount: The amount to increment.
- *
- * This routine adds amount to all rows greater than or equal to
- * position.  This is to handle when a row gets inserted into the
- * model.
- */
-void
-e_table_group_increment (ETableGroup *etg,
-			 gint position,
-			 gint amount)
-{
-	g_return_if_fail (etg != NULL);
-	g_return_if_fail (E_IS_TABLE_GROUP (etg));
-
-	if (ETG_CLASS (etg)->increment)
-		ETG_CLASS (etg)->increment (etg, position, amount);
-}
-
-/** 
- * e_table_group_increment
- * @etg: The %ETableGroup to decrement
- * @position: The position to decrement from
- * @amount: The amount to decrement
- *
- * This routine removes amount from all rows greater than or equal to
- * position.  This is to handle when a row gets deleted from the
- * model.
- */
-void
-e_table_group_decrement (ETableGroup *etg,
-			 gint position,
-			 gint amount)
-{
-	g_return_if_fail (etg != NULL);
-	g_return_if_fail (E_IS_TABLE_GROUP (etg));
-
-	if (ETG_CLASS (etg)->decrement)
-		ETG_CLASS (etg)->decrement (etg, position, amount);
-}
-
-/** 
- * e_table_group_increment
- * @etg: The %ETableGroup to count
- *
- * This routine calculates the number of rows shown in this group.
- *
- * Returns: The number of rows.
- */
-gint
-e_table_group_row_count (ETableGroup *etg)
-{
-	g_return_val_if_fail (etg != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_GROUP (etg), 0);
-
-	if (ETG_CLASS (etg)->row_count)
-		return ETG_CLASS (etg)->row_count (etg);
-	else
-		return 0;
-}
-
-/** 
- * e_table_group_set_focus
- * @etg: The %ETableGroup to set
- * @direction: The direction the focus is coming from.
- * @view_col: The column to set the focus in.
- *
- * Sets the focus to this widget.  Places the focus in the view column
- * coming from direction direction.
- */
-void
-e_table_group_set_focus (ETableGroup *etg,
-			 EFocus direction,
-			 gint view_col)
-{
-	g_return_if_fail (etg != NULL);
-	g_return_if_fail (E_IS_TABLE_GROUP (etg));
-
-	if (ETG_CLASS (etg)->set_focus)
-		ETG_CLASS (etg)->set_focus (etg, direction, view_col);
-}
-
-/** 
- * e_table_group_get_focus
- * @etg: The %ETableGroup to check
- *
- * Calculates if this group has the focus.
- *
- * Returns: TRUE if this group has the focus.
- */
-gboolean
-e_table_group_get_focus (ETableGroup *etg)
-{
-	g_return_val_if_fail (etg != NULL, FALSE);
-	g_return_val_if_fail (E_IS_TABLE_GROUP (etg), FALSE);
-
-	if (ETG_CLASS (etg)->get_focus)
-		return ETG_CLASS (etg)->get_focus (etg);
-	else
-		return FALSE;
-}
-
-/** 
- * e_table_group_get_focus_column
- * @etg: The %ETableGroup to check
- *
- * Calculates which column in this group has the focus.
- *
- * Returns: The column index (view column).
- */
-gint
-e_table_group_get_focus_column (ETableGroup *etg)
-{
-	g_return_val_if_fail (etg != NULL, FALSE);
-	g_return_val_if_fail (E_IS_TABLE_GROUP (etg), FALSE);
-
-	if (ETG_CLASS (etg)->get_focus_column)
-		return ETG_CLASS (etg)->get_focus_column (etg);
-	else
-		return -1;
-}
-
-/** 
- * e_table_group_get_printable
- * @etg: %ETableGroup which will be printed
- *
- * This routine creates and returns an %EPrintable that can be used to
- * print the given %ETableGroup.
- *
- * Returns: The %EPrintable.
- */
-EPrintable *
-e_table_group_get_printable (ETableGroup *etg)
-{
-	g_return_val_if_fail (etg != NULL, NULL);
-	g_return_val_if_fail (E_IS_TABLE_GROUP (etg), NULL);
-
-	if (ETG_CLASS (etg)->get_printable)
-		return ETG_CLASS (etg)->get_printable (etg);
-	else
-		return NULL;
-}
-
-/** 
- * e_table_group_compute_location
- * @eti: %ETableGroup to look in.
- * @x: A pointer to the x location to find in the %ETableGroup.
- * @y: A pointer to the y location to find in the %ETableGroup.
- * @row: A pointer to the location to store the found row in.
- * @col: A pointer to the location to store the found col in.
- *
- * This routine locates the pixel location (*x, *y) in the
- * %ETableGroup.  If that location is in the %ETableGroup, *row and
- * *col are set to the view row and column where it was found.  If
- * that location is not in the %ETableGroup, the height of the
- * %ETableGroup is removed from the value y points to.
- */
-void
-e_table_group_compute_location (ETableGroup *etg, int *x, int *y, int *row, int *col)
-{
-	g_return_if_fail (etg != NULL);
-	g_return_if_fail (E_IS_TABLE_GROUP (etg));
-
-	if (ETG_CLASS (etg)->compute_location)
-		ETG_CLASS (etg)->compute_location (etg, x, y, row, col);
-}
-
-/** 
- * e_table_group_get_position
- * @eti: %ETableGroup to look in.
- * @x: A pointer to the location to store the found x location in.
- * @y: A pointer to the location to store the found y location in.
- * @row: A pointer to the row number to find.
- * @col: A pointer to the col number to find.
- *
- * This routine finds the view cell (row, col) in the %ETableGroup.
- * If that location is in the %ETableGroup *x and *y are set to the
- * upper left hand corner of the cell found.  If that location is not
- * in the %ETableGroup, the number of rows in the %ETableGroup is
- * removed from the value row points to.
- */
-void
-e_table_group_get_cell_geometry  (ETableGroup *etg,
-				  int         *row,
-				  int         *col,
-				  int         *x,
-				  int         *y,
-				  int         *width,
-				  int         *height)
-{
-	g_return_if_fail (etg != NULL);
-	g_return_if_fail (E_IS_TABLE_GROUP (etg));
-
-	if (ETG_CLASS (etg)->get_cell_geometry)
-		ETG_CLASS (etg)->get_cell_geometry (etg, row, col, x, y, width, height);
-}
-
-/** 
- * e_table_group_cursor_change
- * @eti: %ETableGroup to emit the signal on
- * @row: The new cursor row (model row)
- *
- * This routine emits the "cursor_change" signal.
- */
-void
-e_table_group_cursor_change (ETableGroup *e_table_group, gint row)
-{
-	g_return_if_fail (e_table_group != NULL);
-	g_return_if_fail (E_IS_TABLE_GROUP (e_table_group));
-
-	gtk_signal_emit (GTK_OBJECT (e_table_group),
-			 etg_signals [CURSOR_CHANGE],
-			 row);
-}
-
-/** 
- * e_table_group_cursor_activated
- * @eti: %ETableGroup to emit the signal on
- * @row: The cursor row (model row)
- *
- * This routine emits the "cursor_activated" signal.
- */
-void
-e_table_group_cursor_activated (ETableGroup *e_table_group, gint row)
-{
-	g_return_if_fail (e_table_group != NULL);
-	g_return_if_fail (E_IS_TABLE_GROUP (e_table_group));
-
-	gtk_signal_emit (GTK_OBJECT (e_table_group),
-			 etg_signals [CURSOR_ACTIVATED],
-			 row);
-}
-
-/** 
- * e_table_group_double_click
- * @eti: %ETableGroup to emit the signal on
- * @row: The row clicked on (model row)
- * @col: The col clicked on (model col)
- * @event: The event that caused this signal
- *
- * This routine emits the "double_click" signal.
- */
-void
-e_table_group_double_click (ETableGroup *e_table_group, gint row, gint col, GdkEvent *event)
-{
-	g_return_if_fail (e_table_group != NULL);
-	g_return_if_fail (E_IS_TABLE_GROUP (e_table_group));
-
-	gtk_signal_emit (GTK_OBJECT (e_table_group),
-			 etg_signals [DOUBLE_CLICK],
-			 row, col, event);
-}
-
-/** 
- * e_table_group_right_click
- * @eti: %ETableGroup to emit the signal on
- * @row: The row clicked on (model row)
- * @col: The col clicked on (model col)
- * @event: The event that caused this signal
- *
- * This routine emits the "right_click" signal.
- */
-gint
-e_table_group_right_click (ETableGroup *e_table_group, gint row, gint col, GdkEvent *event)
-{
-	gint return_val = 0;
-
-	g_return_val_if_fail (e_table_group != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_GROUP (e_table_group), 0);
-
-	gtk_signal_emit (GTK_OBJECT (e_table_group),
-			 etg_signals [RIGHT_CLICK],
-			 row, col, event, &return_val);
-
-	return return_val;
-}
-
-/** 
- * e_table_group_click
- * @eti: %ETableGroup to emit the signal on
- * @row: The row clicked on (model row)
- * @col: The col clicked on (model col)
- * @event: The event that caused this signal
- *
- * This routine emits the "click" signal.
- */
-gint
-e_table_group_click (ETableGroup *e_table_group, gint row, gint col, GdkEvent *event)
-{
-	gint return_val = 0;
-
-	g_return_val_if_fail (e_table_group != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_GROUP (e_table_group), 0);
-
-	gtk_signal_emit (GTK_OBJECT (e_table_group),
-			 etg_signals [CLICK],
-			 row, col, event, &return_val);
-
-	return return_val;
-}
-
-/** 
- * e_table_group_key_press
- * @eti: %ETableGroup to emit the signal on
- * @row: The cursor row (model row)
- * @col: The cursor col (model col)
- * @event: The event that caused this signal
- *
- * This routine emits the "key_press" signal.
- */
-gint
-e_table_group_key_press (ETableGroup *e_table_group, gint row, gint col, GdkEvent *event)
-{
-	gint return_val = 0;
-
-	g_return_val_if_fail (e_table_group != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_GROUP (e_table_group), 0);
-
-	gtk_signal_emit (GTK_OBJECT (e_table_group),
-			 etg_signals [KEY_PRESS],
-			 row, col, event, &return_val);
-
-	return return_val;
-}
-
-/** 
- * e_table_group_get_header
- * @eti: %ETableGroup to check
- *
- * This routine returns the %ETableGroup's header.
- *
- * Returns: The %ETableHeader.
- */
-ETableHeader *
-e_table_group_get_header (ETableGroup *etg)
-{
-	g_return_val_if_fail (etg != NULL, NULL);
-	g_return_val_if_fail (E_IS_TABLE_GROUP (etg), NULL);
-
-	return etg->header;
-}
-
-static int
-etg_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	ETableGroup *etg = E_TABLE_GROUP (item);
-	gboolean return_val = TRUE;
-
-	switch (event->type) {
-
-	case GDK_FOCUS_CHANGE:
-		etg->has_focus = event->focus_change.in;
-		return_val = FALSE;
-
-	default:
-		return_val = FALSE;
-	}
-	if (return_val == FALSE){
-		if (GNOME_CANVAS_ITEM_CLASS(etg_parent_class)->event)
-			return GNOME_CANVAS_ITEM_CLASS(etg_parent_class)->event (item, event);
-	}
-	return return_val;
-
-}
-
-static gboolean
-etg_get_focus (ETableGroup      *etg)
-{
-	return etg->has_focus;
-}
-
-static void
-etg_class_init (GtkObjectClass *object_class)
-{
-	GnomeCanvasItemClass *item_class = (GnomeCanvasItemClass *) object_class;
-	ETableGroupClass *klass = (ETableGroupClass *) object_class;
-
-	object_class->destroy = etg_destroy;
-
-	item_class->event = etg_event;
-
-	klass->cursor_change = NULL;
-	klass->cursor_activated = NULL;
-	klass->double_click = NULL;
-	klass->right_click = NULL;
-	klass->click = NULL;
-	klass->key_press = NULL;
-	
-	klass->add = NULL;
-	klass->add_array = NULL;
-	klass->add_all = NULL;
-	klass->remove = NULL;
-	klass->row_count  = NULL;
-	klass->increment  = NULL;
-	klass->decrement  = NULL;
-	klass->set_focus  = NULL;
-	klass->get_focus = etg_get_focus;
-	klass->get_printable = NULL;
-	klass->compute_location = NULL;
-	klass->get_cell_geometry = NULL;
-
-	etg_parent_class = gtk_type_class (PARENT_TYPE);
-
-	etg_signals [CURSOR_CHANGE] =
-		gtk_signal_new ("cursor_change",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableGroupClass, cursor_change),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
-
-	etg_signals [CURSOR_ACTIVATED] =
-		gtk_signal_new ("cursor_activated",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableGroupClass, cursor_activated),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
-
-	etg_signals [DOUBLE_CLICK] =
-		gtk_signal_new ("double_click",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableGroupClass, double_click),
-				gtk_marshal_NONE__INT_INT_POINTER,
-				GTK_TYPE_NONE, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
-
-	etg_signals [RIGHT_CLICK] =
-		gtk_signal_new ("right_click",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableGroupClass, right_click),
-				e_marshal_INT__INT_INT_POINTER,
-				GTK_TYPE_INT, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
-
-	etg_signals [CLICK] =
-		gtk_signal_new ("click",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableGroupClass, click),
-				e_marshal_INT__INT_INT_POINTER,
-				GTK_TYPE_INT, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
-
-	etg_signals [KEY_PRESS] =
-		gtk_signal_new ("key_press",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableGroupClass, key_press),
-				e_marshal_INT__INT_INT_POINTER,
-				GTK_TYPE_INT, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
-
-	gtk_object_class_add_signals (object_class, etg_signals, LAST_SIGNAL);
-}
-
-E_MAKE_TYPE (e_table_group, "ETableGroup", ETableGroup, etg_class_init, NULL, PARENT_TYPE);
diff --git a/widgets/table/e-table-group.glade b/widgets/table/e-table-group.glade
deleted file mode 100644
index 20ab88cfca..0000000000
--- a/widgets/table/e-table-group.glade
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>False</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <backup_source_files>False</backup_source_files>
-  <main_source_file>interface.c</main_source_file>
-  <main_header_file>interface.h</main_header_file>
-  <handler_source_file>callbacks.c</handler_source_file>
-  <handler_header_file>callbacks.h</handler_header_file>
-  <support_source_file>support.c</support_source_file>
-  <support_header_file>support.h</support_header_file>
-</project>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>window1</name>
-  <title>window1</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkTable</class>
-    <name>table1</name>
-    <rows>3</rows>
-    <columns>3</columns>
-    <homogeneous>False</homogeneous>
-    <row_spacing>0</row_spacing>
-    <column_spacing>0</column_spacing>
-
-    <widget>
-      <class>GtkFrame</class>
-      <name>frame1</name>
-      <border_width>4</border_width>
-      <label>Available fields</label>
-      <label_xalign>0</label_xalign>
-      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-      <child>
-	<left_attach>0</left_attach>
-	<right_attach>1</right_attach>
-	<top_attach>0</top_attach>
-	<bottom_attach>1</bottom_attach>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<xexpand>True</xexpand>
-	<yexpand>True</yexpand>
-	<xshrink>False</xshrink>
-	<yshrink>False</yshrink>
-	<xfill>True</xfill>
-	<yfill>True</yfill>
-      </child>
-
-      <widget>
-	<class>GtkScrolledWindow</class>
-	<name>scrolledwindow1</name>
-	<hscrollbar_policy>GTK_POLICY_ALWAYS</hscrollbar_policy>
-	<vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
-	<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-
-	<widget>
-	  <class>GtkCList</class>
-	  <name>clist1</name>
-	  <can_focus>True</can_focus>
-	  <columns>1</columns>
-	  <column_widths>80</column_widths>
-	  <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-	  <show_titles>False</show_titles>
-	  <shadow_type>GTK_SHADOW_NONE</shadow_type>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <child_name>CList:title</child_name>
-	    <name>label1</name>
-	    <label>label1</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkFrame</class>
-      <name>frame2</name>
-      <border_width>4</border_width>
-      <label>Show in this order</label>
-      <label_xalign>0</label_xalign>
-      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-      <child>
-	<left_attach>2</left_attach>
-	<right_attach>3</right_attach>
-	<top_attach>0</top_attach>
-	<bottom_attach>1</bottom_attach>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<xexpand>True</xexpand>
-	<yexpand>False</yexpand>
-	<xshrink>False</xshrink>
-	<yshrink>False</yshrink>
-	<xfill>True</xfill>
-	<yfill>True</yfill>
-      </child>
-
-      <widget>
-	<class>GtkScrolledWindow</class>
-	<name>scrolledwindow2</name>
-	<hscrollbar_policy>GTK_POLICY_ALWAYS</hscrollbar_policy>
-	<vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
-	<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-
-	<widget>
-	  <class>GtkCList</class>
-	  <name>clist2</name>
-	  <can_focus>True</can_focus>
-	  <columns>1</columns>
-	  <column_widths>80</column_widths>
-	  <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-	  <show_titles>False</show_titles>
-	  <shadow_type>GTK_SHADOW_NONE</shadow_type>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <child_name>CList:title</child_name>
-	    <name>label2</name>
-	    <label>label2</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkVBox</class>
-      <name>vbox1</name>
-      <border_width>4</border_width>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-      <child>
-	<left_attach>1</left_attach>
-	<right_attach>2</right_attach>
-	<top_attach>0</top_attach>
-	<bottom_attach>1</bottom_attach>
-	<xpad>4</xpad>
-	<ypad>4</ypad>
-	<xexpand>True</xexpand>
-	<yexpand>False</yexpand>
-	<xshrink>False</xshrink>
-	<yshrink>False</yshrink>
-	<xfill>False</xfill>
-	<yfill>True</yfill>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<border_width>4</border_width>
-	<can_focus>True</can_focus>
-	<label>Add &gt;&gt;</label>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button2</name>
-	<border_width>4</border_width>
-	<can_focus>True</can_focus>
-	<label>&lt;&lt; Remove</label>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/widgets/table/e-table-group.h b/widgets/table/e-table-group.h
deleted file mode 100644
index 18866b7ad5..0000000000
--- a/widgets/table/e-table-group.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_GROUP_H_
-#define _E_TABLE_GROUP_H_
-
-#include <libgnomeui/gnome-canvas.h>
-#include <gal/e-table/e-table-model.h>
-#include <gal/e-table/e-table-header.h>
-#include <gal/e-table/e-table-sort-info.h>
-#include <gal/e-table/e-table-defines.h>
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-printable.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TABLE_GROUP_TYPE        (e_table_group_get_type ())
-#define E_TABLE_GROUP(o)          (GTK_CHECK_CAST ((o), E_TABLE_GROUP_TYPE, ETableGroup))
-#define E_TABLE_GROUP_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_GROUP_TYPE, ETableGroupClass))
-#define E_IS_TABLE_GROUP(o)       (GTK_CHECK_TYPE ((o), E_TABLE_GROUP_TYPE))
-#define E_IS_TABLE_GROUP_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_GROUP_TYPE))
-
-typedef struct {
-	GnomeCanvasGroup group;
-
-	/*
-	 * The full header.
-	 */
-	ETableHeader *full_header;
-	ETableHeader *header;
-	
-	/*
-	 * The model we pull data from.
-	 */
-	ETableModel *model;
-
-	/*
-	 * Whether we should add indentation and open/close markers,
-	 * or if we just act as containers of subtables.
-	 */
-	guint transparent : 1;
-
-	guint has_focus : 1;
-	
-	guint frozen : 1;
-} ETableGroup;
-
-typedef struct {
-	GnomeCanvasGroupClass parent_class;
-
-	/* Signals */
-	void        (*cursor_change)         (ETableGroup *etg, int row);
-	void        (*cursor_activated)      (ETableGroup *etg, int row);
-	void        (*double_click)          (ETableGroup *etg, int row, int col, GdkEvent *event);
-	gint        (*right_click)           (ETableGroup *etg, int row, int col, GdkEvent *event);
-	gint        (*click)                 (ETableGroup *etg, int row, int col, GdkEvent *event);
-	gint        (*key_press)             (ETableGroup *etg, int row, int col, GdkEvent *event);
-
-	/* Virtual functions. */
-	void        (*add)                   (ETableGroup *etg, gint row);
-	void        (*add_array)             (ETableGroup *etg, const int *array, int count);
-	void        (*add_all)               (ETableGroup *etg);
-	gboolean    (*remove)                (ETableGroup *etg, gint row);
-	gint        (*row_count)             (ETableGroup *etg);
-	void        (*increment)             (ETableGroup *etg, gint position, gint amount);
-	void        (*decrement)             (ETableGroup *etg, gint position, gint amount);
-	void        (*set_focus)             (ETableGroup *etg, EFocus direction, gint view_col);
-	gboolean    (*get_focus)             (ETableGroup *etg);
-	gint        (*get_focus_column)      (ETableGroup *etg);
-	EPrintable *(*get_printable)         (ETableGroup *etg);
-	void        (*compute_location)      (ETableGroup *etg, int *x, int *y, int *row, int *col);
-	void        (*get_cell_geometry)     (ETableGroup *etg, int *row, int *col, int *x, int *y, int *width, int *height);
-
-} ETableGroupClass;
-
-/* Virtual functions */
-void          e_table_group_add               (ETableGroup       *etg,
-					       gint               row);
-void          e_table_group_add_array         (ETableGroup       *etg,
-					       const int         *array,
-					       int                count);
-void          e_table_group_add_all           (ETableGroup       *etg);
-gboolean      e_table_group_remove            (ETableGroup       *etg,
-					       gint               row);
-void          e_table_group_increment         (ETableGroup       *etg,
-					       gint               position,
-					       gint               amount);
-void          e_table_group_decrement         (ETableGroup       *etg,
-					       gint               position,
-					       gint               amount);
-gint          e_table_group_row_count         (ETableGroup       *etg);
-void          e_table_group_set_focus         (ETableGroup       *etg,
-					       EFocus             direction,
-					       gint               view_col);
-gboolean      e_table_group_get_focus         (ETableGroup       *etg);
-gint          e_table_group_get_focus_column  (ETableGroup       *etg);
-ETableHeader *e_table_group_get_header        (ETableGroup       *etg);
-EPrintable   *e_table_group_get_printable     (ETableGroup       *etg);
-void          e_table_group_compute_location  (ETableGroup       *etg,
-					       int               *x,
-					       int               *y,
-					       int               *row,
-					       int               *col);
-void          e_table_group_get_cell_geometry (ETableGroup       *etg,
-					       int               *row,
-					       int               *col,
-					       int               *x,
-					       int               *y,
-					       int               *width,
-					       int               *height);
-ETableGroup  *e_table_group_new               (GnomeCanvasGroup  *parent,
-					       ETableHeader      *full_header,
-					       ETableHeader      *header,
-					       ETableModel       *model,
-					       ETableSortInfo    *sort_info,
-					       int                n);
-void          e_table_group_construct         (GnomeCanvasGroup  *parent,
-					       ETableGroup       *etg,
-					       ETableHeader      *full_header,
-					       ETableHeader      *header,
-					       ETableModel       *model);
-
-/* For emitting the signals */
-void          e_table_group_cursor_change     (ETableGroup       *etg,
-					       gint               row);
-void          e_table_group_cursor_activated  (ETableGroup       *etg,
-					       gint               row);
-void          e_table_group_double_click      (ETableGroup       *etg,
-					       gint               row,
-					       gint               col,
-					       GdkEvent          *event);
-gint          e_table_group_right_click       (ETableGroup       *etg,
-					       gint               row,
-					       gint               col,
-					       GdkEvent          *event);
-gint          e_table_group_click             (ETableGroup       *etg,
-					       gint               row,
-					       gint               col,
-					       GdkEvent          *event);
-gint          e_table_group_key_press         (ETableGroup       *etg,
-					       gint               row,
-					       gint               col,
-					       GdkEvent          *event);
-GtkType       e_table_group_get_type          (void);
-
-typedef void (*ETableGroupLeafFn) (void *e_table_item, void *closure);
-void          e_table_group_apply_to_leafs    (ETableGroup       *etg,
-					       ETableGroupLeafFn  fn,
-					       void              *closure);
-
-END_GNOME_DECLS
-
-#endif /* _E_TABLE_GROUP_H_ */
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
deleted file mode 100644
index acaa1c1510..0000000000
--- a/widgets/table/e-table-header-item.c
+++ /dev/null
@@ -1,1614 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-column-view.c: A canvas item based view of the ETableColumn.
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * Copyright 1999, 2000, 2001 Ximian, Inc.
- */
-#include <config.h>
-
-#include "e-table-header-item.h"
-
-#include <string.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkdnd.h>
-#include <libgnomeui/gnome-canvas.h>
-#include <libgnomeui/gnome-canvas-util.h>
-#include <libgnomeui/gnome-canvas-polygon.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include "gal/widgets/e-cursors.h"
-#include "gal/util/e-i18n.h"
-#include "gal/util/e-xml-utils.h"
-#include "gal/widgets/e-canvas.h"
-#include "gal/widgets/e-popup-menu.h"
-#include "e-table-header.h"
-#include "e-table-header-utils.h"
-#include "e-table-col-dnd.h"
-#include "e-table-defines.h"
-#include "e-table-field-chooser-dialog.h"
-#include "e-table-config.h"
-#include "e-table.h"
-
-#include "add-col.xpm"
-#include "remove-col.xpm"
-#include "arrow-up.xpm"
-#include "arrow-down.xpm"
-
-enum {
-	BUTTON_PRESSED,
-	LAST_SIGNAL
-};
-
-static guint ethi_signals [LAST_SIGNAL] = { 0, };
-
-#define ARROW_DOWN_HEIGHT 16
-#define ARROW_PTR          7
-
-/* Defines the tolerance for proximity of the column division to the cursor position */
-#define TOLERANCE 4
-
-#define ETHI_RESIZING(x) ((x)->resize_col != -1)
-
-#define PARENT_OBJECT_TYPE gnome_canvas_item_get_type ()
-
-#define ELEMENTS(x) (sizeof (x) / sizeof (x[0]))
-
-static GnomeCanvasItemClass *ethi_parent_class;
-
-static void ethi_drop_table_header (ETableHeaderItem *ethi);
-
-/*
- * They display the arrows for the drop location.
- */
-	
-static GtkWidget *arrow_up, *arrow_down;
-
-/*
- * DnD icons
- */
-static GdkColormap *dnd_colormap;
-static GdkPixmap *remove_col_pixmap, *remove_col_mask;
-static GdkPixmap *add_col_pixmap, *add_col_mask;
-
-enum {
-	ARG_0,
-	ARG_TABLE_HEADER,
-	ARG_FULL_HEADER,
-	ARG_DND_CODE,
-	ARG_TABLE_FONTSET,
-	ARG_SORT_INFO,
-	ARG_TABLE,
-};
-
-static void
-ethi_destroy (GtkObject *object){
-	ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (object);
-
-	ethi_drop_table_header (ethi);
-
-	if (ethi->dnd_code) {
-		g_free (ethi->dnd_code);
-		ethi->dnd_code = NULL;
-	}
-
-	if (ethi->sort_info) {
-		if (ethi->sort_info_changed_id)
-			gtk_signal_disconnect (GTK_OBJECT(ethi->sort_info), ethi->sort_info_changed_id);
-		if (ethi->group_info_changed_id)
-			gtk_signal_disconnect (GTK_OBJECT(ethi->sort_info), ethi->group_info_changed_id);
-		gtk_object_unref (GTK_OBJECT(ethi->sort_info));
-		ethi->sort_info = NULL;
-	}
-
-	if (ethi->full_header)
-		gtk_object_unref (GTK_OBJECT(ethi->full_header));
-
-	if (ethi->config)
-		gtk_object_destroy (GTK_OBJECT (ethi->config));
-	
-	if (GTK_OBJECT_CLASS (ethi_parent_class)->destroy)
-		(*GTK_OBJECT_CLASS (ethi_parent_class)->destroy) (object);
-}
-
-static int
-e_table_header_item_get_height (ETableHeaderItem *ethi)
-{
-	ETableHeader *eth;
-	int numcols, col;
-	int maxheight;
-	GtkStyle *style;
-
-	g_return_val_if_fail (ethi != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_HEADER_ITEM (ethi), 0);
-       
-	eth = ethi->eth;
-	numcols = e_table_header_count (eth);
-
-	maxheight = 0;
-
-	style = GTK_WIDGET (GNOME_CANVAS_ITEM (ethi)->canvas)->style;
-
-	for (col = 0; col < numcols; col++) {
-		ETableCol *ecol = e_table_header_get_column (eth, col);
-		int height;
-
-		height = e_table_header_compute_height (ecol, style, ethi->font);
-
-		if (height > maxheight)
-			maxheight = height;
-	}
-
-	return maxheight;
-}
-
-static void
-ethi_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags)
-{
-	ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item);
-	
-	double   i2c [6];
-	ArtPoint c1, c2, i1, i2;
-	
-	if (GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->update)
-		(*GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->update)(item, affine, clip_path, flags);
-
-
-	if (ethi->sort_info)
-		ethi->group_indent_width = e_table_sort_info_grouping_get_count(ethi->sort_info) * GROUP_INDENT;
-	else
-		ethi->group_indent_width = 0;
-
-	ethi->width = e_table_header_total_width (ethi->eth) + ethi->group_indent_width;
-
-	i1.x = i1.y = 0;
-	i2.x = ethi->width;
-	i2.y = ethi->height;
-
-	gnome_canvas_item_i2c_affine (item, i2c);
-	art_affine_point (&c1, &i1, i2c);
-	art_affine_point (&c2, &i2, i2c);
-
-	if (item->x1 != c1.x ||
-	    item->y1 != c1.y ||
-	    item->x2 != c2.x ||
-	    item->y2 != c2.y)
-		{
-			gnome_canvas_request_redraw (item->canvas, item->x1, item->y1, item->x2, item->y2);
-			item->x1 = c1.x;
-			item->y1 = c1.y;
-			item->x2 = c2.x;
-			item->y2 = c2.y;
-
-			gnome_canvas_group_child_bounds (GNOME_CANVAS_GROUP (item->parent), item);
-		}
-	gnome_canvas_request_redraw (item->canvas, item->x1, item->y1, item->x2, item->y2);
-}
-
-static void
-ethi_font_set (ETableHeaderItem *ethi, GdkFont *font)
-{
-	if (ethi->font)
-		gdk_font_unref (ethi->font);
-
-	ethi->font = font;
-	
-	ethi->height = e_table_header_item_get_height (ethi);
-	e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(ethi));
-}
-
-static void
-ethi_font_load (ETableHeaderItem *ethi, char *fontname)
-{
-	GdkFont *font;
-
-	font = gdk_fontset_load (fontname);
-	if (font == NULL)
-		font = gdk_font_load ("-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-iso8859-1");
-	
-	ethi_font_set (ethi, font);
-}
-
-static void
-ethi_drop_table_header (ETableHeaderItem *ethi)
-{
-	GtkObject *header;
-	
-	if (!ethi->eth)
-		return;
-
-	header = GTK_OBJECT (ethi->eth);
-	gtk_signal_disconnect (header, ethi->structure_change_id);
-	gtk_signal_disconnect (header, ethi->dimension_change_id);
-
-	gtk_object_unref (header);
-	ethi->eth = NULL;
-	ethi->width = 0;
-}
-
-static void 
-structure_changed (ETableHeader *header, ETableHeaderItem *ethi)
-{
-	gnome_canvas_item_request_update(GNOME_CANVAS_ITEM(ethi));
-}
-
-static void
-dimension_changed (ETableHeader *header, int col, ETableHeaderItem *ethi)
-{
-	gnome_canvas_item_request_update(GNOME_CANVAS_ITEM(ethi));
-}
-
-static void
-ethi_add_table_header (ETableHeaderItem *ethi, ETableHeader *header)
-{
-	ethi->eth = header;
-	gtk_object_ref (GTK_OBJECT (ethi->eth));
-
-	ethi->height = e_table_header_item_get_height (ethi);
-
-	ethi->structure_change_id = gtk_signal_connect (
-		GTK_OBJECT (header), "structure_change",
-		GTK_SIGNAL_FUNC(structure_changed), ethi);
-	ethi->dimension_change_id = gtk_signal_connect (
-		GTK_OBJECT (header), "dimension_change",
-		GTK_SIGNAL_FUNC(dimension_changed), ethi);
-	e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(ethi));
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM(ethi));
-}
-
-static void
-ethi_sort_info_changed (ETableSortInfo *sort_info, ETableHeaderItem *ethi)
-{
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM(ethi));
-}
-
-static void
-ethi_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	ETableHeaderItem *ethi;
-
-	item = GNOME_CANVAS_ITEM (o);
-	ethi = E_TABLE_HEADER_ITEM (o);
-
-	switch (arg_id){
-	case ARG_TABLE_HEADER:
-		ethi_drop_table_header (ethi);
-		ethi_add_table_header (ethi, E_TABLE_HEADER(GTK_VALUE_OBJECT (*arg)));
-		break;
-
-	case ARG_FULL_HEADER:
-		if (ethi->full_header)
-			gtk_object_unref(GTK_OBJECT(ethi->full_header));
-		ethi->full_header = E_TABLE_HEADER(GTK_VALUE_OBJECT (*arg));
-		if (ethi->full_header)
-			gtk_object_ref(GTK_OBJECT(ethi->full_header));
-		break;
-
-	case ARG_DND_CODE:
-		g_free(ethi->dnd_code);
-		ethi->dnd_code = g_strdup (GTK_VALUE_STRING (*arg));
-		break;
-
-	case ARG_TABLE_FONTSET:
-		ethi_font_load (ethi, GTK_VALUE_STRING (*arg));
-		break;
-
-	case ARG_SORT_INFO:
-		if (ethi->sort_info){
-			if (ethi->sort_info_changed_id)
-				gtk_signal_disconnect (
-					GTK_OBJECT(ethi->sort_info),
-					ethi->sort_info_changed_id);
-
-			if (ethi->group_info_changed_id)
-				gtk_signal_disconnect (
-					GTK_OBJECT(ethi->sort_info),
-					ethi->group_info_changed_id);
-			gtk_object_unref (GTK_OBJECT(ethi->sort_info));
-		}
-		ethi->sort_info = GTK_VALUE_POINTER (*arg);
-		gtk_object_ref (GTK_OBJECT(ethi->sort_info));
-		ethi->sort_info_changed_id =
-			gtk_signal_connect (
-				GTK_OBJECT(ethi->sort_info), "sort_info_changed",
-				GTK_SIGNAL_FUNC(ethi_sort_info_changed), ethi);
-		ethi->group_info_changed_id =
-			gtk_signal_connect (
-				GTK_OBJECT(ethi->sort_info), "group_info_changed",
-				GTK_SIGNAL_FUNC(ethi_sort_info_changed), ethi);
-		break;
-	case ARG_TABLE:
-		if (GTK_VALUE_OBJECT(*arg))
-			ethi->table = E_TABLE(GTK_VALUE_OBJECT(*arg));
-		else
-			ethi->table = NULL;
-		break;
-	}
-	gnome_canvas_item_request_update(item);
-}
-
-static void
-ethi_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ETableHeaderItem *ethi;
-
-	ethi = E_TABLE_HEADER_ITEM (o);
-
-	switch (arg_id){
-	case ARG_FULL_HEADER:
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT (ethi->full_header);
-		break;
-	case ARG_DND_CODE:
-		GTK_VALUE_STRING (*arg) = g_strdup (ethi->dnd_code);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static int
-ethi_find_col_by_x (ETableHeaderItem *ethi, int x)
-{
-	const int cols = e_table_header_count (ethi->eth);
-	int x1 = 0;
-	int col;
-
-	if (x < x1)
-		return -1;
-
-	x1 += ethi->group_indent_width;
-	
-	for (col = 0; col < cols; col++){
-		ETableCol *ecol = e_table_header_get_column (ethi->eth, col);
-
-		if ((x >= x1) && (x <= x1 + ecol->width))
-			return col;
-
-		x1 += ecol->width;
-	}
-	return -1;
-}
-
-static int
-ethi_find_col_by_x_nearest (ETableHeaderItem *ethi, int x)
-{
-	const int cols = e_table_header_count (ethi->eth);
-	int x1 = 0;
-	int col;
-
-	if (x < x1)
-		return -1;
-
-	x1 += ethi->group_indent_width;
-	
-	for (col = 0; col < cols; col++){
-		ETableCol *ecol = e_table_header_get_column (ethi->eth, col);
-
-		x1 += (ecol->width / 2);
-
-		if (x <= x1)
-			return col;
-
-		x1 += (ecol->width + 1) / 2;
-	}
-	return col;
-}
-
-static void
-ethi_remove_drop_marker (ETableHeaderItem *ethi)
-{
-	if (ethi->drag_mark == -1)
-		return;
-
-	gtk_widget_hide (arrow_up);
-	gtk_widget_hide (arrow_down);
-	
-	ethi->drag_mark = -1;
-}
-
-static GtkWidget *
-make_shaped_window_from_xpm (const char **xpm)
-{
-	GdkPixbuf *pixbuf;
-	GdkPixmap *pixmap;
-	GdkBitmap *bitmap;
-	GtkWidget *win, *pix;
-	
-	pixbuf = gdk_pixbuf_new_from_xpm_data (xpm);
-	gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &bitmap, 128);
-	gdk_pixbuf_unref (pixbuf);
-
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-	win = gtk_window_new (GTK_WINDOW_POPUP);
-	pix = gtk_pixmap_new (pixmap, bitmap);
-	gtk_widget_realize (win);
-	gtk_container_add (GTK_CONTAINER (win), pix);
-	gtk_widget_shape_combine_mask (win, bitmap, 0, 0);
-	gtk_widget_pop_visual ();
-	gtk_widget_pop_colormap ();
-	
-	gdk_pixmap_unref (pixmap);
-	gdk_bitmap_unref (bitmap);
-	
-	return win;
-}
-
-static void
-ethi_add_drop_marker (ETableHeaderItem *ethi, int col)
-{
-	int rx, ry;
-	int x;
-	
-	if (ethi->drag_mark == col)
-		return;
-
-	ethi->drag_mark = col;
-
-	x = e_table_header_col_diff (ethi->eth, 0, col);
-	if (col > 0)
-		x += ethi->group_indent_width;
-	
-	if (!arrow_up){
-		arrow_up   = make_shaped_window_from_xpm (arrow_up_xpm);
-		arrow_down = make_shaped_window_from_xpm (arrow_down_xpm);
-	}
-
-	gdk_window_get_origin (
-		GTK_WIDGET (GNOME_CANVAS_ITEM (ethi)->canvas)->window,
-		&rx, &ry);
-
-	gtk_widget_set_uposition (arrow_down, rx + x - ARROW_PTR, ry - ARROW_DOWN_HEIGHT);
-	gtk_widget_show_all (arrow_down);
-
-	gtk_widget_set_uposition (arrow_up, rx + x - ARROW_PTR, ry + ethi->height);
-	gtk_widget_show_all (arrow_up);
-}
-
-#define gray50_width    2
-#define gray50_height   2
-static char gray50_bits [] = {
-  0x02, 0x01, };
-
-static void
-ethi_add_destroy_marker (ETableHeaderItem *ethi)
-{
-	double x1;
-	
-	if (ethi->remove_item)
-		gtk_object_destroy (GTK_OBJECT (ethi->remove_item));
-
-	if (!ethi->stipple)
-		ethi->stipple = gdk_bitmap_create_from_data  (
-			NULL, gray50_bits, gray50_width, gray50_height);
-	
-	x1 = (double) e_table_header_col_diff (ethi->eth, 0, ethi->drag_col);
-	if (ethi->drag_col > 0)
-		x1 += ethi->group_indent_width;
-	
-	ethi->remove_item = gnome_canvas_item_new (
-		GNOME_CANVAS_GROUP (GNOME_CANVAS_ITEM (ethi)->canvas->root),
-		gnome_canvas_rect_get_type (),
-		"x1", x1 + 1,
-		"y1", (double) 1,
-		"x2", (double) x1 + e_table_header_col_diff (
-			ethi->eth, ethi->drag_col, ethi->drag_col+1) - 2,
-
-		"y2", (double) ethi->height - 2,
-		"fill_color", "red",
-		"fill_stipple", ethi->stipple,
-		NULL);
-}
-
-static void
-ethi_remove_destroy_marker (ETableHeaderItem *ethi)
-{
-	if (!ethi->remove_item)
-		return;
-	
-	gtk_object_destroy (GTK_OBJECT (ethi->remove_item));
-	ethi->remove_item = NULL;
-}
-
-#if 0
-static gboolean
-moved (ETableHeaderItem *ethi, guint col, guint model_col)
-{
-	if (col == -1)
-		return TRUE;
-	ecol = e_table_header_get_column (ethi->eth, col);
-	if (ecol->col_idx == model_col)
-		return FALSE;
-	if (col > 0) {
-		ecol = e_table_header_get_column (ethi->eth, col - 1);
-		if (ecol->col_idx == model_col)
-			return FALSE;
-	}
-	return TRUE;
-}
-#endif
-
-static gboolean
-ethi_drag_motion (GtkObject *canvas, GdkDragContext *context,
-		  gint x, gint y, guint time,
-		  ETableHeaderItem *ethi)
-{
-	char *droptype, *headertype;
-
-	gdk_drag_status (context, 0, time);
-
-	droptype = gdk_atom_name (GPOINTER_TO_INT (context->targets->data));
-	headertype = g_strdup_printf ("%s-%s", TARGET_ETABLE_COL_TYPE,
-				      ethi->dnd_code);
-
-	if (strcmp (droptype, headertype) != 0) {
-		g_free (headertype);
-		return FALSE;
-	}
-
-	g_free (headertype);
-
-	if ((x >= 0) && (x <= (ethi->width)) &&
-	    (y >= 0) && (y <= (ethi->height))){
-		int col;
-		
-		col = ethi_find_col_by_x_nearest (ethi, x);
-
-		if (ethi->drag_col != -1 && (col == ethi->drag_col || col == ethi->drag_col + 1)) {
-			if (ethi->drag_col != -1)
-				ethi_remove_destroy_marker (ethi);
-			
-			ethi_remove_drop_marker (ethi);
-			gdk_drag_status (context, context->suggested_action, time);
-		} 
-		else if (col != -1){
-			if (ethi->drag_col != -1)
-				ethi_remove_destroy_marker (ethi);
-
-			ethi_add_drop_marker (ethi, col);
-			gdk_drag_status (context, context->suggested_action, time);
-		} else {
-			ethi_remove_drop_marker (ethi);
-			if (ethi->drag_col != -1)
-				ethi_add_destroy_marker (ethi);
-		}
-	} else {
-		ethi_remove_drop_marker (ethi);
-		if (ethi->drag_col != -1)
-			ethi_add_destroy_marker (ethi);
-	}
-
-	return TRUE;
-}
-
-static void
-ethi_drag_end (GtkWidget *canvas, GdkDragContext *context, ETableHeaderItem *ethi)
-{
-	if (context->action == 0) {
-		e_table_header_remove (ethi->eth, ethi->drag_col);
-		gnome_canvas_item_request_update(GNOME_CANVAS_ITEM(ethi));
-	}
-	ethi_remove_drop_marker (ethi);
-	ethi_remove_destroy_marker (ethi);
-	ethi->drag_col = -1;
-}
-
-static void
-ethi_drag_data_received (GtkWidget *canvas,
-			 GdkDragContext *drag_context,
-			 gint x,
-			 gint y,
-			 GtkSelectionData *data,
-			 guint info,
-			 guint time,
-			 ETableHeaderItem *ethi)
-{
-	int found = FALSE;
-	int count;
-	int column;
-	int drop_col;
-	int i;
-
-	if (data->data) {
-		count = e_table_header_count(ethi->eth);
-		column = atoi(data->data);
-		drop_col = ethi->drop_col;
-		ethi->drop_col = -1;
-
-		if (column >= 0) {
-			for (i = 0; i < count; i++) {
-				ETableCol *ecol = e_table_header_get_column (ethi->eth, i);
-				if (ecol->col_idx == column) {
-					e_table_header_move(ethi->eth, i, drop_col);
-					found = TRUE;
-					break;
-				}
-			}
-			if (!found) {
-				count = e_table_header_count(ethi->full_header);
-				for (i = 0; i < count; i++) {
-					ETableCol *ecol = e_table_header_get_column (ethi->full_header, i);
-					if (ecol->col_idx == column) {
-						e_table_header_add_column (ethi->eth, ecol, drop_col);
-						break;
-					}
-				}
-			}
-		}
-	}
-	ethi_remove_drop_marker (ethi);
-	gnome_canvas_item_request_update(GNOME_CANVAS_ITEM(ethi));
-}
-
-static void
-ethi_drag_data_get (GtkWidget *canvas,
-		    GdkDragContext     *context,
-		    GtkSelectionData   *selection_data,
-		    guint               info,
-		    guint               time,
-		    ETableHeaderItem *ethi)
-{
-	if (ethi->drag_col != -1) {
-		ETableCol *ecol = e_table_header_get_column (ethi->eth, ethi->drag_col);
-		
-		gchar *string = g_strdup_printf("%d", ecol->col_idx);
-		gtk_selection_data_set(selection_data,
-				       GDK_SELECTION_TYPE_STRING,
-				       sizeof(string[0]),
-				       string,
-				       strlen(string));
-		g_free(string);
-	}
-}
-
-static gboolean
-ethi_drag_drop (GtkWidget *canvas,
-		GdkDragContext *context,
-		gint x,
-		gint y,
-		guint time,
-		ETableHeaderItem *ethi)
-{
-	gboolean successful = FALSE;
-
-	if ((x >= 0) && (x <= (ethi->width)) &&
-	    (y >= 0) && (y <= (ethi->height))){
-		int col;
-		
-		col = ethi_find_col_by_x_nearest (ethi, x);
-		
-		ethi_add_drop_marker (ethi, col);
-
-		ethi->drop_col = col;
-		
-		if (col != -1) {
-			char *target = g_strdup_printf ("%s-%s", TARGET_ETABLE_COL_TYPE, ethi->dnd_code);
-			gtk_drag_get_data (canvas, context, gdk_atom_intern(target, FALSE), time);
-			g_free (target);
-		}
-	}
-	gtk_drag_finish (context, successful, successful, time);
-	return successful;
-}
-
-static void
-ethi_drag_leave (GtkWidget *widget, GdkDragContext *context, guint time, ETableHeaderItem *ethi)
-{
-	ethi_remove_drop_marker (ethi);
-	if (ethi->drag_col != -1)
-		ethi_add_destroy_marker (ethi);
-}
-
-static void
-ethi_realize (GnomeCanvasItem *item)
-{
-	ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item);
-	GdkWindow *window;
-	GdkColor c;
-	GtkTargetEntry  ethi_drop_types [] = {
-		{ TARGET_ETABLE_COL_TYPE, 0, TARGET_ETABLE_COL_HEADER },
-	};
-
-	
-	if (GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)-> realize)
-		(*GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->realize)(item);
-
-	window = GTK_WIDGET (item->canvas)->window;
-
-	ethi->gc = gdk_gc_new (window);
-	gnome_canvas_get_color (item->canvas, "black", &c);
-	gdk_gc_set_foreground (ethi->gc, &c);
-
-	if (!ethi->font)
-		ethi_font_set (ethi, GTK_WIDGET (item->canvas)->style->font);
-
-	/*
-	 * Now, configure DnD
-	 */
-	ethi_drop_types[0].target = g_strdup_printf("%s-%s", ethi_drop_types[0].target, ethi->dnd_code);
-	gtk_drag_dest_set (GTK_WIDGET (item->canvas), 0,
-			   ethi_drop_types, ELEMENTS (ethi_drop_types),
-			   GDK_ACTION_MOVE);
-  	g_free(ethi_drop_types[0].target); 
-
-	/* Drop signals */
-	ethi->drag_motion_id = gtk_signal_connect        (GTK_OBJECT (item->canvas), "drag_motion",
-							  GTK_SIGNAL_FUNC (ethi_drag_motion), ethi);
-	ethi->drag_leave_id = gtk_signal_connect         (GTK_OBJECT (item->canvas), "drag_leave",
-							  GTK_SIGNAL_FUNC (ethi_drag_leave), ethi);
-	ethi->drag_drop_id = gtk_signal_connect          (GTK_OBJECT (item->canvas), "drag_drop",
-							  GTK_SIGNAL_FUNC (ethi_drag_drop), ethi);
-	ethi->drag_data_received_id = gtk_signal_connect (GTK_OBJECT (item->canvas), "drag_data_received",
-							  GTK_SIGNAL_FUNC (ethi_drag_data_received), ethi);
-
-	/* Drag signals */
-	ethi->drag_end_id = gtk_signal_connect           (GTK_OBJECT (item->canvas), "drag_end",
-							  GTK_SIGNAL_FUNC (ethi_drag_end), ethi);
-	ethi->drag_data_get_id = gtk_signal_connect      (GTK_OBJECT (item->canvas), "drag_data_get",
-							  GTK_SIGNAL_FUNC (ethi_drag_data_get), ethi);
-
-}
-
-static void
-ethi_unrealize (GnomeCanvasItem *item)
-{
-	ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item);
-
-	gdk_gc_unref (ethi->gc);
-	ethi->gc = NULL;
-
-	gtk_signal_disconnect (GTK_OBJECT (item->canvas), ethi->drag_motion_id);
-	gtk_signal_disconnect (GTK_OBJECT (item->canvas), ethi->drag_leave_id);
-	gtk_signal_disconnect (GTK_OBJECT (item->canvas), ethi->drag_drop_id);
-	gtk_signal_disconnect (GTK_OBJECT (item->canvas), ethi->drag_data_received_id);
-
-	gtk_signal_disconnect (GTK_OBJECT (item->canvas), ethi->drag_end_id);
-	gtk_signal_disconnect (GTK_OBJECT (item->canvas), ethi->drag_data_get_id);
-
-	if (ethi->stipple){
-		gdk_bitmap_unref (ethi->stipple);
-		ethi->stipple = NULL;
-	}
-	
-	if (GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->unrealize)
-		(*GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->unrealize)(item);
-}
-
-static void
-ethi_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, int height)
-{
-	ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item);
-	GnomeCanvas *canvas = item->canvas;
-	const int cols = e_table_header_count (ethi->eth);
-	int x1, x2;
-	int col;
-	GHashTable *arrows = g_hash_table_new (NULL, NULL);
-
-
-	if (ethi->sort_info) {
-		int length = e_table_sort_info_grouping_get_count(ethi->sort_info);
-		int i;
-		for (i = 0; i < length; i++) {
-			ETableSortColumn column = e_table_sort_info_grouping_get_nth(ethi->sort_info, i);
-			g_hash_table_insert (arrows, 
-					     (gpointer) column.column,
-					     (gpointer) (column.ascending ?
-							 E_TABLE_COL_ARROW_UP : 
-							 E_TABLE_COL_ARROW_DOWN));
-		}
-		length = e_table_sort_info_sorting_get_count(ethi->sort_info);
-		for (i = 0; i < length; i++) {
-			ETableSortColumn column = e_table_sort_info_sorting_get_nth(ethi->sort_info, i);
-			g_hash_table_insert (arrows, 
-					     (gpointer) column.column,
-					     (gpointer) (column.ascending ?
-							 E_TABLE_COL_ARROW_UP : 
-							 E_TABLE_COL_ARROW_DOWN));
-		}
-	}
-
-	ethi->width = e_table_header_total_width (ethi->eth) + ethi->group_indent_width;
-	x1 = x2 = 0;
-	x2 += ethi->group_indent_width;
-	for (col = 0; col < cols; col++, x1 = x2){
-		ETableCol *ecol = e_table_header_get_column (ethi->eth, col);
-		int col_width;
-
-		col_width = ecol->width;
-				
-		x2 += col_width;
-		
-		if (x1 > (x + width))
-			break;
-
-		if (x2 < x)
-			continue;
-
-		if (x2 <= x1)
-			continue;
-
-		e_table_header_draw_button (drawable, ecol,
-					    GTK_WIDGET (canvas)->style, ethi->font,
-					    GTK_WIDGET_STATE (canvas),
-					    GTK_WIDGET (canvas), ethi->gc,
-					    x1 - x, -y,
-					    width, height,
-					    x2 - x1, ethi->height,
-					    (ETableColArrow) g_hash_table_lookup (
-						    arrows, (gpointer) ecol->col_idx));
-	}
-
-	g_hash_table_destroy (arrows);
-}
-
-static double
-ethi_point (GnomeCanvasItem *item, double x, double y, int cx, int cy,
-	    GnomeCanvasItem **actual_item)
-{
-	*actual_item = item;
-	return 0.0;
-}
-
-/*
- * is_pointer_on_division:
- *
- * Returns whether @pos is a column header division;  If @the_total is not NULL,
- * then the actual position is returned here.  If @return_ecol is not NULL,
- * then the ETableCol that actually contains this point is returned here
- */
-static gboolean
-is_pointer_on_division (ETableHeaderItem *ethi, int pos, int *the_total, int *return_col)
-{
-	const int cols = e_table_header_count (ethi->eth);
-	int col, total;
-
-	total = 0;
-	for (col = 0; col < cols; col++){
-		ETableCol *ecol = e_table_header_get_column (ethi->eth, col);
-
-		if (col == 0)
-			total += ethi->group_indent_width;
-		
-		total += ecol->width;
-
-		if ((total - TOLERANCE < pos)&& (pos < total + TOLERANCE)){
-			if (return_col)
-				*return_col = col;
-			if (the_total)
-				*the_total = total;
-
-			return TRUE;
-		}
-
-		if (total > pos + TOLERANCE)
-			return FALSE;
-	}
-
-	return FALSE;
-}
-
-#define convert(c,sx,sy,x,y) gnome_canvas_w2c (c,sx,sy,x,y)
-
-static void
-set_cursor (ETableHeaderItem *ethi, int pos)
-{
-	int col;
-	GtkWidget *canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (ethi)->canvas);
-	gboolean resizable = FALSE;
-		
-	/* We might be invoked before we are realized */
-	if (!canvas->window)
-		return;
-
-	if (is_pointer_on_division (ethi, pos, NULL, &col)) {
-		int last_col = ethi->eth->col_count - 1;
-		ETableCol *ecol = e_table_header_get_column (ethi->eth, col);
-
-		/* Last column is not resizable */
-		if (ecol->resizable && col != last_col) {
-			int c = col + 1;
-
-			/* Column is not resizable if all columns after it
-			   are also not resizable */
-			for (; c <= last_col; c++){
-				ETableCol *ecol2;
-
-				ecol2 = e_table_header_get_column (ethi->eth, c);
-				if (ecol2->resizable) {
-					resizable = TRUE;
-					break;
-				}
-			}
-		}
-	}
-	
-	if (resizable)
-		e_cursor_set (canvas->window, E_CURSOR_SIZE_X);
-	else
-		gdk_window_set_cursor (canvas->window, NULL);
-	/*		e_cursor_set (canvas->window, E_CURSOR_ARROW);*/
-}
-
-static void
-ethi_end_resize (ETableHeaderItem *ethi)
-{
-	ethi->resize_col = -1;
-	ethi->resize_guide = GINT_TO_POINTER (0);
-
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM(ethi));
-}
-
-static gboolean
-ethi_maybe_start_drag (ETableHeaderItem *ethi, GdkEventMotion *event)
-{
-	if (!ethi->maybe_drag)
-		return FALSE;
-
-	if (ethi->eth->col_count < 2) {
-		ethi->maybe_drag = FALSE;
-		return FALSE;
-	}
-		
-	if (MAX (abs (ethi->click_x - event->x),
-		 abs (ethi->click_y - event->y)) <= 3)
-		return FALSE;
-
-	return TRUE;
-}
-
-static void
-ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event)
-{
-	GtkWidget *widget = GTK_WIDGET (GNOME_CANVAS_ITEM (ethi)->canvas);
-	GtkTargetList *list;
-	GdkDragContext *context;
-	ETableCol *ecol;
-	int col_width;
-	GdkPixmap *pixmap;
-	int group_indent = 0;
-	GHashTable *arrows = g_hash_table_new (NULL, NULL);
-
-	GtkTargetEntry  ethi_drag_types [] = {
-		{ TARGET_ETABLE_COL_TYPE, 0, TARGET_ETABLE_COL_HEADER },
-	};
-
-	ethi->drag_col = ethi_find_col_by_x (ethi, event->motion.x);
-
-	if (ethi->drag_col == -1)
-		return;
-
-	if (ethi->sort_info) {
-		int length = e_table_sort_info_grouping_get_count(ethi->sort_info);
-		int i;
-		for (i = 0; i < length; i++) {
-			ETableSortColumn column =
-				e_table_sort_info_grouping_get_nth(
-					ethi->sort_info, i);
-			group_indent ++;
-			g_hash_table_insert (
-				arrows, 
-				(gpointer) column.column,
-				(gpointer) (column.ascending ?
-					    E_TABLE_COL_ARROW_UP : 
-					    E_TABLE_COL_ARROW_DOWN));
-		}
-		length = e_table_sort_info_sorting_get_count(ethi->sort_info);
-		for (i = 0; i < length; i++) {
-			ETableSortColumn column =
-				e_table_sort_info_sorting_get_nth (
-					ethi->sort_info, i);
-
-			g_hash_table_insert (
-				arrows, 
-				(gpointer) column.column,
-				(gpointer) (column.ascending ?
-					    E_TABLE_COL_ARROW_UP : 
-					    E_TABLE_COL_ARROW_DOWN));
-		}
-	}
-
-	ethi_drag_types[0].target = g_strdup_printf(
-		"%s-%s", ethi_drag_types[0].target, ethi->dnd_code);
-	list = gtk_target_list_new (
-		ethi_drag_types, ELEMENTS (ethi_drag_types));
-	context = gtk_drag_begin (widget, list, GDK_ACTION_MOVE, 1, event);
-	g_free(ethi_drag_types[0].target);
-
-	ecol = e_table_header_get_column (ethi->eth, ethi->drag_col);
-	col_width = ecol->width;
-	pixmap = gdk_pixmap_new (widget->window, col_width, ethi->height, -1);
-
-	e_table_header_draw_button (
-		pixmap, ecol,
-		widget->style, ethi->font,
-		GTK_WIDGET_STATE (widget),
-		widget, ethi->gc,
-		0, 0,
-		col_width, ethi->height,
-		col_width, ethi->height,
-		(ETableColArrow) g_hash_table_lookup (
-			arrows, (gpointer) ecol->col_idx));
-	gtk_drag_set_icon_pixmap (
-		context,
-		gdk_window_get_colormap (widget->window),
-		pixmap,
-		NULL,
-		col_width / 2,
-		ethi->height / 2);
-	gdk_pixmap_unref (pixmap);
-
-	ethi->maybe_drag = FALSE;
-	g_hash_table_destroy (arrows);
-}
-
-typedef struct {
-	ETableHeaderItem *ethi;
-	int col;
-} EthiHeaderInfo;
-
-static void
-ethi_popup_sort_ascending(GtkWidget *widget, EthiHeaderInfo *info)
-{
-	ETableCol *col;
-	int model_col;
-	int length;
-	int i;
-	int found = FALSE;
-	ETableHeaderItem *ethi = info->ethi;
-
-	col = e_table_header_get_column (ethi->eth, info->col);
-	model_col = col->col_idx;
-
-	length = e_table_sort_info_grouping_get_count(ethi->sort_info);
-	for (i = 0; i < length; i++) {
-		ETableSortColumn column = e_table_sort_info_grouping_get_nth (
-			ethi->sort_info, i);
-
-		if (model_col == column.column){
-			column.ascending = 1;
-			e_table_sort_info_grouping_set_nth (
-				ethi->sort_info, i, column);
-			found = 1;
-			break;
-		}
-	}
-	if (!found) {
-		length = e_table_sort_info_sorting_get_count (
-			ethi->sort_info);
-		for (i = 0; i < length; i++) {
-			ETableSortColumn column =
-				e_table_sort_info_sorting_get_nth(
-					ethi->sort_info, i);
-			if (model_col == column.column){
-				column.ascending = 1;
-				e_table_sort_info_sorting_set_nth (
-					ethi->sort_info, i, column);
-				found = 1;
-				break;
-			}
-		}
-	}
-	if (!found) {
-		ETableSortColumn column;
-		column.column = model_col;
-		column.ascending =  1;
-		length = e_table_sort_info_sorting_get_count(ethi->sort_info);
-		if (length == 0)
-			length++;
-		e_table_sort_info_sorting_set_nth(ethi->sort_info, length - 1, column);
-	}
-}
-
-static void
-ethi_popup_sort_descending(GtkWidget *widget, EthiHeaderInfo *info)
-{
-	ETableCol *col;
-	int model_col;
-	int length;
-	int i;
-	int found = FALSE;
-	ETableHeaderItem *ethi = info->ethi;
-
-	col = e_table_header_get_column (ethi->eth, info->col);
-	model_col = col->col_idx;
-
-	length = e_table_sort_info_grouping_get_count(ethi->sort_info);
-	for (i = 0; i < length; i++) {
-		ETableSortColumn column = e_table_sort_info_grouping_get_nth(
-			ethi->sort_info, i);
-		if (model_col == column.column){
-			column.ascending = 0;
-			e_table_sort_info_grouping_set_nth(
-				ethi->sort_info, i, column);
-			found = 1;
-			break;
-		}
-	}
-	if (!found) {
-		length = e_table_sort_info_sorting_get_count (ethi->sort_info);
-		for (i = 0; i < length; i++) {
-			ETableSortColumn column =
-				e_table_sort_info_sorting_get_nth(
-					ethi->sort_info, i);
-
-			if (model_col == column.column){
-				column.ascending = 0;
-				e_table_sort_info_sorting_set_nth (
-					ethi->sort_info, i, column);
-				found = 1;
-				break;
-			}
-		}
-	}
-	if (!found) {
-		ETableSortColumn column;
-		column.column = model_col;
-		column.ascending = 0;
-		length = e_table_sort_info_sorting_get_count (ethi->sort_info);
-		if (length == 0)
-			length++;
-		e_table_sort_info_sorting_set_nth (
-			ethi->sort_info, length - 1, column);
-	}
-}
-
-static void
-ethi_popup_unsort(GtkWidget *widget, EthiHeaderInfo *info)
-{
-	ETableHeaderItem *ethi = info->ethi;
-
-	e_table_sort_info_grouping_truncate(ethi->sort_info, 0);
-	e_table_sort_info_sorting_truncate(ethi->sort_info, 0);
-}
-
-static void
-ethi_popup_group_field(GtkWidget *widget, EthiHeaderInfo *info)
-{
-	ETableCol *col;
-	int model_col;
-	ETableHeaderItem *ethi = info->ethi;
-	ETableSortColumn column;
-
-	col = e_table_header_get_column (ethi->eth, info->col);
-	model_col = col->col_idx;
-
-	column.column = model_col;
-	column.ascending = 1;
-	e_table_sort_info_grouping_set_nth(ethi->sort_info, 0, column);
-	e_table_sort_info_grouping_truncate(ethi->sort_info, 1);
-}
-
-static void
-ethi_popup_group_box(GtkWidget *widget, EthiHeaderInfo *info)
-{
-}
-
-static void
-ethi_popup_remove_column(GtkWidget *widget, EthiHeaderInfo *info)
-{
-	e_table_header_remove(info->ethi->eth, info->col);
-}
-
-static void
-ethi_popup_field_chooser(GtkWidget *widget, EthiHeaderInfo *info)
-{
-	GtkWidget *etfcd = e_table_field_chooser_dialog_new();
-	gtk_object_set(GTK_OBJECT(etfcd),
-		       "full_header", info->ethi->full_header,
-		       "dnd_code", info->ethi->dnd_code,
-		       NULL);
-	gtk_widget_show(etfcd);
-}
-
-static void
-ethi_popup_alignment(GtkWidget *widget, EthiHeaderInfo *info)
-{
-}
-
-static void
-ethi_popup_best_fit(GtkWidget *widget, EthiHeaderInfo *info)
-{
-	ETableHeaderItem *ethi = info->ethi;
-	int width;
-
-	gtk_signal_emit_by_name (GTK_OBJECT (ethi->eth),
-				 "request_width",
-				 info->col, &width);
-	/* Add 10 to stop it from "..."ing */
-	e_table_header_set_size (ethi->eth, info->col, width + 10);
-	
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM(ethi));
-
-}
-
-static void
-ethi_popup_format_columns(GtkWidget *widget, EthiHeaderInfo *info)
-{
-}
-
-static void
-config_destroyed (GtkObject *object, ETableHeaderItem *ethi)
-{
-	ethi->config = NULL;
-}
-
-static void
-apply_changes (ETableConfig *config, ETableHeaderItem *ethi)
-{
-	char *state = e_table_state_save_to_string (config->state);
-
-	e_table_set_state (ethi->table, state);
-	g_free (state);
-}
-
-static void
-ethi_popup_customize_view(GtkWidget *widget, EthiHeaderInfo *info)
-{
-	ETableHeaderItem *ethi = info->ethi;
-	ETableState *state;
-
-	if (ethi->config)
-		e_table_config_raise (E_TABLE_CONFIG (ethi->config));
-	else {
-		state = e_table_get_state_object(ethi->table);
-
-		ethi->config = e_table_config_new (
-			_("Configuring view: FIXME"),
-			ethi->table->spec, state);
-		gtk_signal_connect (
-			GTK_OBJECT (ethi->config), "destroy",
-			GTK_SIGNAL_FUNC (config_destroyed), ethi);
-		gtk_signal_connect (
-			GTK_OBJECT (ethi->config), "changed",
-			GTK_SIGNAL_FUNC (apply_changes), ethi);
-	}
-}
-
-/* Bit 1 is always disabled. */
-/* Bit 2 is disabled if not "sortable". */
-/* Bit 4 is disabled if we don't have a pointer to our table object. */
-static EPopupMenu ethi_context_menu [] = {
-	{ N_("Sort Ascending"),            NULL, GTK_SIGNAL_FUNC(ethi_popup_sort_ascending),  NULL, 2},
-	{ N_("Sort Descending"),           NULL, GTK_SIGNAL_FUNC(ethi_popup_sort_descending), NULL, 2},
-	{ N_("Unsort"),                    NULL, GTK_SIGNAL_FUNC(ethi_popup_unsort),          NULL, 0},
-	{ "",                              NULL, GTK_SIGNAL_FUNC(NULL),                       NULL, 0},
-	{ N_("Group By This Field"),       NULL, GTK_SIGNAL_FUNC(ethi_popup_group_field),     NULL, 0},
-	{ N_("Group By Box"),              NULL, GTK_SIGNAL_FUNC(ethi_popup_group_box),       NULL, 16},
-	{ "",                              NULL, GTK_SIGNAL_FUNC(NULL),                       NULL, 1},
-	{ N_("Remove This Column"),        NULL, GTK_SIGNAL_FUNC(ethi_popup_remove_column),   NULL, 8},
-	{ N_("Add a Column..."),           NULL, GTK_SIGNAL_FUNC(ethi_popup_field_chooser),   NULL, 0},
-	{ "",                              NULL, GTK_SIGNAL_FUNC(NULL),                       NULL, 1},
-	{ N_("Alignment"),                 NULL, GTK_SIGNAL_FUNC(ethi_popup_alignment),       NULL, 16},
-	{ N_("Best Fit"),                  NULL, GTK_SIGNAL_FUNC(ethi_popup_best_fit),        NULL, 2},
-	{ N_("Format Columns..."),         NULL, GTK_SIGNAL_FUNC(ethi_popup_format_columns),  NULL, 16},
-	{ "",                              NULL, GTK_SIGNAL_FUNC(NULL),                       NULL, 1},
-	{ N_("Customize Current View..."), NULL, GTK_SIGNAL_FUNC(ethi_popup_customize_view),  NULL, 4},
-	{ NULL, NULL, NULL, NULL, 0 }
-};
-
-static void
-ethi_header_context_menu (ETableHeaderItem *ethi, GdkEventButton *event)
-{
-	EthiHeaderInfo *info = g_new(EthiHeaderInfo, 1);
-	ETableCol *col;
-	info->ethi = ethi;
-	info->col = ethi_find_col_by_x (ethi, event->x);
-	col = e_table_header_get_column (ethi->eth, info->col);
-	e_popup_menu_run (ethi_context_menu, (GdkEvent *) event,
-			  1 +
-			  (col->sortable ? 0 : 2) +
-			  (ethi->table ? 0 : 4) + 
-			  ((e_table_header_count (ethi->eth) > 1) ? 0 : 8),
-			  16, info);
-}
-
-static void
-ethi_button_pressed (ETableHeaderItem *ethi, GdkEventButton *event)
-{
-	gtk_signal_emit (GTK_OBJECT (ethi),
-			 ethi_signals [BUTTON_PRESSED], event);
-}
-
-static void
-ethi_change_sort_state (ETableHeaderItem *ethi, gdouble x)
-{
-	ETableCol *col;
-	int model_col;
-	int length;
-	int i;
-	int found = FALSE;
-	
-	col = e_table_header_get_column (ethi->eth, ethi_find_col_by_x (ethi, x));
-
-	if (col == NULL)
-		return;
-
-	model_col = col->col_idx;
-	
-	length = e_table_sort_info_grouping_get_count(ethi->sort_info);
-	for (i = 0; i < length; i++) {
-		ETableSortColumn column = e_table_sort_info_grouping_get_nth(ethi->sort_info, i);
-		if (model_col == column.column){
-			int ascending = column.ascending;
-			ascending = ! ascending;
-			column.ascending = ascending;
-			e_table_sort_info_grouping_set_nth(ethi->sort_info, i, column);
-			found = 1;
-			break;
-		}
-	}
-	
-	if (!col->sortable)
-		return;
-	
-	if (!found) {
-		length = e_table_sort_info_sorting_get_count(ethi->sort_info);
-		for (i = 0; i < length; i++) {
-			ETableSortColumn column = e_table_sort_info_sorting_get_nth(ethi->sort_info, i);
-
-			if (model_col == column.column){
-				int ascending = column.ascending;
-				
-				if (ascending == 0){
-					/*
-					 * This means the user has clicked twice
-					 * already, lets kill sorting now.
-					 */
-					e_table_sort_info_sorting_truncate (ethi->sort_info, i);
-				} else {
-					ascending = !ascending;
-					column.ascending = ascending;
-					e_table_sort_info_sorting_set_nth(ethi->sort_info, i, column);
-				}
-				found = 1;
-				break;
-			}
-		}
-	}
-
-	if (!found) {
-		ETableSortColumn column;
-		column.column = model_col;
-		column.ascending = 1;
-		length = e_table_sort_info_sorting_get_count(ethi->sort_info);
-		if (length == 0)
-			length++;
-		e_table_sort_info_sorting_set_nth(ethi->sort_info, length - 1, column);
-	}
-}
-
-/*
- * Handles the events on the ETableHeaderItem, particularly it handles resizing
- */
-static int
-ethi_event (GnomeCanvasItem *item, GdkEvent *e)
-{
-	ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item);
-	GnomeCanvas *canvas = item->canvas;
-	const gboolean resizing = ETHI_RESIZING (ethi);
-	int x, y, start, col;
-	int was_maybe_drag = 0;
-	
-	switch (e->type){
-	case GDK_ENTER_NOTIFY:
-		convert (canvas, e->crossing.x, e->crossing.y, &x, &y);
-		set_cursor (ethi, x);
-		break;
-
-	case GDK_LEAVE_NOTIFY:
-		gdk_window_set_cursor (GTK_WIDGET (canvas)->window, NULL);
-		/*		e_cursor_set (GTK_WIDGET (canvas)->window, E_CURSOR_ARROW);*/
-		break;
-			    
-	case GDK_MOTION_NOTIFY:
-
-		convert (canvas, e->motion.x, e->motion.y, &x, &y);
-		if (resizing){
-			int new_width;
-			
-			if (ethi->resize_guide == NULL){
-				/* Quick hack until I actually bind the views */
-				ethi->resize_guide = GINT_TO_POINTER (1);
-				
-				gnome_canvas_item_grab (item,
-							GDK_POINTER_MOTION_MASK |
-							GDK_BUTTON_RELEASE_MASK,
-							e_cursor_get (E_CURSOR_SIZE_X),
-							e->button.time);
-			}
-
-			new_width = x - ethi->resize_start_pos;
-
-			e_table_header_set_size (ethi->eth, ethi->resize_col, new_width);
-
-			gnome_canvas_item_request_update (GNOME_CANVAS_ITEM(ethi));
-		} else if (ethi_maybe_start_drag (ethi, &e->motion)){
-			ethi_start_drag (ethi, e);
-		} else
-			set_cursor (ethi, x);
-		break;
-		
-	case GDK_BUTTON_PRESS:
-		if (e->button.button > 3)
-			return FALSE;
-
-		convert (canvas, e->button.x, e->button.y, &x, &y);
-		    
-		if (is_pointer_on_division (ethi, x, &start, &col) && e->button.button == 1){
-			ETableCol *ecol;
-				
-				/*
-				 * Record the important bits.
-				 *
-				 * By setting resize_pos to a non -1 value,
-				 * we know that we are being resized (used in the
-				 * other event handlers).
-				 */
-			ecol = e_table_header_get_column (ethi->eth, col);
-			
-			if (!ecol->resizable)
-				break;
-			ethi->resize_col = col;
-			ethi->resize_start_pos = start - ecol->width;
-			ethi->resize_min_width = ecol->min_width;
-		} else {
-			if (e->button.button == 1){
-				ethi->click_x = e->button.x;
-				ethi->click_y = e->button.y;
-				ethi->maybe_drag = TRUE;
-			} else if (e->button.button == 3){
-				ethi_header_context_menu (ethi, &e->button);
-			} else
-				ethi_button_pressed (ethi, &e->button);
-		}
-		break;
-		
-	case GDK_2BUTTON_PRESS:
-		if (!resizing)
-			break;
-		
-		if (e->button.button != 1)
-			break;
-		else {
-			int width = 0;
-			gtk_signal_emit_by_name (GTK_OBJECT (ethi->eth),
-						 "request_width",
-						 (int)ethi->resize_col, &width);
-			/* Add 10 to stop it from "..."ing */
-			e_table_header_set_size (ethi->eth, ethi->resize_col, width + 10);
-
-			gnome_canvas_item_request_update (GNOME_CANVAS_ITEM(ethi));
-			ethi->maybe_drag = FALSE;
-		}
-		break;
-		
-	case GDK_BUTTON_RELEASE: {
-		gboolean needs_ungrab = FALSE;
-		
-		was_maybe_drag = ethi->maybe_drag;
-		
-		ethi->maybe_drag = FALSE;
-
-		if (ethi->resize_col != -1){
-			needs_ungrab = (ethi->resize_guide != NULL);
-			ethi_end_resize (ethi);
-		} else if (was_maybe_drag && ethi->sort_info) 
-			ethi_change_sort_state (ethi, e->button.x);
-		
-		if (needs_ungrab)
-			gnome_canvas_item_ungrab (item, e->button.time);
-
-		break;
-	}
-	
-	default:
-		return FALSE;
-	}
-	return TRUE;
-}
-
-static void
-ethi_class_init (GtkObjectClass *object_class)
-{
-	GnomeCanvasItemClass *item_class = (GnomeCanvasItemClass *) object_class;
-
-	ethi_parent_class = gtk_type_class (PARENT_OBJECT_TYPE);
-	
-	object_class->destroy = ethi_destroy;
-	object_class->set_arg = ethi_set_arg;
-	object_class->get_arg = ethi_get_arg;
-
-	item_class->update      = ethi_update;
-	item_class->realize     = ethi_realize;
-	item_class->unrealize   = ethi_unrealize;
-	item_class->draw        = ethi_draw;
-	item_class->point       = ethi_point;
-	item_class->event       = ethi_event;
-	
-	gtk_object_add_arg_type ("ETableHeaderItem::ETableHeader", GTK_TYPE_OBJECT,
-				 GTK_ARG_WRITABLE, ARG_TABLE_HEADER);
-	gtk_object_add_arg_type ("ETableHeaderItem::full_header", GTK_TYPE_OBJECT,
-				 GTK_ARG_READWRITE, ARG_FULL_HEADER);
-	gtk_object_add_arg_type ("ETableHeaderItem::dnd_code", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_DND_CODE);
-	gtk_object_add_arg_type ("ETableHeaderItem::fontset", GTK_TYPE_STRING,
-				 GTK_ARG_WRITABLE, ARG_TABLE_FONTSET);
-	gtk_object_add_arg_type ("ETableHeaderItem::sort_info", GTK_TYPE_OBJECT,
-				 GTK_ARG_WRITABLE, ARG_SORT_INFO);
-	gtk_object_add_arg_type ("ETableHeaderItem::table", GTK_TYPE_OBJECT,
-				 GTK_ARG_WRITABLE, ARG_TABLE);
-
-	/*
-	 * Create our pixmaps for DnD
-	 */
-	dnd_colormap = gtk_widget_get_default_colormap ();
-	remove_col_pixmap = gdk_pixmap_colormap_create_from_xpm_d (
-		NULL, dnd_colormap,
-		&remove_col_mask, NULL, remove_col_xpm);
-
-	add_col_pixmap = gdk_pixmap_colormap_create_from_xpm_d (
-		NULL, dnd_colormap,
-		&add_col_mask, NULL, add_col_xpm);
-
-	ethi_signals [BUTTON_PRESSED] =
-		gtk_signal_new ("button_pressed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableHeaderItemClass, button_pressed),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1, GTK_TYPE_GDK_EVENT);
-		
-	gtk_object_class_add_signals (object_class, ethi_signals, LAST_SIGNAL);
-}
-
-static void
-ethi_init (GnomeCanvasItem *item)
-{
-	ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item);
-
-	ethi->resize_col = -1;
-
-	item->x1 = 0;
-	item->y1 = 0;
-	item->x2 = 0;
-	item->y2 = 0;
-
-	ethi->drag_col = -1;
-	ethi->drag_mark = -1;
-	
-	ethi->sort_info = NULL;
-
-	ethi->sort_info_changed_id = 0;
-	ethi->group_info_changed_id = 0;
-
-	ethi->group_indent_width = 0;
-	ethi->table = NULL;
-}
-
-GtkType
-e_table_header_item_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"ETableHeaderItem",
-			sizeof (ETableHeaderItem),
-			sizeof (ETableHeaderItemClass),
-			(GtkClassInitFunc) ethi_class_init,
-			(GtkObjectInitFunc) ethi_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_OBJECT_TYPE, &info);
-	}
-
-	return type;
-}
-
diff --git a/widgets/table/e-table-header-item.h b/widgets/table/e-table-header-item.h
deleted file mode 100644
index 6186037d5d..0000000000
--- a/widgets/table/e-table-header-item.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_HEADER_ITEM_H_
-#define _E_TABLE_HEADER_ITEM_H_
-
-#include <gal/e-table/e-table.h>
-#include <libgnomeui/gnome-canvas.h>
-#include <gnome-xml/tree.h>
-#include <gal/e-table/e-table-header.h>
-#include <gal/e-table/e-table-sort-info.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TABLE_HEADER_ITEM_TYPE        (e_table_header_item_get_type ())
-#define E_TABLE_HEADER_ITEM(o)          (GTK_CHECK_CAST ((o), E_TABLE_HEADER_ITEM_TYPE, ETableHeaderItem))
-#define E_TABLE_HEADER_ITEM_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_HEADER_ITEM_TYPE, ETableHeaderItemClass))
-#define E_IS_TABLE_HEADER_ITEM(o)       (GTK_CHECK_TYPE ((o), E_TABLE_HEADER_ITEM_TYPE))
-#define E_IS_TABLE_HEADER_ITEM_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_HEADER_ITEM_TYPE))
-
-typedef struct {
-	GnomeCanvasItem  parent;
-	ETableHeader    *eth;
-
-	GdkGC           *gc;
-	GdkCursor       *change_cursor;
-
-	short            height, width;
-	GdkFont         *font;
-
-	/*
-	 * Used during resizing;  Could be shorts
-	 */
-	int              resize_col;
-	int              resize_start_pos;
-	int              resize_min_width;
-	
-	GtkObject       *resize_guide;
-
-	int              group_indent_width;
-
-	/*
-	 * Ids
-	 */
-	int structure_change_id, dimension_change_id;
-
-	/*
-	 * For dragging columns
-	 */
-	guint            maybe_drag:1;
-	guint            dnd_ready:1;
-	int              click_x, click_y;
-	int              drag_col, drop_col, drag_mark;
-        guint            drag_motion_id, drag_end_id, drag_leave_id, drag_drop_id, drag_data_received_id, drag_data_get_id;
-	guint            sort_info_changed_id, group_info_changed_id;
-	GnomeCanvasItem *remove_item;
-	GdkBitmap       *stipple;
-
-	gchar           *dnd_code;
-
-	/*
-	 * For column sorting info
-	 */
-	ETableSortInfo  *sort_info;
-	
-	/* For adding fields. */
-	ETableHeader    *full_header;
-	ETable          *table;
-	void            *config;
-} ETableHeaderItem;
-
-typedef struct {
-	GnomeCanvasItemClass parent_class;
-
-	/*
-	 * signals
-	 */
-	void (*button_pressed) (ETableHeaderItem *ethi, GdkEventButton *button);
-} ETableHeaderItemClass;
-
-GtkType    e_table_header_item_get_type (void);
-
-END_GNOME_DECLS
-
-#endif /* _E_TABLE_HEADER_ITEM_H_ */
diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c
deleted file mode 100644
index 0933359206..0000000000
--- a/widgets/table/e-table-header-utils.c
+++ /dev/null
@@ -1,451 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* ETable widget - utilities for drawing table header buttons
- *
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Chris Lahey <clahey@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h> /* strlen() */
-#include <glib.h>
-#include "e-table-defines.h"
-#include "e-table-header-utils.h"
-
-
-
-/**
- * e_table_header_compute_height:
- * @ecol: Table column description.
- * @style: Style for the button's bevel.
- * @font: Font for the button's text, or NULL if no font is available.
- *
- * Computes the minimum height required for a table header button.
- *
- * Return value: The height of the button, in pixels.
- **/
-double
-e_table_header_compute_height (ETableCol *ecol, GtkStyle *style, GdkFont *font)
-{
-	int ythick;
-	int height;
-
-	g_return_val_if_fail (ecol != NULL, -1);
-	g_return_val_if_fail (E_IS_TABLE_COL (ecol), -1);
-	g_return_val_if_fail (style != NULL, -1);
-
-	ythick = style->klass->ythickness;
-
-	if (font)
-		height = font->ascent + font->descent;
-	else
-		height = 16; /* FIXME: default? */
-
-	if (ecol->is_pixbuf) {
-		g_assert (ecol->pixbuf != NULL);
-		height = MAX (height, gdk_pixbuf_get_height (ecol->pixbuf));
-	}
-
-	height = MAX (height, MIN_ARROW_SIZE);
-
-	height += 2 * (ythick + HEADER_PADDING);
-
-	return height;
-}
-
-double
-e_table_header_width_extras (GtkStyle *style)
-{
-	g_return_val_if_fail (style != NULL, -1);
-
-	return 2 * (style->klass->xthickness + HEADER_PADDING);
-}
-
-/* Creates a pixmap that is a composite of a background color and the upper-left
- * corner rectangle of a pixbuf.
- */
-static GdkPixmap *
-make_composite_pixmap (GdkDrawable *drawable, GdkGC *gc,
-		       GdkPixbuf *pixbuf, GdkColor *bg, int width, int height,
-		       int dither_xofs, int dither_yofs)
-{
-	int pwidth, pheight;
-	GdkPixmap *pixmap;
-	GdkPixbuf *tmp;
-	int color;
-
-	pwidth = gdk_pixbuf_get_width (pixbuf);
-	pheight = gdk_pixbuf_get_height (pixbuf);
-	g_assert (width <= pwidth && height <= pheight);
-
-	color = ((bg->red & 0xff00) << 8) | (bg->green & 0xff00) | ((bg->blue & 0xff00) >> 8);
-
-	if (width >= pwidth && height >= pheight) {
-		tmp = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height);
-		if (!tmp)
-			return NULL;
-
-		gdk_pixbuf_composite_color (pixbuf, tmp,
-					    0, 0,
-					    width, height,
-					    0, 0,
-					    1.0, 1.0,
-					    GDK_INTERP_NEAREST,
-					    255,
-					    0, 0,
-					    16,
-					    color, color);
-	} else {
-		int x, y, rowstride;
-		GdkPixbuf *fade;
-		guchar *pixels;
-
-		/* Do a nice fade of the pixbuf down and to the right */
-
-		fade = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, width, height);
-		if (!fade)
-			return NULL;
-
-		gdk_pixbuf_copy_area (pixbuf,
-				      0, 0,
-				      width, height,
-				      fade,
-				      0, 0);
-
-		rowstride = gdk_pixbuf_get_rowstride (fade);
-		pixels = gdk_pixbuf_get_pixels (fade);
-
-		for (y = 0; y < height; y++) {
-			guchar *p;
-			int yfactor;
-
-			p = pixels + y * rowstride;
-
-			if (height < pheight)
-				yfactor = height - y;
-			else
-				yfactor = height;
-
-			for (x = 0; x < width; x++) {
-				int xfactor;
-
-				if (width < pwidth)
-					xfactor = width - x;
-				else
-					xfactor = width;
-
-				p[3] = ((int) p[3] * xfactor * yfactor / (width * height));
-				p += 4;
-			}
-		}
-
-		tmp = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height);
-		if (!tmp) {
-			gdk_pixbuf_unref (fade);
-			return NULL;
-		}
-
-		gdk_pixbuf_composite_color (fade, tmp,
-					    0, 0,
-					    width, height,
-					    0, 0,
-					    1.0, 1.0,
-					    GDK_INTERP_NEAREST,
-					    255,
-					    0, 0,
-					    16,
-					    color, color);
-
-		gdk_pixbuf_unref (fade);
-	}
-
-	pixmap = gdk_pixmap_new (drawable, width, height, gdk_rgb_get_visual ()->depth);
-	gdk_draw_rgb_image_dithalign (pixmap, gc,
-				      0, 0,
-				      width, height,
-				      GDK_RGB_DITHER_NORMAL,
-				      gdk_pixbuf_get_pixels (tmp),
-				      gdk_pixbuf_get_rowstride (tmp),
-				      dither_xofs, dither_yofs);
-	gdk_pixbuf_unref (tmp);
-
-	return pixmap;
-}
-
-/**
- * e_table_header_draw_button:
- * @drawable: Destination drawable.
- * @ecol: Table column for the header information.
- * @style: Style to use for drawing the button.
- * @font: Font for the button's text.
- * @state: State of the table widget.
- * @widget: The table widget.
- * @gc: GC to use for drawing.
- * @x: Leftmost coordinate of the button.
- * @y: Topmost coordinate of the button.
- * @width: Width of the region to draw.
- * @height: Height of the region to draw.
- * @button_width: Width for the complete button.
- * @button_height: Height for the complete button.
- * @arrow: Arrow type to use as a sort indicator.
- * 
- * Draws a button suitable for a table header.
- **/
-void
-e_table_header_draw_button (GdkDrawable *drawable, ETableCol *ecol,
-			    GtkStyle *style, GdkFont *font, GtkStateType state,
-			    GtkWidget *widget, GdkGC *gc,
-			    int x, int y, int width, int height,
-			    int button_width, int button_height,
-			    ETableColArrow arrow)
-{
-	int xthick, ythick;
-	int inner_x, inner_y;
-	int inner_width, inner_height;
-
-	g_return_if_fail (drawable != NULL);
-	g_return_if_fail (ecol != NULL);
-	g_return_if_fail (E_IS_TABLE_COL (ecol));
-	g_return_if_fail (style != NULL);
-	g_return_if_fail (font != NULL);
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (GTK_IS_WIDGET (widget));
-	g_return_if_fail (button_width > 0 && button_height > 0);
-
-	xthick = style->klass->xthickness;
-	ythick = style->klass->ythickness;
-
-	/* Button bevel */
-
-	gtk_paint_box (style, drawable, state, GTK_SHADOW_OUT,
-		       NULL, widget, "button",
-		       x, y, button_width, button_height);
-
-	/* Inside area */
-
-	inner_width = button_width - 2 * (xthick + HEADER_PADDING);
-	inner_height = button_height - 2 * (ythick + HEADER_PADDING);
-
-	if (inner_width < 1 || inner_height < 1)
-		return; /* nothing fits */
-
-	inner_x = x + xthick + HEADER_PADDING;
-	inner_y = y + ythick + HEADER_PADDING;
-
-	/* Arrow */
-
-	switch (arrow) {
-	case E_TABLE_COL_ARROW_NONE:
-		break;
-
-	case E_TABLE_COL_ARROW_UP:
-	case E_TABLE_COL_ARROW_DOWN: {
-		int arrow_width, arrow_height;
-
-		arrow_width = MIN (MIN_ARROW_SIZE, inner_width);
-		arrow_height = MIN (MIN_ARROW_SIZE, inner_height);
-
-		gtk_paint_arrow (style, drawable, state,
-				 GTK_SHADOW_IN, NULL, widget, "header",
-				 (arrow == E_TABLE_COL_ARROW_UP) ? GTK_ARROW_UP : GTK_ARROW_DOWN,
-				 TRUE,
-				 inner_x + inner_width - arrow_width,
-				 inner_y + (inner_height - arrow_height) / 2,
-				 arrow_width, arrow_height);
-
-		inner_width -= arrow_width + HEADER_PADDING;
-		break;
-	}
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	if (inner_width < 1)
-		return; /* nothing else fits */
-
-	/* Pixbuf or label */
-
-	if (ecol->is_pixbuf) {
-		int pwidth, pheight;
-		int clip_width, clip_height;
-		int xpos;
-		GdkPixmap *pixmap;
-
-		g_assert (ecol->pixbuf != NULL);
-
-		pwidth = gdk_pixbuf_get_width (ecol->pixbuf);
-		pheight = gdk_pixbuf_get_height (ecol->pixbuf);
-
-		clip_width = MIN (pwidth, inner_width);
-		clip_height = MIN (pheight, inner_height);
-
-		xpos = inner_x;
-
-		if (inner_width - pwidth > 11) {
-			int rbearing;
-			int width;
-			int ypos;
-
-			gdk_string_extents (font, ecol->text, NULL, &rbearing, &width, NULL, NULL);
-			if (rbearing < inner_width - (pwidth + 1)) {
-				xpos = inner_x + (inner_width - width - (pwidth + 1)) / 2;
-			}
-
-			ypos = inner_y + (inner_height - font->ascent - font->descent) / 2 + font->ascent;
-
-			e_table_draw_elided_string (drawable, font, gc,
-						    xpos + pwidth + 1, ypos,
-						    ecol->text, inner_width - (xpos - inner_x), FALSE);
-		}
-
-		pixmap = make_composite_pixmap (drawable, gc,
-						ecol->pixbuf, &style->bg[state],
-						clip_width, clip_height,
-						xpos,
-						inner_y + (inner_height - clip_height) / 2);
-		if (pixmap) {
-			gdk_draw_pixmap (drawable, gc, pixmap,
-					 0, 0,
-					 xpos,
-					 inner_y + (inner_height - clip_height) / 2,
-					 clip_width, clip_height);
-			gdk_pixmap_unref (pixmap);
-		}
-	} else {
-		int ypos;
-
-		ypos = inner_y + (inner_height - font->ascent - font->descent) / 2 + font->ascent;
-
-		e_table_draw_elided_string (drawable, font, gc,
-					    inner_x, ypos,
-					    ecol->text, inner_width, TRUE);
-	}
-}
-
-/* Computes the length of a string that needs to be trimmed for elision */
-static int
-compute_elision_length (GdkFont *font, const char *str, int max_width)
-{
-	int len;
-	int l = 0, left, right;
-	int rbearing;
-
-	len = strlen (str);
-
-	if (len <= 0)
-	  return 0;
-
-	left = 0;
-	right = len;
-
-	while (left < right) {
-		l = (left + right) / 2;
-		gdk_text_extents (font, str, l, NULL, &rbearing, NULL, NULL, NULL);
-
-		if (rbearing < max_width)
-			left = l + 1;
-		else if (rbearing > max_width)
-			right = l;
-		else
-			return l;
-	}
-
-	if (rbearing > max_width)
-		return MAX (0, l - 1);
-	else
-		return l;
-}
-
-/* Default width of the elision arrow in pixels */
-#define ARROW_WIDTH 4
-
-/**
- * e_table_draw_elided_string:
- * @drawable: Destination drawable.
- * @font: Font for the text.
- * @gc: GC to use for drawing.
- * @x: X insertion point for the string.
- * @y: Y insertion point for the string's baseline.
- * @str: String to draw.
- * @max_width: Maximum width in which the string must fit.
- * @center: Whether to center the string in the available area if it does fit.
- * 
- * Draws a string, possibly trimming it so that it fits inside the specified
- * maximum width.  If it does not fit, an elision indicator is drawn after the
- * last character that does fit.
- **/
-void
-e_table_draw_elided_string (GdkDrawable *drawable, GdkFont *font, GdkGC *gc,
-			    int x, int y, const char *str, int max_width, gboolean center)
-{
-	int rbearing;
-	int width;
-
-	g_return_if_fail (drawable != NULL);
-	g_return_if_fail (font != NULL);
-	g_return_if_fail (gc != NULL);
-	g_return_if_fail (str != NULL);
-	g_return_if_fail (max_width >= 0);
-
-	gdk_string_extents (font, str, NULL, &rbearing, &width, NULL, NULL);
-
-	if (rbearing <= max_width) {
-		int xpos;
-
-		if (center)
-			xpos = x + (max_width - width) / 2;
-		else
-			xpos = x;
-
-		gdk_draw_string (drawable, font, gc, xpos, y, str);
-	} else {
-		int arrow_width;
-		int len;
-		int i;
-
-		if (max_width < ARROW_WIDTH + 1)
-			arrow_width = max_width - 1;
-		else
-			arrow_width = ARROW_WIDTH;
-
-		len = compute_elision_length (font, str, max_width - arrow_width - 1);
-		gdk_draw_text (drawable, font, gc, x, y, str, len);
-
-		gdk_text_extents (font, str, len, NULL, &rbearing, NULL, NULL, NULL);
-
-		y -= font->ascent;
-
-		for (i = 0; i < arrow_width; i++) {
-			int h;
-
-			h = 2 * i + 1;
-
-			gdk_draw_line (drawable, gc,
-				       x + rbearing + arrow_width - i,
-				       y + (font->ascent + font->descent - h) / 2,
-				       x + rbearing + arrow_width - i,
-				       y + (font->ascent + font->descent - h) / 2 + h - 1);
-		}
-	}
-}
diff --git a/widgets/table/e-table-header-utils.h b/widgets/table/e-table-header-utils.h
deleted file mode 100644
index 62f66e4bd3..0000000000
--- a/widgets/table/e-table-header-utils.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ETable widget - utilities for drawing table header buttons
- *
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Chris Lahey <clahey@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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.
- */
-
-#ifndef E_TABLE_HEADER_UTILS_H
-#define E_TABLE_HEADER_UTILS_H
-
-#include <gal/e-table/e-table-col.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-double  e_table_header_compute_height  (ETableCol      *ecol,
-					GtkStyle       *style,
-					GdkFont        *font);
-double  e_table_header_width_extras    (GtkStyle       *style);
-void    e_table_header_draw_button     (GdkDrawable    *drawable,
-					ETableCol      *ecol,
-					GtkStyle       *style,
-					GdkFont        *font,
-					GtkStateType    state,
-					GtkWidget      *widget,
-					GdkGC          *gc,
-					int             x,
-					int             y,
-					int             width,
-					int             height,
-					int             button_width,
-					int             button_height,
-					ETableColArrow  arrow);
-void    e_table_draw_elided_string     (GdkDrawable    *drawable,
-					GdkFont        *font,
-					GdkGC          *gc,
-					int             x,
-					int             y,
-					const char     *str,
-					int             max_width,
-					gboolean        center);
-				 
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c
deleted file mode 100644
index 56c7bed164..0000000000
--- a/widgets/table/e-table-header.c
+++ /dev/null
@@ -1,834 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-col-head.c: TableColHead implementation
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * (C) 1999 Ximian, Inc
- */
-#include <config.h>
-#include <string.h>
-#include <gtk/gtkobject.h>
-#include <gtk/gtksignal.h>
-#include "e-table-header.h"
-#include "e-table-defines.h"
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_SORT_INFO,
-	ARG_WIDTH,
-	ARG_WIDTH_EXTRAS,
-};
-
-enum {
-	STRUCTURE_CHANGE,
-	DIMENSION_CHANGE,
-	REQUEST_WIDTH,
-	LAST_SIGNAL
-};
-
-static void eth_set_size (ETableHeader *eth, int idx, int size);
-static void eth_calc_widths (ETableHeader *eth);
-
-static guint eth_signals [LAST_SIGNAL] = { 0, };
-
-static GtkObjectClass *e_table_header_parent_class;
-
-struct two_ints {
-	int column;
-	int width;
-};
-
-static void
-eth_set_width (ETableHeader *eth, int width)
-{
-	eth->width = width;
-}
-
-static void
-dequeue (ETableHeader *eth, int *column, int *width)
-{
-	GSList *head;
-	struct two_ints *store;
-	head = eth->change_queue;
-	eth->change_queue = eth->change_queue->next;
-	if (!eth->change_queue)
-		eth->change_tail = NULL;
-	store = head->data;
-	g_slist_free_1(head);
-	if (column)
-		*column = store->column;
-	if (width)
-		*width = store->width;
-	g_free(store);
-}
-
-static gboolean
-dequeue_idle (ETableHeader *eth)
-{
-	int column, width;
-
-	dequeue (eth, &column, &width);
-	while (eth->change_queue && ((struct two_ints *) eth->change_queue->data)->column == column)
-		dequeue (eth, &column, &width);
-
-	if (column == -1)
-		eth_set_width (eth, width);
-	else if (column < eth->col_count)
-		eth_set_size (eth, column, width);
-	if (eth->change_queue)
-		return TRUE;
-	else {
-		eth_calc_widths (eth);
-		eth->idle = 0;
-		return FALSE;
-	}
-}
-
-static void
-enqueue (ETableHeader *eth, int column, int width)
-{
-	struct two_ints *store;
-	store = g_new(struct two_ints, 1);
-	store->column = column;
-	store->width = width;
-	
-	eth->change_tail = g_slist_last(g_slist_append(eth->change_tail, store));
-	if (!eth->change_queue)
-		eth->change_queue = eth->change_tail;
-
-	if (!eth->idle) {
-		eth->idle = g_idle_add_full(G_PRIORITY_LOW, (GSourceFunc) dequeue_idle, eth, NULL);
-	}
-}
-
-void
-e_table_header_set_size (ETableHeader *eth, int idx, int size)
-{
-	g_return_if_fail (eth != NULL);
-	g_return_if_fail (E_IS_TABLE_HEADER (eth));
-
-	enqueue (eth, idx, size);
-}
-
-static void
-eth_do_remove (ETableHeader *eth, int idx, gboolean do_unref)
-{
-	if (do_unref)
-		gtk_object_unref (GTK_OBJECT (eth->columns [idx]));
-	
-	memmove (&eth->columns [idx], &eth->columns [idx+1],
-		 sizeof (ETableCol *) * (eth->col_count - idx - 1));
-	eth->col_count--;
-}
-
-static void
-eth_destroy (GtkObject *object)
-{
-	ETableHeader *eth = E_TABLE_HEADER (object);
-	const int cols = eth->col_count;
-	int i;
-	
-	if (eth->sort_info) {
-		if (eth->sort_info_group_change_id)
-			gtk_signal_disconnect(GTK_OBJECT(eth->sort_info),
-					      eth->sort_info_group_change_id);
-		gtk_object_unref(GTK_OBJECT(eth->sort_info));
-	}
-
-	if (eth->idle)
-		g_source_remove(eth->idle);
-	g_slist_foreach(eth->change_queue, (GFunc) g_free, NULL);
-	g_slist_free(eth->change_queue);
-	
-	/*
-	 * Destroy columns
-	 */
-	for (i = cols - 1; i >= 0; i--){
-		eth_do_remove (eth, i, TRUE);
-	}
-	g_free (eth->columns);
-
-	if (e_table_header_parent_class->destroy)
-		e_table_header_parent_class->destroy (object);
-}
-
-static void
-eth_group_info_changed(ETableSortInfo *info, ETableHeader *eth)
-{
-	enqueue(eth, -1, eth->nominal_width);
-}
-
-static void
-eth_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ETableHeader *eth = E_TABLE_HEADER (object);
-
-	switch (arg_id) {
-	case ARG_WIDTH:
-		eth->nominal_width = GTK_VALUE_DOUBLE (*arg);
-		enqueue(eth, -1, GTK_VALUE_DOUBLE (*arg));
-		break;
-	case ARG_WIDTH_EXTRAS:
-		eth->width_extras = GTK_VALUE_DOUBLE (*arg);
-		enqueue(eth, -1, eth->nominal_width);
-		break;
-	case ARG_SORT_INFO:
-		if (eth->sort_info) {
-			if (eth->sort_info_group_change_id)
-				gtk_signal_disconnect(GTK_OBJECT(eth->sort_info), eth->sort_info_group_change_id);
-			gtk_object_unref(GTK_OBJECT(eth->sort_info));
-		}
-		eth->sort_info = E_TABLE_SORT_INFO(GTK_VALUE_OBJECT (*arg));
-		if (eth->sort_info) {
-			gtk_object_ref(GTK_OBJECT(eth->sort_info));
-			eth->sort_info_group_change_id 
-				= gtk_signal_connect(GTK_OBJECT(eth->sort_info), "group_info_changed",
-						     GTK_SIGNAL_FUNC(eth_group_info_changed), eth);
-		}
-		enqueue(eth, -1, eth->nominal_width);
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-eth_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ETableHeader *eth = E_TABLE_HEADER (object);
-
-	switch (arg_id) {
-	case ARG_SORT_INFO:
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(eth->sort_info);
-		break;
-	case ARG_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = eth->nominal_width;
-		break;
-	case ARG_WIDTH_EXTRAS:
-		GTK_VALUE_DOUBLE (*arg) = eth->width_extras;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-e_table_header_class_init (GtkObjectClass *object_class)
-{
-	object_class->destroy = eth_destroy;
-	object_class->set_arg = eth_set_arg;
-	object_class->get_arg = eth_get_arg;
-
-
-	e_table_header_parent_class = (gtk_type_class (gtk_object_get_type ()));
-
-	gtk_object_add_arg_type ("ETableHeader::width", GTK_TYPE_DOUBLE, 
-				 GTK_ARG_READWRITE, ARG_WIDTH); 
-	gtk_object_add_arg_type ("ETableHeader::width_extras", GTK_TYPE_DOUBLE, 
-				 GTK_ARG_READWRITE, ARG_WIDTH_EXTRAS); 
-	gtk_object_add_arg_type ("ETableHeader::sort_info", GTK_TYPE_OBJECT, 
-				 GTK_ARG_READWRITE, ARG_SORT_INFO); 
-
-	eth_signals [STRUCTURE_CHANGE] =
-		gtk_signal_new ("structure_change",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableHeaderClass, structure_change),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-	eth_signals [DIMENSION_CHANGE] = 
-		gtk_signal_new ("dimension_change", 
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableHeaderClass, dimension_change),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
-	eth_signals [REQUEST_WIDTH] = 
-		gtk_signal_new ("request_width",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableHeaderClass, request_width),
-				gtk_marshal_INT__INT,
-				GTK_TYPE_INT, 1, GTK_TYPE_INT);
-
-	gtk_object_class_add_signals (object_class, eth_signals, LAST_SIGNAL);
-}
-
-static void
-e_table_header_init (ETableHeader *eth)
-{
-	eth->col_count                 = 0;
-	eth->width                     = 0;
-
-	eth->sort_info                 = NULL;
-	eth->sort_info_group_change_id = 0;
-
-	eth->columns                   = NULL;
-	
-	eth->change_queue              = NULL;
-	eth->change_tail               = NULL;
-
-	eth->width_extras              = 0;
-}
-
-/**
- * e_table_header_new:
- *
- * Returns: A new @ETableHeader object.
- */
-ETableHeader *
-e_table_header_new (void)
-{
-	ETableHeader *eth;
-
-	eth = gtk_type_new (e_table_header_get_type ());
-
-	return eth;
-}
-
-static void
-eth_update_offsets (ETableHeader *eth)
-{
-	int i;
-	int x = 0;
-	
-	for (i = 0; i < eth->col_count; i++){
-		ETableCol *etc = eth->columns [i];
-
-		etc->x = x;
-		x += etc->width;
-	}
-}
-
-static void
-eth_do_insert (ETableHeader *eth, int pos, ETableCol *val)
-{
-	memmove (&eth->columns [pos+1], &eth->columns [pos],
-		sizeof (ETableCol *) * (eth->col_count - pos));
-	eth->columns [pos] = val;
-	eth->col_count ++;
-}
-
-/**
- * e_table_header_add_column:
- * @eth: the table header to add the column to.
- * @tc: the ETableCol definition
- * @pos: position where the ETableCol will go.
- *
- * This function adds the @tc ETableCol definition into the @eth ETableHeader
- * at position @pos.  This is the way you add new ETableCols to the
- * ETableHeader.
- *
- * This function will emit the "structure_change" signal on the @eth object.
- * The ETableCol is assumed 
- */
-void
-e_table_header_add_column (ETableHeader *eth, ETableCol *tc, int pos)
-{
-	g_return_if_fail (eth != NULL);
-	g_return_if_fail (E_IS_TABLE_HEADER (eth));
-	g_return_if_fail (tc != NULL);
-	g_return_if_fail (E_IS_TABLE_COL (tc));
-	g_return_if_fail (pos >= -1 && pos <= eth->col_count);
-
-	if (pos == -1)
-		pos = eth->col_count;
-	eth->columns = g_realloc (eth->columns, sizeof (ETableCol *) * (eth->col_count + 1));
-
-	/*
-	 * We are the primary owners of the column
-	 */
-	gtk_object_ref (GTK_OBJECT (tc));
-	gtk_object_sink (GTK_OBJECT (tc));
-	
-	eth_do_insert (eth, pos, tc);
-
-	enqueue(eth, -1, eth->nominal_width);
-	gtk_signal_emit (GTK_OBJECT (eth), eth_signals [STRUCTURE_CHANGE]);
-}
-
-/**
- * e_table_header_get_column:
- * @eth: the ETableHeader to query
- * @column: the column inside the @eth.
- *
- * Returns: The ETableCol at @column in the @eth object
- */
-ETableCol *
-e_table_header_get_column (ETableHeader *eth, int column)
-{
-	g_return_val_if_fail (eth != NULL, NULL);
-	g_return_val_if_fail (E_IS_TABLE_HEADER (eth), NULL);
-
-	if (column < 0)
-		return NULL;
-
-	if (column >= eth->col_count)
-		return NULL;
-
-	return eth->columns [column];
-}
-
-/**
- * e_table_header_get_column_by_col_id:
- * @eth: the ETableHeader to query
- * @col_id: the col_id to search for.
- *
- * Returns: The ETableCol with col_idx = @col_idx in the @eth object
- */
-ETableCol *
-e_table_header_get_column_by_col_idx (ETableHeader *eth, int col_idx)
-{
-	int i;
-	g_return_val_if_fail (eth != NULL, NULL);
-	g_return_val_if_fail (E_IS_TABLE_HEADER (eth), NULL);
-
-	for (i = 0; i < eth->col_count; i++) {
-		if (eth->columns[i]->col_idx == col_idx) {
-			return eth->columns [i];
-		}
-	}
-
-	return NULL;
-}
-
-/**
- * e_table_header_count:
- * @eth: the ETableHeader to query
- *
- * Returns: the number of columns in this ETableHeader.
- */
-int
-e_table_header_count (ETableHeader *eth)
-{
-	g_return_val_if_fail (eth != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_HEADER (eth), 0);
-
-	return eth->col_count;
-}
-
-/** 
- * e_table_header_index:
- * @eth: the ETableHeader to query
- * @col: the column to fetch.
- *
- * ETableHeaders contain the visual list of columns that the user will
- * view.  The visible columns will typically map to different columns
- * in the ETableModel (because the user reordered the data for
- * example).
- *
- * Returns: the column in the model that the @col column
- * in the ETableHeader points to.  */
-int
-e_table_header_index (ETableHeader *eth, int col)
-{
-	g_return_val_if_fail (eth != NULL, -1);
-	g_return_val_if_fail (E_IS_TABLE_HEADER (eth), -1);
-	g_return_val_if_fail (col >= 0 && col < eth->col_count, -1);
-
-	return eth->columns [col]->col_idx;
-}
-
-/**
- * e_table_header_get_index_at:
- * @eth: the ETableHeader to query
- * @x_offset: a pixel count from the beginning of the ETableHeader
- *
- * This will return the ETableHeader column that would contain
- * the @x_offset pixel.
- *
- * Returns: the column that contains pixel @x_offset, or -1
- * if no column inside this ETableHeader contains that pixel.
- */
-int
-e_table_header_get_index_at (ETableHeader *eth, int x_offset)
-{
-	int i, total;
-	
-	g_return_val_if_fail (eth != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_HEADER (eth), 0);
-
-	total = 0;
-	for (i = 0; i < eth->col_count; i++){
-		total += eth->columns [i]->width;
-
-		if (x_offset < total)
-			return i;
-	}
-
-	return -1;
-}
-
-/**
- * e_table_header_get_columns:
- * @eth: The ETableHeader to query
- *
- * Returns: A NULL terminated array of the ETableCols
- * contained in the ETableHeader @eth.  Note that every
- * returned ETableCol in the array has been referenced, to release
- * this information you need to g_free the buffer returned
- * and you need to gtk_object_unref every element returned
- */
-ETableCol **
-e_table_header_get_columns (ETableHeader *eth)
-{
-	ETableCol **ret;
-	int i;
-	
-	g_return_val_if_fail (eth != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_HEADER (eth), 0);
-
-	ret = g_new (ETableCol *, eth->col_count + 1);
-	memcpy (ret, eth->columns, sizeof (ETableCol *) * eth->col_count);
-	ret [eth->col_count] = NULL;
-
-	for (i = 0; i < eth->col_count; i++) {
-		gtk_object_ref(GTK_OBJECT(ret[i]));
-	}
-
-	return ret;
-}
-
-/**
- * e_table_header_get_selected:
- * @eth: The ETableHeader to query
- *
- * Returns: The number of selected columns in the @eth object.
- */
-int
-e_table_header_get_selected (ETableHeader *eth)
-{
-	int i;
-	int selected = 0;
-	
-	g_return_val_if_fail (eth != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_HEADER (eth), 0);
-
-	for (i = 0; i < eth->col_count; i++){
-		if (eth->columns [i]->selected)
-			selected++;
-	}
-
-	return selected;
-}
-
-/**
- * e_table_header_total_width:
- * @eth: The ETableHeader to query
- *
- * Returns: the number of pixels used by the @eth object
- * when rendered on screen
- */
-int
-e_table_header_total_width (ETableHeader *eth)
-{
-	int total, i;
-	
-	g_return_val_if_fail (eth != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_HEADER (eth), 0);
-
-	total = 0;
-	for (i = 0; i < eth->col_count; i++)
-		total += eth->columns [i]->width;
-
-	return total;
-}
-
-/**
- * e_table_header_move:
- * @eth: The ETableHeader to operate on.
- * @source_index: the source column to move.
- * @target_index: the target location for the column
- *
- * This function moves the column @source_index to @target_index
- * inside the @eth ETableHeader.  The signals "dimension_change"
- * and "structure_change" will be emmited
- */
-void
-e_table_header_move (ETableHeader *eth, int source_index, int target_index)
-{
-	ETableCol *old;
-	
-	g_return_if_fail (eth != NULL);
-	g_return_if_fail (E_IS_TABLE_HEADER (eth));
-	g_return_if_fail (source_index >= 0);
-	g_return_if_fail (target_index >= 0);
-	g_return_if_fail (source_index < eth->col_count);
-	g_return_if_fail (target_index < eth->col_count + 1); /* Can be moved beyond the last item. */
-
-	if (source_index < target_index)
-		target_index --;
-
-	old = eth->columns [source_index];
-	eth_do_remove (eth, source_index, FALSE);
-	eth_do_insert (eth, target_index, old);
-	eth_update_offsets (eth);
-	
-	gtk_signal_emit (GTK_OBJECT (eth), eth_signals [DIMENSION_CHANGE]);
-	gtk_signal_emit (GTK_OBJECT (eth), eth_signals [STRUCTURE_CHANGE]);
-}
-
-/**
- * e_table_header_remove:
- * @eth: The ETableHeader to operate on.
- * @idx: the index to the column to be removed.
- *
- * Removes the column at @idx position in the ETableHeader @eth.
- * This emmits the "structure_change" signal on the @eth object.
- */
-void
-e_table_header_remove (ETableHeader *eth, int idx)
-{
-	g_return_if_fail (eth != NULL);
-	g_return_if_fail (E_IS_TABLE_HEADER (eth));
-	g_return_if_fail (idx >= 0);
-	g_return_if_fail (idx < eth->col_count);
-
-	eth_do_remove (eth, idx, TRUE);
-	enqueue(eth, -1, eth->nominal_width);
-	gtk_signal_emit (GTK_OBJECT (eth), eth_signals [STRUCTURE_CHANGE]);
-}
-
-/*
- * FIXME: deprecated?
- */
-void
-e_table_header_set_selection (ETableHeader *eth, gboolean allow_selection)
-{
-	g_return_if_fail (eth != NULL);
-	g_return_if_fail (E_IS_TABLE_HEADER (eth));
-}
-
-static void
-eth_set_size (ETableHeader *eth, int idx, int size)
-{
-	double expansion;
-	double old_expansion;
-	int min_width;
-	int left_width;
-	int total_extra;
-	int expandable_count;
-	int usable_width;
-	int i;
-	g_return_if_fail (eth != NULL);
-	g_return_if_fail (E_IS_TABLE_HEADER (eth));
-	g_return_if_fail (idx >= 0);
-	g_return_if_fail (idx < eth->col_count);
-	
-	/* If this column is not resizable, don't do anything. */
-	if (!eth->columns[idx]->resizable)
-		return;
-
-	expansion = 0;
-	min_width = 0;
-	left_width = 0;
-	expandable_count = -1;
-
-	/* Calculate usable area. */
-	for (i = 0; i < idx; i++) {
-		left_width += eth->columns[i]->width;
-	}
-	/* - 1 to account for the last pixel border. */
-	usable_width = eth->width - left_width - 1;
-
-	if (eth->sort_info)
-		usable_width -= e_table_sort_info_grouping_get_count(eth->sort_info) * GROUP_INDENT;
-
-	/* Calculate minimum_width of stuff on the right as well as
-	 * total usable expansion on the right. 
-	 */
-	for (; i < eth->col_count; i++) {
-		min_width += eth->columns[i]->min_width + eth->width_extras;
-		if (eth->columns[i]->resizable) {
-			expansion += eth->columns[i]->expansion;
-			expandable_count ++;
-		}
-	}
-	/* If there's no room for anything, don't change. */
-	if (expansion == 0)
-		return;
-
-	/* (1) If none of the columns to the right are expandable, use
-	 * all the expansion space in this column.
-	 */
-	if(expandable_count == 0) {
-		eth->columns[idx]->expansion = expansion;
-		for (i = idx + 1; i < eth->col_count; i++) {
-			eth->columns[i]->expansion = 0;
-		}
-		return;
-	}
-
-	total_extra = usable_width - min_width;
-	/* If there's no extra space, set all expansions to 0. */
-	if (total_extra <= 0) {
-		for (i = idx; i < eth->col_count; i++) {
-			eth->columns[i]->expansion = 0;
-		}
-		return;
-	}
-
-	/* If you try to resize smaller than the minimum width, it
-	 * uses the minimum. */
-	if (size < eth->columns[idx]->min_width + eth->width_extras)
-		size = eth->columns[idx]->min_width + eth->width_extras;
-
-	/* If all the extra space will be used up in this column, use
-	 * all the expansion and set all others to 0.
-	 */
-	if (size >= total_extra + eth->columns[idx]->min_width + eth->width_extras) {
-		eth->columns[idx]->expansion = expansion;
-		for (i = idx + 1; i < eth->col_count; i++) {
-			eth->columns[i]->expansion = 0;
-		}
-		return;
-	}
-	
-	/* The old_expansion used by columns to the right. */
-	old_expansion = expansion;
-	old_expansion -= eth->columns[idx]->expansion;
-	/* Set the new expansion so that it will generate the desired size. */
-	eth->columns[idx]->expansion = expansion * (((double)(size - (eth->columns[idx]->min_width + eth->width_extras)))/((double)total_extra));
-	/* The expansion left for the columns on the right. */
-	expansion -= eth->columns[idx]->expansion;
-
-	/* (2) If the old columns to the right didn't have any
-	 * expansion before, expand them evenly.  old_expansion > 0 by
-	 * expansion = SUM(i=idx to col_count -1,
-	 * columns[i]->min_width) - columns[idx]->min_width) =
-	 * SUM(non-negatives).
-	 */
-	if (old_expansion == 0) {
-		for (i = idx + 1; i < eth->col_count; i++) {
-			if (eth->columns[idx]->resizable) {
-				/* expandable_count != 0 by (1) */
-				eth->columns[i]->expansion = expansion / expandable_count;
-			}
-		}
-		return;
-	}
-
-	/* Remove from total_extra the amount used for this column. */
-	total_extra -= size - (eth->columns[idx]->min_width + eth->width_extras);
-	for (i = idx + 1; i < eth->col_count; i++) {
-		if (eth->columns[idx]->resizable) {
-			/* old_expansion != 0 by (2) */
-			eth->columns[i]->expansion *= expansion / old_expansion;
-		}
-	}
-}
-
-/**
- * e_table_header_col_diff:
- * @eth: the ETableHeader to query.
- * @start_col: the starting column
- * @end_col: the ending column.
- *
- * Computes the number of pixels between the columns @start_col and
- * @end_col.
- *
- * Returns: the number of pixels between @start_col and @end_col on the
- * @eth ETableHeader object
- */
-int
-e_table_header_col_diff (ETableHeader *eth, int start_col, int end_col)
-{
-	int total, col;
-
-	g_return_val_if_fail (eth != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_HEADER (eth), 0);
-
-	if (start_col < 0)
-		start_col = 0;
-	if (end_col > eth->col_count)
-		end_col = eth->col_count;
-
-	total = 0;
-	for (col = start_col; col < end_col; col++){
-		
-		total += eth->columns [col]->width;
-	}
-
-	return total;
-}
-
-static void
-eth_calc_widths (ETableHeader *eth)
-{
-	int i;
-	int extra;
-	double expansion;
-	int last_position = 0;
-	double next_position = 0;
-	int last_resizable = -1;
-	/* - 1 to account for the last pixel border. */
-	extra = eth->width - 1;
-	expansion = 0;
-	for (i = 0; i < eth->col_count; i++) {
-		extra -= eth->columns[i]->min_width + eth->width_extras;
-		if (eth->columns[i]->resizable && eth->columns[i]->expansion > 0)
-			last_resizable = i;
-		expansion += eth->columns[i]->resizable ? eth->columns[i]->expansion : 0;
-		eth->columns[i]->width = eth->columns[i]->min_width + eth->width_extras;
-	}
-	if (eth->sort_info)
-		extra -= e_table_sort_info_grouping_get_count(eth->sort_info) * GROUP_INDENT;
-	if (expansion != 0 && extra > 0) {
-		for (i = 0; i < last_resizable; i++) {
-			next_position += extra * (eth->columns[i]->resizable ? eth->columns[i]->expansion : 0)/expansion;
-			eth->columns[i]->width += next_position - last_position;
-			last_position = next_position;
-		}
-		eth->columns[i]->width += extra - last_position;
-	}
-
-	eth_update_offsets (eth);
-	gtk_signal_emit (GTK_OBJECT (eth), eth_signals [DIMENSION_CHANGE]);
-}
-
-void
-e_table_header_update_horizontal (ETableHeader *eth)
-{
-	int i;
-	int cols;
-
-	cols = eth->col_count;
-
-	for (i = 0; i < cols; i++) {
-		int width = 0;
-		
-		gtk_signal_emit_by_name (GTK_OBJECT (eth),
-					 "request_width",
-					 i, &width);
-		eth->columns[i]->min_width = width + 10;
-		eth->columns[i]->expansion = 1;
-	}
-	enqueue(eth, -1, eth->nominal_width);
-}
-
-GtkType
-e_table_header_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"ETableHeader",
-			sizeof (ETableHeader),
-			sizeof (ETableHeaderClass),
-			(GtkClassInitFunc) e_table_header_class_init,
-			(GtkObjectInitFunc) e_table_header_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (gtk_object_get_type (), &info);
-	}
-
-	return type;
-}
diff --git a/widgets/table/e-table-header.h b/widgets/table/e-table-header.h
deleted file mode 100644
index c186a8c48c..0000000000
--- a/widgets/table/e-table-header.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_COLUMN_H_
-#define _E_TABLE_COLUMN_H_
-
-#include <gtk/gtkobject.h>
-#include <gdk/gdk.h>
-#include <gal/e-table/e-table-sort-info.h>
-#include <gal/e-table/e-table-col.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-typedef struct _ETableHeader ETableHeader;
-
-#define E_TABLE_HEADER_TYPE        (e_table_header_get_type ())
-#define E_TABLE_HEADER(o)          (GTK_CHECK_CAST ((o), E_TABLE_HEADER_TYPE, ETableHeader))
-#define E_TABLE_HEADER_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_HEADER_TYPE, ETableHeaderClass))
-#define E_IS_TABLE_HEADER(o)       (GTK_CHECK_TYPE ((o), E_TABLE_HEADER_TYPE))
-#define E_IS_TABLE_HEADER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_HEADER_TYPE))
-
-/*
- * A Columnar header.
- */
-struct _ETableHeader {
-	GtkObject base;
-
-	int col_count;
-	int width;
-	int nominal_width;
-	int width_extras;
-
-	ETableSortInfo *sort_info;
-	int sort_info_group_change_id;
-
-	ETableCol **columns;
-	
-	GSList *change_queue, *change_tail;
-	gint idle;
-};
-
-typedef struct {
-	GtkObjectClass parent_class;
-
-	void (*structure_change) (ETableHeader *eth);
-	void (*dimension_change) (ETableHeader *eth, int col);
-	int (*request_width) (ETableHeader *eth, int col);
-} ETableHeaderClass;
-
-GtkType       e_table_header_get_type               (void);
-ETableHeader *e_table_header_new                    (void);
-
-void          e_table_header_add_column             (ETableHeader *eth,
-						     ETableCol    *tc,
-						     int           pos);
-ETableCol    *e_table_header_get_column             (ETableHeader *eth,
-						     int           column);
-ETableCol    *e_table_header_get_column_by_col_idx  (ETableHeader *eth,
-						     int           col_idx);
-int           e_table_header_count                  (ETableHeader *eth);
-int           e_table_header_index                  (ETableHeader *eth,
-						     int           col);
-int           e_table_header_get_index_at           (ETableHeader *eth,
-						     int           x_offset);
-ETableCol   **e_table_header_get_columns            (ETableHeader *eth);
-int           e_table_header_get_selected           (ETableHeader *eth);
-
-int           e_table_header_total_width            (ETableHeader *eth);
-void          e_table_header_move                   (ETableHeader *eth,
-						     int           source_index,
-						     int           target_index);
-void          e_table_header_remove                 (ETableHeader *eth,
-						     int           idx);
-void          e_table_header_set_size               (ETableHeader *eth,
-						     int           idx,
-						     int           size);
-void          e_table_header_set_selection          (ETableHeader *eth,
-						     gboolean      allow_selection);
-int           e_table_header_col_diff               (ETableHeader *eth,
-						     int           start_col,
-						     int           end_col);
-
-void          e_table_header_calc_widths            (ETableHeader *eth);
-GList        *e_table_header_get_selected_indexes   (ETableHeader *eth);
-
-void          e_table_header_update_horizontal      (ETableHeader *eth);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TABLE_HEADER_H_ */
-
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
deleted file mode 100644
index bd6863fbbf..0000000000
--- a/widgets/table/e-table-item.c
+++ /dev/null
@@ -1,2851 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-item.c: A GnomeCanvasItem that is a view of an ETableModel.
- *
- * Author:
- *   Christopher James Lahey <clahey@ximian.com>
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * Copyright 1999, 2000, 2001, Ximian, Inc.
- *
- * TODO:
- *   Add a border to the thing, so that focusing works properly.
- *
- */
-#include <config.h>
-
-#include "e-table-item.h"
-
-#include <math.h>
-#include <stdio.h>
-#include <gtk/gtksignal.h>
-#include <gdk/gdkkeysyms.h>
-#include "e-table-subset.h"
-#include "e-cell.h"
-#include "gal/widgets/e-hsv-utils.h"
-#include "gal/widgets/e-canvas.h"
-#include "gal/widgets/e-canvas-utils.h"
-#include "gal/util/e-util.h"
-#include <string.h>
-
-#define PARENT_OBJECT_TYPE gnome_canvas_item_get_type ()
-
-#define FOCUSED_BORDER 2
-
-#define DO_TOOLTIPS 1
-
-#define d(x)
-
-/* FIXME: Do an analysis of which cell functions are needed before
-   realize and make sure that all of them are doable by all the cells
-   and that all of the others are only done after realization. */
-
-static GnomeCanvasItemClass *eti_parent_class;
-
-enum {
-	CURSOR_CHANGE,
-	CURSOR_ACTIVATED,
-	DOUBLE_CLICK,
-	RIGHT_CLICK,
-	CLICK,
-	KEY_PRESS,
-	LAST_SIGNAL
-};
-
-static gint eti_signals [LAST_SIGNAL] = { 0, };
-
-enum {
-	ARG_0,
-	ARG_TABLE_HEADER,
-	ARG_TABLE_MODEL,
-	ARG_SELECTION_MODEL,
-	ARG_TABLE_ALTERNATING_ROW_COLORS,
-	ARG_TABLE_HORIZONTAL_DRAW_GRID,
-	ARG_TABLE_VERTICAL_DRAW_GRID,
-	ARG_TABLE_DRAW_FOCUS,
-	ARG_CURSOR_MODE,
-	ARG_LENGTH_THRESHOLD,
-	ARG_CURSOR_ROW,
-	
-	ARG_MINIMUM_WIDTH,
-	ARG_WIDTH,
-	ARG_HEIGHT,
-};
-
-#define DOUBLE_CLICK_TIME      250
-#define TRIPLE_CLICK_TIME      500
-
-
-static int eti_get_height (ETableItem *eti);
-static int eti_row_height (ETableItem *eti, int row);
-static void e_table_item_focus (ETableItem *eti, int col, int row, GdkModifierType state);
-static void eti_cursor_change (ESelectionModel *selection, int row, int col, ETableItem *eti);
-static void eti_cursor_activated (ESelectionModel *selection, int row, int col, ETableItem *eti);
-static void eti_selection_change (ESelectionModel *selection, ETableItem *eti);
-#ifdef SHOW_ON_CHANGED
-static void eti_request_region_show (ETableItem *eti,
-				     int start_col, int start_row,
-				     int end_col, int end_row);
-#endif
-#define ETI_ROW_HEIGHT(eti,row) ((eti)->height_cache && (eti)->height_cache[(row)] != -1 ? (eti)->height_cache[(row)] : eti_row_height((eti),(row)))
-
-inline static gint
-model_to_view_row(ETableItem *eti, int row)
-{
-	int i;
-	if (row == -1)
-		return -1;
-	if (eti->uses_source_model) {
-		ETableSubset *etss = E_TABLE_SUBSET(eti->table_model);
-		if (eti->row_guess >= 0 && eti->row_guess < etss->n_map) {
-			if (etss->map_table[eti->row_guess] == row) {
-				return eti->row_guess;
-			}
-		}
-		for (i = 0; i < etss->n_map; i++) {
-			if (etss->map_table[i] == row)
-				return i;
-		}
-		return -1;
-	} else
-		return row;
-}
-
-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
-model_to_view_col(ETableItem *eti, int col)
-{
-	int i;
-	if (col == -1)
-		return -1;
-	for (i = 0; i < eti->cols; i++) {
-		ETableCol *ecol = e_table_header_get_column (eti->header, i);
-		if (ecol->col_idx == col)
-			return i;
-	}
-	return -1;
-}
-
-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 gboolean
-eti_editing (ETableItem *eti)
-{
-	if (eti->editing_col == -1)
-		return FALSE;
-	else
-		return TRUE;
-}
-
-inline static GdkColor *
-eti_get_cell_background_color (ETableItem *eti, int row, int col, gboolean selected, gboolean *allocated)
-{
-	GtkWidget *canvas = GTK_WIDGET(GNOME_CANVAS_ITEM(eti)->canvas);
-	GdkColor *background;
-
-	if (allocated)
-		*allocated = FALSE;
-
-	if (selected){
-		if (GTK_WIDGET_HAS_FOCUS(canvas))
-			background = &canvas->style->bg [GTK_STATE_SELECTED];
-		else
-			background = &canvas->style->bg [GTK_STATE_ACTIVE];
-	} else {
-		background = &canvas->style->base [GTK_STATE_NORMAL];
-	}
-
-	if (eti->alternating_row_colors) {
-		if (row % 2) {
-		
-		} else {
-			if (allocated)
-				*allocated = TRUE;
-			background = gdk_color_copy (background);
-			e_hsv_tweak (background, 0.0f, 0.0f, -0.05f);
-			gdk_color_alloc (gtk_widget_get_colormap (GTK_WIDGET (canvas)), background);
-		}
-	}
-
-	return background;
-}
-
-inline static GdkColor *
-eti_get_cell_foreground_color (ETableItem *eti, int row, int col, gboolean selected, gboolean *allocated)
-{
-	GtkWidget *canvas = GTK_WIDGET(GNOME_CANVAS_ITEM(eti)->canvas);
-	GdkColor *foreground;
-
-	if (allocated)
-		*allocated = FALSE;
-
-	if (selected){
-		if (GTK_WIDGET_HAS_FOCUS (canvas))
-			foreground = &canvas->style->text [GTK_STATE_SELECTED];
-		else
-			foreground = &canvas->style->text [GTK_STATE_ACTIVE];
-	} else {
-		foreground = &canvas->style->text [GTK_STATE_NORMAL];
-	}
-
-	return foreground;
-}
-
-/*
- * During realization, we have to invoke the per-ecell realize routine
- * (On our current setup, we have one e-cell per column.
- *
- * We might want to optimize this to only realize the unique e-cells:
- * ie, a strings-only table, uses the same e-cell for every column, and
- * we might want to avoid realizing each e-cell.
- */
-static void
-eti_realize_cell_views (ETableItem *eti)
-{
-	int i;
-
-	if (eti->cell_views_realized)
-		return;
-
-	if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED))
-		return;
-	
-	for (i = 0; i < eti->n_cells; i++)
-		e_cell_realize (eti->cell_views [i]);
-	eti->cell_views_realized = 1;
-}
-
-static void
-eti_attach_cell_views (ETableItem *eti)
-{
-	int i;
-
-	g_assert (eti->header);
-	g_assert (eti->table_model);
-	
-	/*
-	 * Now realize the various ECells
-	 */
-	eti->n_cells = eti->cols;
-	eti->cell_views = g_new (ECellView *, eti->n_cells);
-
-	for (i = 0; i < eti->n_cells; i++){
-		ETableCol *ecol = e_table_header_get_column (eti->header, i);
-		
-		eti->cell_views [i] = e_cell_new_view (ecol->ecell, eti->table_model, eti);
-	}
-
-	eti->needs_compute_height = 1;
-	e_canvas_item_request_reflow (GNOME_CANVAS_ITEM (eti));
-	eti->needs_redraw = 1;
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (eti));
-}
-
-/*
- * During unrealization: we invoke every e-cell (one per column in the current
- * setup) to dispose all X resources allocated
- */
-static void
-eti_unrealize_cell_views (ETableItem *eti)
-{
-	int i;
-
-	if (eti->cell_views_realized == 0)
-		return;
-	
-	for (i = 0; i < eti->n_cells; i++)
-		e_cell_unrealize (eti->cell_views [i]);
-	eti->cell_views_realized = 0;
-}
-
-static void
-eti_detach_cell_views (ETableItem *eti)
-{
-	int i;
-	
-	for (i = 0; i < eti->n_cells; i++){
-		e_cell_kill_view (eti->cell_views [i]);
-		eti->cell_views [i] = NULL;
-	}
-		
-	g_free (eti->cell_views);
-	eti->cell_views = NULL;
-	eti->n_cells = 0;
-}
-
-static void
-eti_bounds (GnomeCanvasItem *item, double *x1, double *y1, double *x2, double *y2)
-{
-	double   i2c [6];
-	ArtPoint c1, c2, i1, i2;
-	ETableItem *eti = E_TABLE_ITEM (item);
-
-	/* Wrong BBox's are the source of redraw nightmares */
-
-	gnome_canvas_item_i2c_affine (GNOME_CANVAS_ITEM (eti), i2c);
-	
-	i1.x = eti->x1;
-	i1.y = eti->y1;
-	i2.x = eti->x1 + eti->width;
-	i2.y = eti->y1 + eti->height;
-	art_affine_point (&c1, &i1, i2c);
-	art_affine_point (&c2, &i2, i2c);
-	
-	*x1 = c1.x;
-	*y1 = c1.y;
-	*x2 = c2.x + 1;
-	*y2 = c2.y + 1;
-}
-
-static void
-eti_reflow (GnomeCanvasItem *item, gint flags)
-{
-	ETableItem *eti = E_TABLE_ITEM (item);
-
-	if (eti->needs_compute_height) {
-		int new_height = eti_get_height (eti);
-
-		if (new_height != eti->height) {
-			eti->height = new_height;
-			e_canvas_item_request_parent_reflow (GNOME_CANVAS_ITEM (eti));
-			eti->needs_redraw = 1;
-			gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (eti));
-		}
-		eti->needs_compute_height = 0;
-	}
-	if (eti->needs_compute_width) {
-		int new_width = e_table_header_total_width(eti->header);
-		if (new_width != eti->width) {
-			eti->width = new_width;
-			e_canvas_item_request_parent_reflow (GNOME_CANVAS_ITEM (eti));
-			eti->needs_redraw = 1;
-			gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (eti));
-		}
-		eti->needs_compute_width = 0;
-	}
-}
-
-/*
- * GnomeCanvasItem::update method
- */
-static void
-eti_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags)
-{
-	ArtPoint o1, o2;
-	ETableItem *eti = E_TABLE_ITEM (item);
-
-	if (GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->update)
-		(*GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->update)(item, affine, clip_path, flags);
-
-	o1.x = item->x1;
-	o1.y = item->y1;
-	o2.x = item->x2;
-	o2.y = item->y2;
-
-	eti_bounds (item, &item->x1, &item->y1, &item->x2, &item->y2);
-	if (item->x1 != o1.x ||
-	    item->y1 != o1.y ||
-	    item->x2 != o2.x ||
-	    item->y2 != o2.y) {
-		gnome_canvas_request_redraw (item->canvas, o1.x, o1.y, o2.x, o2.y);
-		eti->needs_redraw = 1;
-	}
-
-	if (eti->needs_redraw) {
-		gnome_canvas_request_redraw (item->canvas, item->x1, item->y1,
-					     item->x2, item->y2);
-		eti->needs_redraw = 0;
-	}
-}
-
-/*
- * eti_remove_table_model:
- *
- * Invoked to release the table model associated with this ETableItem
- */
-static void
-eti_remove_table_model (ETableItem *eti)
-{
-	if (!eti->table_model)
-		return;
-
-	gtk_signal_disconnect (GTK_OBJECT (eti->table_model),
-			       eti->table_model_pre_change_id);
-	gtk_signal_disconnect (GTK_OBJECT (eti->table_model),
-			       eti->table_model_change_id);
-	gtk_signal_disconnect (GTK_OBJECT (eti->table_model),
-			       eti->table_model_row_change_id);
-	gtk_signal_disconnect (GTK_OBJECT (eti->table_model),
-			       eti->table_model_cell_change_id);
-	gtk_signal_disconnect (GTK_OBJECT (eti->table_model),
-			       eti->table_model_rows_inserted_id);
-	gtk_signal_disconnect (GTK_OBJECT (eti->table_model),
-			       eti->table_model_rows_deleted_id);
-	gtk_object_unref (GTK_OBJECT (eti->table_model));
-	if (eti->source_model)
-		gtk_object_unref (GTK_OBJECT (eti->source_model));
-
-	eti->table_model_pre_change_id = 0;
-	eti->table_model_change_id = 0;
-	eti->table_model_row_change_id = 0;
-	eti->table_model_cell_change_id = 0;
-	eti->table_model_rows_inserted_id = 0;
-	eti->table_model_rows_deleted_id = 0;
-	eti->table_model = NULL;
-	eti->source_model = NULL;
-	eti->uses_source_model = 0;
-}
-
-/*
- * eti_remove_table_model:
- *
- * Invoked to release the table model associated with this ETableItem
- */
-static void
-eti_remove_selection_model (ETableItem *eti)
-{
-	if (!eti->selection)
-		return;
-
-	gtk_signal_disconnect (GTK_OBJECT (eti->selection),
-			       eti->selection_change_id);
-	gtk_signal_disconnect (GTK_OBJECT (eti->selection),
-			       eti->cursor_change_id);
-	gtk_signal_disconnect (GTK_OBJECT (eti->selection),
-			       eti->cursor_activated_id);
-	gtk_object_unref (GTK_OBJECT (eti->selection));
-
-	eti->selection_change_id = 0;
-	eti->cursor_activated_id = 0;
-	eti->selection = NULL;
-}
-
-/*
- * eti_remove_header_model:
- *
- * Invoked to release the header model associated with this ETableItem
- */
-static void
-eti_remove_header_model (ETableItem *eti)
-{
-	if (!eti->header)
-		return;
-
-	gtk_signal_disconnect (GTK_OBJECT (eti->header),
-			       eti->header_structure_change_id);
-	gtk_signal_disconnect (GTK_OBJECT (eti->header),
-			       eti->header_dim_change_id);
-	gtk_signal_disconnect (GTK_OBJECT (eti->header),
-			       eti->header_request_width_id);
-	
-	if (eti->cell_views){
-		eti_unrealize_cell_views (eti);
-		eti_detach_cell_views (eti);
-	}
-	gtk_object_unref (GTK_OBJECT (eti->header));
-
-
-	eti->header_structure_change_id = 0;
-	eti->header_dim_change_id = 0;
-	eti->header_request_width_id = 0;
-	eti->header = NULL;
-}
-
-/*
- * eti_row_height_real:
- *
- * Returns the height used by row @row.  This does not include the one-pixel
- * used as a separator between rows
- */
-static int
-eti_row_height_real (ETableItem *eti, int row)
-{
-	const int cols = e_table_header_count (eti->header);
-	int col;
-	int h, max_h;
-
-	g_assert (cols == 0 || eti->cell_views);
-	
-	max_h = 0;
-	
-	for (col = 0; col < cols; col++){
-		h = e_cell_height (eti->cell_views [col], view_to_model_col(eti, col), col, row);
-
-		if (h > max_h)
-			max_h = h;
-	}
-	return max_h;
-}
-
-static void
-confirm_height_cache (ETableItem *eti)
-{
-	int i;
-
-	if (eti->height_cache)
-		return;
-	eti->height_cache = g_new(int, eti->rows);
-	for (i = 0; i < eti->rows; i++) {
-		eti->height_cache[i] = -1;
-	}
-}
-
-static gboolean
-height_cache_idle(ETableItem *eti)
-{
-	int changed = 0;
-	int i;
-	confirm_height_cache(eti);
-	for (i = eti->height_cache_idle_count; i < eti->rows; i++) {
-		if (eti->height_cache[i] == -1) {
-			eti_row_height(eti, i);
-			changed ++;
-			if (changed >= 20)
-				break;
-		}
-	}
-	if (changed >= 20) {
-		eti->height_cache_idle_count = i;
-		return TRUE;
-	}
-	eti->height_cache_idle_id = 0;
-	return FALSE;	
-}
-
-static void
-free_height_cache (ETableItem *eti)
-{
-	if (eti->height_cache)
-		g_free (eti->height_cache);
-	eti->height_cache = NULL;
-	eti->height_cache_idle_count = 0;
-	
-	if (eti->height_cache_idle_id == 0)
-		eti->height_cache_idle_id = g_idle_add_full(G_PRIORITY_LOW, (GSourceFunc) height_cache_idle, eti, NULL);
-}
-
-static void
-calculate_height_cache (ETableItem *eti)
-{
-	free_height_cache(eti);
-	confirm_height_cache(eti);
-}
-
-
-/*
- * eti_row_height:
- *
- * Returns the height used by row @row.  This does not include the one-pixel
- * used as a separator between rows
- */
-static int
-eti_row_height (ETableItem *eti, int row)
-{
-	if (!eti->height_cache) {
-		calculate_height_cache (eti);
-	}
-	if (eti->height_cache[row] == -1) {
-		eti->height_cache[row] = eti_row_height_real(eti, row);
-		if (row > 0 && 
-		    eti->length_threshold != -1 && 
-		    eti->rows > eti->length_threshold &&
-		    eti->height_cache[row] != eti_row_height(eti, 0)) {
-			eti->needs_compute_height = 1;
-			e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(eti));
-		}
-	}
-	return eti->height_cache[row];
-}
-
-/*
- * eti_get_height:
- *
- * Returns the height of the ETableItem.
- *
- * The ETableItem might compute the whole height by asking every row its
- * size.  There is a special mode (designed to work when there are too
- * many rows in the table that performing the previous step could take 
- * too long) set by the ETableItem->length_threshold that would determine
- * when the height is computed by using the first row as the size for
- * every other row in the ETableItem.
- */
-static int
-eti_get_height (ETableItem *eti)
-{
-	const int rows = eti->rows;
-	int row;
-	int height;
-	int height_extra = eti->horizontal_draw_grid ? 1 : 0;
-
-	if (rows == 0)
-		return 0;
-
-	if (eti->length_threshold != -1){
-		if (rows > eti->length_threshold){
-			int row_height = eti_row_height(eti, 0);
-			if (eti->height_cache) {
-				height = 0;
-				for (row = 0; row < rows; row++) {
-					if (eti->height_cache[row] == -1) {
-						height += (row_height + height_extra) * (rows - row);
-						break;
-					}
-					else
-						height += eti->height_cache[row] + height_extra;
-				}
-			} else
-				height = (eti_row_height (eti, 0) + height_extra) * rows;
-
-			/*
-			 * 1 pixel at the top
-			 */
-			return height + height_extra;
-		}
-	}
-
-	height = height_extra;
-	for (row = 0; row < rows; row++)
-		height += eti_row_height (eti, row) + height_extra;
-
-	return height;
-}
-
-static void
-eti_item_region_redraw (ETableItem *eti, int x0, int y0, int x1, int y1)
-{
-	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (eti);
-	ArtDRect rect;
-	double i2c [6];
-	
-	rect.x0 = x0;
-	rect.y0 = y0;
-	rect.x1 = x1;
-	rect.y1 = y1;
-
-	gnome_canvas_item_i2c_affine (item, i2c);
-	art_drect_affine_transform (&rect, &rect, i2c);
-
-	gnome_canvas_request_redraw (item->canvas, rect.x0, rect.y0, rect.x1, rect.y1);
-}
-
-/*
- * Callback routine: invoked before the ETableModel has suffers a change
- */
-static void
-eti_table_model_pre_change (ETableModel *table_model, ETableItem *eti)
-{
-	if (eti_editing (eti))
-		e_table_item_leave_edit (eti);
-}
-
-/*
- * Callback routine: invoked when the ETableModel has suffered a change
- */
-static void
-eti_table_model_changed (ETableModel *table_model, ETableItem *eti)
-{
-	if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED))
-		return;
-#ifdef SHOW_ON_CHANGED
-	int view_row;
-#endif
-
-	eti->rows = e_table_model_row_count (eti->table_model);
-
-	free_height_cache(eti);
-
-	eti->needs_compute_height = 1;
-	e_canvas_item_request_reflow (GNOME_CANVAS_ITEM (eti));
-	eti->needs_redraw = 1;
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (eti));
-
-#ifdef SHOW_ON_CHANGED
-	view_row = model_to_view_row(eti, eti->cursor_row);
-	if (view_row >= 0 && eti->cursor_col >= 0)
-		eti_request_region_show (eti, eti->cursor_col, view_row, eti->cursor_col, view_row);
-#endif
-}
-
-/*
- * Computes the distance between @start_row and @end_row in pixels
- */
-int
-e_table_item_row_diff (ETableItem *eti, int start_row, int end_row)
-{
-	int row, total;
-	int height_extra = eti->horizontal_draw_grid ? 1 : 0;
-
-	total = 0;
-	if (start_row < 0)
-		start_row = 0;
-	if (end_row > eti->rows)
-		end_row = eti->rows;
-
-	for (row = start_row; row < end_row; row++)
-		total += eti_row_height (eti, row) + height_extra;
-
-	return total;
-}
-
-/*
- * eti_request_region_redraw:
- *
- * Request a canvas redraw on the range (start_col, start_row) to (end_col, end_row).
- * This is inclusive (ie, you can use: 0,0-0,0 to redraw the first cell).
- *
- * The @border argument is a number of pixels around the region that should also be queued
- * for redraw.   This is typically used by the focus routines to queue a redraw for the
- * border as well.
- */
-static void
-eti_request_region_redraw (ETableItem *eti,
-			   int start_col, int start_row,
-			   int end_col, int end_row, int border)
-{
-	int x1, y1, width, height;
-
-	if (eti->rows > 0) {
-		
-		x1 = e_table_header_col_diff (eti->header, 0, start_col);
-		y1 = e_table_item_row_diff (eti, 0, start_row);
-		width = e_table_header_col_diff (eti->header, start_col, end_col + 1);
-		height = e_table_item_row_diff (eti, start_row, end_row + 1);
-		
-		eti_item_region_redraw (eti, eti->x1 + x1 - border,
-					eti->y1 + y1 - border,
-					eti->x1 + x1 + width + 1 + border,
-					eti->y1 + y1 + height + 1 + border);
-	}
-}
-
-/*
- * eti_request_region_show
- *
- * Request a canvas show on the range (start_col, start_row) to (end_col, end_row).
- * This is inclusive (ie, you can use: 0,0-0,0 to show the first cell).
- */
-static void
-eti_request_region_show (ETableItem *eti,
-			 int start_col, int start_row,
-			 int end_col, int end_row, int delay)
-{
-	int x1, y1, x2, y2;
-	
-	x1 = e_table_header_col_diff (eti->header, 0, start_col);
-	y1 = e_table_item_row_diff (eti, 0, start_row);
-	x2 = x1 + e_table_header_col_diff (eti->header, start_col, end_col + 1);
-	y2 = y1 + e_table_item_row_diff (eti, start_row, end_row + 1);
-
-	if (delay)
-		e_canvas_item_show_area_delayed(GNOME_CANVAS_ITEM(eti), x1, y1, x2, y2, delay);
-	else
-		e_canvas_item_show_area(GNOME_CANVAS_ITEM(eti), x1, y1, x2, y2);
-}
-
-static void
-eti_table_model_row_changed (ETableModel *table_model, int row, ETableItem *eti)
-{
-	if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED))
-		return;
-	if (eti->renderers_can_change_size &&
-	    eti->height_cache && eti->height_cache[row] != -1 &&
-	    eti_row_height_real(eti, row) != eti->height_cache[row]) {
-		eti_table_model_changed (table_model, eti);
-		return;
-	}
-
-	eti_request_region_redraw (eti, 0, row, eti->cols - 1, row, 0);
-}
-
-static void
-eti_table_model_cell_changed (ETableModel *table_model, int col, int row, ETableItem *eti)
-{
-	if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED))
-		return;
-	if (eti->renderers_can_change_size &&
-	    eti->height_cache && eti->height_cache[row] != -1 &&
-	    eti_row_height_real(eti, row) != eti->height_cache[row]) {
-		eti_table_model_changed (table_model, eti);
-		return;
-	}
-
-	eti_request_region_redraw (eti, 0, row, eti->cols - 1, row, 0);
-}
-
-static void
-eti_table_model_rows_inserted (ETableModel *table_model, int row, int count, ETableItem *eti)
-{
-	if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED))
-		return;
-	eti->rows = e_table_model_row_count (eti->table_model);
-
-	if (eti->height_cache) {
-		int i;
-		eti->height_cache = g_renew(int, eti->height_cache, eti->rows);
-		memmove(eti->height_cache + row + count, eti->height_cache + row, (eti->rows - count - row) * sizeof(int));
-		for (i = row; i < row + count; i++)
-			eti->height_cache[i] = -1;
-	}
-
-	eti->needs_compute_height = 1;
-	e_canvas_item_request_reflow (GNOME_CANVAS_ITEM (eti));
-	eti->needs_redraw = 1;
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (eti));
-}
-
-static void
-eti_table_model_rows_deleted (ETableModel *table_model, int row, int count, ETableItem *eti)
-{
-	if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED))
-		return;
-	eti->rows = e_table_model_row_count (eti->table_model);
-
-	if (eti->height_cache)
-		memmove(eti->height_cache + row, eti->height_cache + row + count, (eti->rows - row) * sizeof(int));
-
-	eti->needs_compute_height = 1;
-	e_canvas_item_request_reflow (GNOME_CANVAS_ITEM (eti));
-	eti->needs_redraw = 1;
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (eti));
-}
-
-/** 
- * e_table_item_redraw_range
- * @eti: %ETableItem which will be redrawn
- * @start_col: The first col to redraw.
- * @start_row: The first row to redraw.
- * @end_col: The last col to redraw.
- * @end_row: The last row to redraw.
- *
- * This routine redraws the given %ETableItem in the range given.  The
- * range is inclusive at both ends.
- */
-void
-e_table_item_redraw_range (ETableItem *eti,
-			   int start_col, int start_row,
-			   int end_col, int end_row)
-{
-	int border;
-	int cursor_col, cursor_row;
-	
-	g_return_if_fail (eti != NULL);
-	g_return_if_fail (E_IS_TABLE_ITEM (eti));
-	
-	gtk_object_get(GTK_OBJECT(eti->selection),
-		       "cursor_col", &cursor_col,
-		       "cursor_row", &cursor_row,
-		       NULL);
-
-	if ((start_col == cursor_col) ||
-	    (end_col   == cursor_col) ||
-	    (view_to_model_row(eti, start_row) == cursor_row) ||
-	    (view_to_model_row(eti, end_row)   == cursor_row))
-		border = 2;
-	else
-		border = 0;
-
-	eti_request_region_redraw(eti, start_col, start_row, end_col, end_row, border);
-}
-
-static void
-eti_add_table_model (ETableItem *eti, ETableModel *table_model)
-{
-	g_assert (eti->table_model == NULL);
-	
-	eti->table_model = table_model;
-	gtk_object_ref (GTK_OBJECT (eti->table_model));
-
-	eti->table_model_pre_change_id = gtk_signal_connect (
-		GTK_OBJECT (table_model), "model_pre_change",
-		GTK_SIGNAL_FUNC (eti_table_model_pre_change), eti);
-
-	eti->table_model_change_id = gtk_signal_connect (
-		GTK_OBJECT (table_model), "model_changed",
-		GTK_SIGNAL_FUNC (eti_table_model_changed), eti);
-
-	eti->table_model_row_change_id = gtk_signal_connect (
-		GTK_OBJECT (table_model), "model_row_changed",
-		GTK_SIGNAL_FUNC (eti_table_model_row_changed), eti);
-
-	eti->table_model_cell_change_id = gtk_signal_connect (
-		GTK_OBJECT (table_model), "model_cell_changed",
-		GTK_SIGNAL_FUNC (eti_table_model_cell_changed), eti);
-
-	eti->table_model_rows_inserted_id = gtk_signal_connect (
-		GTK_OBJECT (table_model), "model_rows_inserted",
-		GTK_SIGNAL_FUNC (eti_table_model_rows_inserted), eti);
-
-	eti->table_model_rows_deleted_id = gtk_signal_connect (
-		GTK_OBJECT (table_model), "model_rows_deleted",
-		GTK_SIGNAL_FUNC (eti_table_model_rows_deleted), eti);
-
-	if (eti->header) {
-		eti_detach_cell_views (eti);
-		eti_attach_cell_views (eti);
-	}
-
-	if (E_IS_TABLE_SUBSET(table_model)) {
-		eti->uses_source_model = 1;
-		eti->source_model = E_TABLE_SUBSET(table_model)->source;
-		if (eti->source_model)
-			gtk_object_ref(GTK_OBJECT(eti->source_model));
-	}
-	
-	eti_table_model_changed (table_model, eti);
-}
-
-static void
-eti_add_selection_model (ETableItem *eti, ESelectionModel *selection)
-{
-	g_assert (eti->selection == NULL);
-	
-	eti->selection = selection;
-	gtk_object_ref (GTK_OBJECT (eti->selection));
-
-	eti->selection_change_id = gtk_signal_connect (
-		GTK_OBJECT (selection), "selection_changed",
-		GTK_SIGNAL_FUNC (eti_selection_change), eti);
-
-	eti->cursor_change_id = gtk_signal_connect (
-		GTK_OBJECT (selection), "cursor_changed",
-		GTK_SIGNAL_FUNC (eti_cursor_change), eti);
-
-	eti->cursor_activated_id = gtk_signal_connect (
-		GTK_OBJECT (selection), "cursor_activated",
-		GTK_SIGNAL_FUNC (eti_cursor_activated), eti);
-
-	eti_selection_change(selection, eti);
-}
-
-static void
-eti_header_dim_changed (ETableHeader *eth, int col, ETableItem *eti)
-{
-	eti->needs_compute_width = 1;
-	e_canvas_item_request_reflow (GNOME_CANVAS_ITEM (eti));
-	eti->needs_redraw = 1;
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (eti));
-}
-
-static void
-eti_header_structure_changed (ETableHeader *eth, ETableItem *eti)
-{
-	eti->cols = e_table_header_count (eti->header);
-
-	/*
-	 * There should be at least one column
-	 *  BUT: then you can't remove all columns from a header and add new ones.
-	 */
-	/*g_assert (eti->cols != 0);*/
-
-	if (eti->cell_views){
-		eti_unrealize_cell_views (eti);
-		eti_detach_cell_views (eti);
-		eti_attach_cell_views (eti);
-		eti_realize_cell_views (eti);
-	} else {
-		if (eti->table_model) {
-			eti_attach_cell_views (eti);
-			eti_realize_cell_views (eti);
-		}
-	}
-	eti->needs_compute_width = 1;
-	e_canvas_item_request_reflow (GNOME_CANVAS_ITEM (eti));
-	eti->needs_redraw = 1;
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (eti));
-}
-
-static int
-eti_request_column_width (ETableHeader *eth, int col, ETableItem *eti)
-{
-	int width = 0;
-	
-	if (eti->cell_views && eti->cell_views_realized) {
-		width = e_cell_max_width (eti->cell_views[col], view_to_model_col(eti, col), col);
-	}
-
-	return width;
-}
-
-static void
-eti_add_header_model (ETableItem *eti, ETableHeader *header)
-{
-	g_assert (eti->header == NULL);
-	
-	eti->header = header;
-	gtk_object_ref (GTK_OBJECT (header));
-
-	eti_header_structure_changed (header, eti);
-	
-	eti->header_dim_change_id = gtk_signal_connect (
-		GTK_OBJECT (header), "dimension_change",
-		GTK_SIGNAL_FUNC (eti_header_dim_changed), eti);
-
-	eti->header_structure_change_id = gtk_signal_connect (
-		GTK_OBJECT (header), "structure_change",
-		GTK_SIGNAL_FUNC (eti_header_structure_changed), eti);
-
-	eti->header_request_width_id = gtk_signal_connect 
-		(GTK_OBJECT (header), "request_width",
-		 GTK_SIGNAL_FUNC (eti_request_column_width), eti);
-}
-
-/*
- * GtkObject::destroy method
- */
-static void
-eti_destroy (GtkObject *object)
-{
-	ETableItem *eti = E_TABLE_ITEM (object);
-
-	eti_remove_header_model (eti);
-	eti_remove_table_model (eti);
-	eti_remove_selection_model (eti);
-
-	if (eti->height_cache_idle_id)
-		g_source_remove(eti->height_cache_idle_id);
-
-	if (eti->height_cache)
-		g_free (eti->height_cache);
-	eti->height_cache = NULL;
-	eti->height_cache_idle_count = 0;
-
-	e_canvas_hide_tooltip (E_CANVAS(GNOME_CANVAS_ITEM(eti)->canvas));
-	if (eti->tooltip->background)
-		gdk_color_free (eti->tooltip->background);
-	if (eti->tooltip->foreground)
-		gdk_color_free (eti->tooltip->foreground);
-	if (eti->tooltip->timer) {
-		gtk_timeout_remove (eti->tooltip->timer);
-		eti->tooltip->timer = 0;
-	}
-	g_free (eti->tooltip);
-
-	if (GTK_OBJECT_CLASS (eti_parent_class)->destroy)
-		(*GTK_OBJECT_CLASS (eti_parent_class)->destroy) (object);
-}
-
-static void
-eti_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	ETableItem *eti;
-	int cursor_col;
-
-	item = GNOME_CANVAS_ITEM (o);
-	eti = E_TABLE_ITEM (o);
-
-	switch (arg_id){
-	case ARG_TABLE_HEADER:
-		eti_remove_header_model (eti);
-		eti_add_header_model (eti, E_TABLE_HEADER(GTK_VALUE_OBJECT (*arg)));
-		break;
-
-	case ARG_TABLE_MODEL:
-		eti_remove_table_model (eti);
-		eti_add_table_model (eti, E_TABLE_MODEL(GTK_VALUE_OBJECT (*arg)));
-		break;
-		
-	case ARG_SELECTION_MODEL:
-		eti_remove_selection_model (eti);
-		if (GTK_VALUE_OBJECT (*arg))
-			eti_add_selection_model (eti, E_SELECTION_MODEL(GTK_VALUE_OBJECT (*arg)));
-		break;
-		
-	case ARG_LENGTH_THRESHOLD:
-		eti->length_threshold = GTK_VALUE_INT (*arg);
-		break;
-
-	case ARG_TABLE_ALTERNATING_ROW_COLORS:
-		eti->alternating_row_colors = GTK_VALUE_BOOL (*arg);
-		break;
-
-	case ARG_TABLE_HORIZONTAL_DRAW_GRID:
-		eti->horizontal_draw_grid = GTK_VALUE_BOOL (*arg);
-		break;
-
-	case ARG_TABLE_VERTICAL_DRAW_GRID:
-		eti->vertical_draw_grid = GTK_VALUE_BOOL (*arg);
-		break;
-
-	case ARG_TABLE_DRAW_FOCUS:
-		eti->draw_focus = GTK_VALUE_BOOL (*arg);
-		break;
-
-	case ARG_CURSOR_MODE:
-		eti->cursor_mode = GTK_VALUE_INT (*arg);
-		break;
-
-	case ARG_MINIMUM_WIDTH:
-	case ARG_WIDTH:
-		if ((eti->minimum_width == eti->width && GTK_VALUE_DOUBLE (*arg) > eti->width) ||
-		    GTK_VALUE_DOUBLE (*arg) < eti->width) {
-			eti->needs_compute_width = 1;
-			e_canvas_item_request_reflow (GNOME_CANVAS_ITEM(eti));
-		}
-		eti->minimum_width = GTK_VALUE_DOUBLE (*arg);
-		break;
-	case ARG_CURSOR_ROW:
-		gtk_object_get(GTK_OBJECT(eti->selection),
-			       "cursor_col", &cursor_col,
-			       NULL);
-
-		e_table_item_focus (eti, cursor_col != -1 ? cursor_col : 0, view_to_model_row(eti, GTK_VALUE_INT (*arg)), 0);
-		break;
-	}
-	eti->needs_redraw = 1;
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM(eti));
-}
-
-static void
-eti_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	ETableItem *eti;
-	int row;
-
-	item = GNOME_CANVAS_ITEM (o);
-	eti = E_TABLE_ITEM (o);
-
-	switch (arg_id){
-	case ARG_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = eti->width;
-		break;
-	case ARG_HEIGHT:
-		GTK_VALUE_DOUBLE (*arg) = eti->height;
-		break;
-	case ARG_MINIMUM_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = eti->minimum_width;
-		break;
-	case ARG_CURSOR_ROW:
-		gtk_object_get(GTK_OBJECT(eti->selection),
-			       "cursor_row", &row,
-			       NULL);
-		GTK_VALUE_INT (*arg) = model_to_view_row(eti, row);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-	}
-}
-
-static void
-eti_init (GnomeCanvasItem *item)
-{
-	ETableItem *eti = E_TABLE_ITEM (item);
-
-	eti->editing_col               = -1;
-	eti->editing_row               = -1;
-	eti->height                    = 0;
-	eti->width                     = 0;
-	eti->minimum_width             = 0;
-
-	eti->click_count               = 0;
-
-	eti->height_cache              = NULL;
-	eti->height_cache_idle_id      = 0;
-	eti->height_cache_idle_count   = 0;
-	
-	eti->length_threshold          = -1;
-	eti->renderers_can_change_size = 1;
-
-	eti->uses_source_model         = 0;
-	eti->source_model              = NULL;
-	
-	eti->row_guess                 = -1;
-	eti->cursor_mode               = E_CURSOR_SIMPLE;
-
-	eti->selection_change_id       = 0;
-	eti->cursor_change_id          = 0;
-	eti->cursor_activated_id          = 0;
-	eti->selection                 = NULL;
-
-	eti->needs_redraw              = 0;
-	eti->needs_compute_height      = 0;
-
-	eti->in_key_press              = 0;
-
-	eti->tooltip                   = g_new0 (ETableTooltip, 1);
-	eti->tooltip->timer            = 0;
-	eti->tooltip->eti              = GNOME_CANVAS_ITEM (eti);
-	eti->tooltip->background       = NULL;
-	eti->tooltip->foreground       = NULL;
-
-	eti->grabbed_col               = -1;
-	eti->grabbed_row               = -1;
-
-	e_canvas_item_set_reflow_callback (GNOME_CANVAS_ITEM (eti), eti_reflow);
-}
-
-#define gray50_width 2
-#define gray50_height 2
-static const char gray50_bits[] = {
-	0x02, 0x01, };
-
-static void
-eti_realize (GnomeCanvasItem *item)
-{
-	ETableItem *eti = E_TABLE_ITEM (item);
-	GtkWidget *canvas_widget = GTK_WIDGET (item->canvas);
-	GdkWindow *window;
-	
-	if (GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->realize)
-                (*GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->realize)(item);
-
-
-	eti->rows = e_table_model_row_count (eti->table_model);
-
-	/*
-	 * Gdk Resource allocation
-	 */
-	window = canvas_widget->window;
-
-	eti->fill_gc = gdk_gc_new (window);
-
-	eti->grid_gc = gdk_gc_new (window);
-	gdk_gc_set_foreground (eti->grid_gc, &canvas_widget->style->dark [GTK_STATE_NORMAL]);
-	eti->focus_gc = gdk_gc_new (window);
-	gdk_gc_set_foreground (eti->focus_gc, &canvas_widget->style->bg [GTK_STATE_NORMAL]);
-	gdk_gc_set_background (eti->focus_gc, &canvas_widget->style->fg [GTK_STATE_NORMAL]);
-	eti->stipple = gdk_bitmap_create_from_data (NULL, gray50_bits, gray50_width, gray50_height);
-	gdk_gc_set_ts_origin (eti->focus_gc, 0, 0);
-	gdk_gc_set_stipple (eti->focus_gc, eti->stipple);
-	gdk_gc_set_fill (eti->focus_gc, GDK_OPAQUE_STIPPLED);
-
-
-	if (eti->cell_views == NULL)
-		eti_attach_cell_views (eti);
-	
-	eti_realize_cell_views (eti);
-
-	free_height_cache(eti);
-
-	eti->needs_compute_height = 1;
-	eti->needs_compute_width = 1;
-	e_canvas_item_request_reflow (GNOME_CANVAS_ITEM (eti));
-	eti->needs_redraw = 1;
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (eti));
-}
-
-static void
-eti_unrealize (GnomeCanvasItem *item)
-{
-	ETableItem *eti = E_TABLE_ITEM (item);
-	
-	if (eti_editing (eti))
-		e_table_item_leave_edit (eti);
-
-	gdk_gc_unref (eti->fill_gc);
-	eti->fill_gc = NULL;
-	gdk_gc_unref (eti->grid_gc);
-	eti->grid_gc = NULL;
-	gdk_gc_unref (eti->focus_gc);
-	eti->focus_gc = NULL;
-	gdk_bitmap_unref (eti->stipple);
-	eti->stipple = NULL;
-	
-	eti_unrealize_cell_views (eti);
-
-	eti->height = 0;
-	
-	if (GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->unrealize)
-                (*GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->unrealize)(item);
-}
-
-
-
-static void
-eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, int height)
-{
-	ETableItem *eti = E_TABLE_ITEM (item);
-	const int rows = eti->rows;
-	const int cols = eti->cols;
-	int row, col, y1, y2;
-	int first_col, last_col, x_offset;
-	int first_row, last_row, y_offset, yd;
-	int x1, x2;
-	int f_x1, f_x2, f_y1, f_y2;
-	gboolean f_found;
-	double i2c [6];
-	ArtPoint eti_base, eti_base_item, lower_right;
-	GtkWidget *canvas = GTK_WIDGET(item->canvas);
-	int height_extra = eti->horizontal_draw_grid ? 1 : 0;
-
-	/*
-	 * Find out our real position after grouping
-	 */
-	gnome_canvas_item_i2c_affine (item, i2c);
-	eti_base_item.x = eti->x1;
-	eti_base_item.y = eti->y1;
-	art_affine_point (&eti_base, &eti_base_item, i2c);
-
-	eti_base_item.x = eti->x1 + eti->width;
-	eti_base_item.y = eti->y1 + eti->height;
-	art_affine_point (&lower_right, &eti_base_item, i2c);
-
-	/*
-	 * First column to draw, last column to draw
-	 */
-	first_col = -1;
-	last_col = x_offset = 0;
-	x1 = x2 = floor (eti_base.x);
-	for (col = 0; col < cols; col++, x1 = x2){
-		ETableCol *ecol = e_table_header_get_column (eti->header, col);
-
-		x2 = x1 + ecol->width;
-		
-		if (x1 > (x + width))
-			break;
-		if (x2 < x)
-			continue;
-		if (first_col == -1){
-			x_offset = x1 - x;
-			first_col = col;
-		}
-	}
-	last_col = col;
-
-	/*
-	 * Nothing to paint
-	 */
-	if (first_col == -1)
-		return;
-
-	/*
-	 * Compute row span.
-	 */
-	first_row = -1;
-	y_offset = 0;
-	y1 = y2 = floor (eti_base.y) + height_extra;
-	for (row = 0; row < rows; row++, y1 = y2){
-
-		y2 += ETI_ROW_HEIGHT (eti, row) + height_extra;
-
-		if (y1 > y + height)
-			break;
-
-		if (y2 < y)
-			continue;
-
-		if (first_row == -1){
-			y_offset = y1 - y;
-			first_row = row;
-		}
-	}
-	last_row = row;
-
-	if (first_row == -1)
-		return;
-
-	/*
-	 * Draw cells
-	 */
-	yd = y_offset;
-	f_x1 = f_x2 = f_y1 = f_y2 = -1;
-	f_found = FALSE;
-
-	if (eti->horizontal_draw_grid && first_row == 0){
-		gdk_draw_line (
-			drawable, eti->grid_gc,
-				eti_base.x - x, yd, eti_base.x + eti->width - x, yd);
-	}
-
-	yd += height_extra;
-	
-	for (row = first_row; row < last_row; row++){
-		int xd, height;
-		gboolean selected;
-		gint cursor_col, cursor_row;
-		
-		height = ETI_ROW_HEIGHT (eti, row);
-
-		xd = x_offset;
-/*		printf ("paint: %d %d\n", yd, yd + height); */
-		
-		selected = e_selection_model_is_row_selected(E_SELECTION_MODEL (eti->selection), view_to_model_row(eti,row));
-		
-		gtk_object_get(GTK_OBJECT(eti->selection),
-			       "cursor_col", &cursor_col,
-			       "cursor_row", &cursor_row,
-			       NULL);
-		
-		for (col = first_col; col < last_col; col++){
-			ETableCol *ecol = e_table_header_get_column (eti->header, col);
-			ECellView *ecell_view = eti->cell_views [col];
-			gboolean col_selected = selected;
-			ECellFlags flags;
-			gboolean free_background;
-			GdkColor *background;
-
-			switch (eti->cursor_mode) {
-			case E_CURSOR_SIMPLE:
-			case E_CURSOR_SPREADSHEET:
-				if (cursor_col == ecol->col_idx && cursor_row == view_to_model_row(eti, row))
-					col_selected = !col_selected;
-				break;
-			case E_CURSOR_LINE:
-				/* Nothing */
-				break;
-			}
-
-			background = eti_get_cell_background_color (eti, row, col, col_selected, &free_background);
-
-			gdk_gc_set_foreground (eti->fill_gc, background);
-			gdk_draw_rectangle (drawable, eti->fill_gc, TRUE,
-					    xd, yd, ecol->width, height);
-
-			if (free_background)
-				gdk_color_free (background);
-
-			flags = col_selected ? E_CELL_SELECTED : 0;
-			flags |= GTK_WIDGET_HAS_FOCUS(canvas) ? E_CELL_FOCUSED : 0;
-			switch (ecol->justification) {
-			case GTK_JUSTIFY_LEFT:
-				flags |= E_CELL_JUSTIFY_LEFT;
-				break;
-			case GTK_JUSTIFY_RIGHT:
-				flags |= E_CELL_JUSTIFY_RIGHT;
-				break;
-			case GTK_JUSTIFY_CENTER:
-				flags |= E_CELL_JUSTIFY_CENTER;
-				break;
-			case GTK_JUSTIFY_FILL:
-				flags |= E_CELL_JUSTIFY_FILL;
-				break;
-			}
-
-			e_cell_draw (ecell_view, drawable, ecol->col_idx, col, row, flags,
-				     xd, yd, xd + ecol->width, yd + height);
-			
-			if (!f_found) {
-				switch (eti->cursor_mode) {
-				case E_CURSOR_LINE:
-					if (view_to_model_row(eti, row) == cursor_row) {
-						f_x1 = floor (eti_base.x) - x;
-						f_x2 = floor (lower_right.x) - x;
-						f_y1 = yd;
-						f_y2 = yd + height;
-						f_found = TRUE;
-					}
-					break;
-				case E_CURSOR_SIMPLE:
-				case E_CURSOR_SPREADSHEET:
-					if (view_to_model_col(eti, col) == cursor_col && view_to_model_row(eti, row) == cursor_row) {
-						f_x1 = xd;
-						f_x2 = xd + ecol->width;
-						f_y1 = yd;
-						f_y2 = yd + height;
-						f_found = TRUE;
-					}
-					break;
-				}
-			}
-
-			xd += ecol->width;
-		}
-		yd += height;
-
-		if (eti->horizontal_draw_grid) {
-			gdk_draw_line (
-				drawable, eti->grid_gc,
-				eti_base.x - x, yd, eti_base.x + eti->width - x, yd);
-
-			yd++;
-		}
-	}
-
-	if (eti->vertical_draw_grid){
-		int xd = x_offset;
-		
-		for (col = first_col; col <= last_col; col++){
-			ETableCol *ecol = e_table_header_get_column (eti->header, col);
-
-			gdk_draw_line (
-				drawable, eti->grid_gc,
-				xd, y_offset, xd, yd - 1);
-
-			/*
-			 * This looks wierd, but it is to draw the last line
-			 */
-			if (ecol)
-				xd += ecol->width;
-		}
-	}
-	
-	/*
-	 * Draw focus
-	 */
-	if (eti->draw_focus && f_found) {
-		gdk_gc_set_ts_origin (eti->focus_gc, f_x1, f_y1);
-		gdk_draw_rectangle (drawable, eti->focus_gc, FALSE,
-				    f_x1, f_y1, f_x2 - f_x1 - 1, f_y2 - f_y1 - 1);
-	}
-}
-
-static double
-eti_point (GnomeCanvasItem *item, double x, double y, int cx, int cy,
-	   GnomeCanvasItem **actual_item)
-{
-	*actual_item = item;
-
-	return 0.0;
-}
-
-static gboolean
-find_cell (ETableItem *eti, double x, double y, int *view_col_res, int *view_row_res, double *x1_res, double *y1_res)
-{
-	const int cols = eti->cols;
-	const int rows = eti->rows;
-	gdouble x1, y1, x2, y2;
-	int col, row;
-
-	int height_extra = eti->horizontal_draw_grid ? 1 : 0;
-	
-	/* FIXME: this routine is inneficient, fix later */
-
-	if (eti->grabbed_col >= 0 && eti->grabbed_row >= 0) {
-		*view_col_res = eti->grabbed_col;
-		*view_row_res = eti->grabbed_row;
-		*x1_res = x - eti->x1 - e_table_header_col_diff (eti->header, 0, eti->grabbed_col);
-		*y1_res = y - eti->y1 - e_table_item_row_diff (eti, 0, eti->grabbed_row);
-		return TRUE;
-	}
-	
-	if (cols == 0 || rows == 0)
-		return FALSE;
-
-	x -= eti->x1;
-	y -= eti->y1;
-	
-	x1 = 0;
-	for (col = 0; col < cols - 1; col++, x1 = x2){
-		ETableCol *ecol = e_table_header_get_column (eti->header, col);
-
-		if (x < x1)
-			return FALSE;
-		
-		x2 = x1 + ecol->width;
-
-		if (x <= x2)
-			break;
-	}
-
-	y1 = y2 = 0;
-	for (row = 0; row < rows - 1; row++, y1 = y2){
-		if (y < y1)
-			return FALSE;
-		
-		y2 += ETI_ROW_HEIGHT (eti, row) + height_extra;
-
-		if (y <= y2)
-			break;
-	}
-	*view_col_res = col;
-	if (x1_res)
-		*x1_res = x - x1;
-	*view_row_res = row;
-	if (y1_res)
-		*y1_res = y - y1;
-	return TRUE;
-}
-
-static void
-eti_cursor_move (ETableItem *eti, gint row, gint column)
-{
-	e_table_item_leave_edit (eti);
-	e_table_item_focus (eti, view_to_model_col(eti, column), view_to_model_row(eti, row), 0);
-}
-
-static void
-eti_cursor_move_left (ETableItem *eti)
-{
-	int cursor_col, cursor_row;
-	gtk_object_get(GTK_OBJECT(eti->selection),
-		       "cursor_col", &cursor_col,
-		       "cursor_row", &cursor_row,
-		       NULL);
-
-	eti_cursor_move (eti, model_to_view_row(eti, cursor_row), model_to_view_col(eti, cursor_col) - 1);
-}
-
-static void
-eti_cursor_move_right (ETableItem *eti)
-{
-	int cursor_col, cursor_row;
-	gtk_object_get(GTK_OBJECT(eti->selection),
-		       "cursor_col", &cursor_col,
-		       "cursor_row", &cursor_row,
-		       NULL);
-
-	eti_cursor_move (eti, model_to_view_row(eti, cursor_row), model_to_view_col(eti, cursor_col) + 1);
-}
-
-#ifdef DO_TOOLTIPS
-static int
-_do_tooltip (ETableItem *eti)
-{
-	ECellView *ecell_view;
-	int x = 0, y = 0;
-	int i;
-	int height_extra = eti->horizontal_draw_grid ? 1 : 0;
-	gboolean free_color;
-	ETableCol *ecol;
-	gboolean selected;
-	int cursor_row, cursor_col;
-
-	e_canvas_hide_tooltip (E_CANVAS(GNOME_CANVAS_ITEM(eti)->canvas));
-
-	if (eti_editing (eti))
-		return FALSE;
-
-	ecell_view = eti->cell_views[eti->tooltip->col];
-
-	for (i = 0; i < eti->tooltip->col; i++)
-		x += eti->header->columns[i]->width;
-	eti->tooltip->x = x;
-
-	for (i = 0; i < eti->tooltip->row; i++)
-		y += (ETI_ROW_HEIGHT (eti, i) + height_extra);
-	eti->tooltip->y = y;
-	eti->tooltip->row_height = ETI_ROW_HEIGHT (eti, i);
-
-	selected = e_selection_model_is_row_selected(E_SELECTION_MODEL (eti->selection), view_to_model_row(eti,eti->tooltip->row));
-
-	if (eti->tooltip->foreground)
-		gdk_color_free (eti->tooltip->foreground);
-	if (eti->tooltip->background)
-		gdk_color_free (eti->tooltip->background);
-
-	switch (eti->cursor_mode) {
-	case E_CURSOR_SIMPLE:
-	case E_CURSOR_SPREADSHEET:
-		ecol = e_table_header_get_column (eti->header, eti->tooltip->col);
-
-		gtk_object_get(GTK_OBJECT(eti->selection),
-			       "cursor_row", &cursor_row,
-			       "cursor_col", &cursor_col,
-			       NULL);
-
-		if (cursor_col == ecol->col_idx && cursor_row == view_to_model_row(eti, eti->tooltip->row))
-			selected = !selected;
-		break;
-	case E_CURSOR_LINE:
-				/* Nothing */
-		break;
-	}
-
-	eti->tooltip->background = eti_get_cell_background_color (eti, eti->tooltip->row, eti->tooltip->col, selected, &free_color);
-	if (!free_color)
-		eti->tooltip->background = gdk_color_copy(eti->tooltip->background);
-
-	eti->tooltip->foreground = eti_get_cell_foreground_color (eti, eti->tooltip->row, eti->tooltip->col, selected, &free_color);
-	if (!free_color)
-		eti->tooltip->foreground = gdk_color_copy(eti->tooltip->foreground);
-
-	e_cell_show_tooltip (ecell_view, 
-			     view_to_model_col (eti, eti->tooltip->col),
-			     eti->tooltip->col,
-			     eti->tooltip->row,
-			     eti->header->columns[eti->tooltip->col]->width,
-			     eti->tooltip);
-	return FALSE;
-}
-#endif
-
-static gint
-eti_e_cell_event     (ETableItem *item, ECellView *ecell_view, GdkEvent *event, int time, int model_col, int view_col, int row, ECellFlags flags)
-{
-	ECellActions actions = 0;
-	gint ret_val;
-
-	ret_val = e_cell_event (ecell_view, event, model_col, view_col, row, flags, &actions);
-
-	if (actions & E_CELL_GRAB) {
-		gnome_canvas_item_grab(GNOME_CANVAS_ITEM(item), GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, NULL, time);
-		item->grabbed_col = view_col;
-		item->grabbed_row = row;
-	}
-
-	if (actions & E_CELL_UNGRAB) {
-		gnome_canvas_item_ungrab(GNOME_CANVAS_ITEM(item), time);
-		item->grabbed_col = -1;
-		item->grabbed_row = -1;
-	}
-
-	return ret_val;
-}
-
-/* FIXME: cursor */
-static int
-eti_event (GnomeCanvasItem *item, GdkEvent *e)
-{
-	ETableItem *eti = E_TABLE_ITEM (item);
-	ECellView *ecell_view;
-	gint return_val = TRUE;
-
-	switch (e->type){
-	case GDK_BUTTON_PRESS: {
-		double x1, y1;
-		GdkEventButton button;
-		int col, row;
-		gint cursor_row, cursor_col;
-
-		if (eti->tooltip->timer) {
-			gtk_timeout_remove (eti->tooltip->timer);
-			eti->tooltip->timer = 0;
-		}
-
-		switch (e->button.button) {
-		case 1: /* Fall through. */
-		case 2:
-			e_canvas_item_grab_focus(GNOME_CANVAS_ITEM(eti), TRUE);
-			gnome_canvas_item_w2i (item, &e->button.x, &e->button.y);
-
-			if (!find_cell (eti, e->button.x, e->button.y, &col, &row, &x1, &y1)) {
-				if (eti_editing (eti))
-					e_table_item_leave_edit (eti);
-				return TRUE;
-			}
-
-			ecell_view = eti->cell_views [col];
-			button = *(GdkEventButton *)e;
-			button.x = x1;
-			button.y = y1;
-
-			return_val = eti_e_cell_event (eti, ecell_view, (GdkEvent *) &button, button.time, view_to_model_col(eti, col), col, row, 0);
-			if (return_val)
-				return TRUE;
-
-			return_val = FALSE;
-			gtk_signal_emit (GTK_OBJECT (eti), eti_signals [CLICK],
-					 row, view_to_model_col(eti, col), &button, &return_val);
-
-			if (return_val) {
-				eti->click_count = 0;
-				return TRUE;
-			}
-
-			gtk_object_get(GTK_OBJECT(eti->selection),
-				       "cursor_row", &cursor_row,
-				       "cursor_col", &cursor_col,
-				       NULL);
-
-			if (cursor_row != view_to_model_row(eti, row) || cursor_col != view_to_model_col(eti, col)) {
-				eti->click_count = 0;
-			}
-
-			e_selection_model_do_something(E_SELECTION_MODEL (eti->selection), view_to_model_row(eti, row), view_to_model_col(eti, col), button.state);
-
-			gtk_object_get(GTK_OBJECT(eti->selection),
-				       "cursor_row", &cursor_row,
-				       "cursor_col", &cursor_col,
-				       NULL);
-
-			if (cursor_row == view_to_model_row(eti, row) && cursor_col == view_to_model_col(eti, col)){
-
-				eti->click_count ++;
-				eti->row_guess = row;
-
-				if ((!eti_editing(eti)) && e_table_model_is_cell_editable(eti->table_model, cursor_col, row)) {
-					e_table_item_enter_edit (eti, col, row);
-				}
-
-				/*
-				 * Adjust the event positions
-				 */
-
-				return_val = eti_e_cell_event (eti, ecell_view, (GdkEvent *) &button, button.time, 
-							       view_to_model_col(eti, col), col, row, E_CELL_EDITING);
-			}
-			d(g_print("Single click\n"));
-
-			break;
-		case 3:
-			e_canvas_item_grab_focus(GNOME_CANVAS_ITEM(eti), TRUE);
-			gnome_canvas_item_w2i (item, &e->button.x, &e->button.y);
-			if (!find_cell (eti, e->button.x, e->button.y, &col, &row, &x1, &y1))
-				return TRUE;
-
-			e_selection_model_maybe_do_something(E_SELECTION_MODEL (eti->selection), view_to_model_row(eti, row), view_to_model_col(eti, col), 0);
-			
-			gtk_signal_emit (GTK_OBJECT (eti), eti_signals [RIGHT_CLICK],
-					 row, view_to_model_col(eti, col), e, &return_val);
-			break;
-		case 4:
-		case 5:
-			return FALSE;
-			break;
-			
-		}
-		break;
-	}
-
-	case GDK_BUTTON_RELEASE: {
-		double x1, y1;
-		int col, row;
-		gint cursor_row, cursor_col;
-
-		if (eti->tooltip->timer) {
-			gtk_timeout_remove (eti->tooltip->timer);
-			eti->tooltip->timer = 0;
-		}
-		e_canvas_hide_tooltip (E_CANVAS(GNOME_CANVAS_ITEM(eti)->canvas));
-		switch (e->button.button) {
-		case 1: /* Fall through. */
-		case 2:
-			gnome_canvas_item_w2i (item, &e->button.x, &e->button.y);
-
-			if (!find_cell (eti, e->button.x, e->button.y, &col, &row, &x1, &y1))
-				return TRUE;
-
-			gtk_object_get(GTK_OBJECT(eti->selection),
-				       "cursor_row", &cursor_row,
-				       "cursor_col", &cursor_col,
-				       NULL);
-
-			if (cursor_row == view_to_model_row(eti, row) && cursor_col == view_to_model_col(eti, col)){
-
-				ecell_view = eti->cell_views [col];
-
-				/*
-				 * Adjust the event positions
-				 */
-				e->button.x = x1;
-				e->button.y = y1;
-
-				return_val = eti_e_cell_event (eti, ecell_view, e, e->button.time,
-							       view_to_model_col(eti, col), col, row, E_CELL_EDITING);
-			}
-			d(g_print ("Release\n"));
-			break;
-		case 3:
-		case 4:
-		case 5:
-			return FALSE;
-			break;
-			
-		}
-		break;
-	}
-
-	case GDK_2BUTTON_PRESS: {
-		int col, row;
-#if 0
-		double x1, y1;
-#endif
-		GdkEventButton button;
-
-		if (e->button.button == 5 ||
-		    e->button.button == 4)
-			return FALSE;
-
-		/*
-		 * click_count is so that if you click on two
-		 * different rows we don't send a double click signal.
-		 */
-
-		if (eti->click_count >= 2) {
-
-			gnome_canvas_item_w2i (item, &e->button.x, &e->button.y);
-
-#if 0
-			if (!find_cell (eti, e->button.x, e->button.y, &current_col, &current_row, &x1, &y1))
-				return TRUE;
-#endif
-
-			gtk_object_get(GTK_OBJECT(eti->selection),
-				       "cursor_row", &row,
-				       "cursor_col", &col,
-				       NULL);
-
-			button.x -= e_table_header_col_diff (eti->header, 0, model_to_view_col (eti, col));
-			button.y -= e_table_item_row_diff (eti, 0, model_to_view_row (eti, row));
-
-#if 0
-			button = *(GdkEventButton *)e;
-			button.x = x1;
-			button.y = y1;
-#endif
-
-			if (row != -1 && col != -1) {
-				gtk_signal_emit (GTK_OBJECT (eti), eti_signals [DOUBLE_CLICK],
-						 row, col, &button);
-				d(g_print("Double click\n"));
-			}
-		}
-		break;
-	}
-	case GDK_MOTION_NOTIFY: {
-		int col, row;
-		double x1, y1;
-		gint cursor_col, cursor_row;
-
-		gnome_canvas_item_w2i (item, &e->motion.x, &e->motion.y);
-
-		if (!find_cell (eti, e->motion.x, e->motion.y, &col, &row, &x1, &y1))
-			return TRUE;
-
-		gtk_object_get(GTK_OBJECT(eti->selection),
-			       "cursor_row", &cursor_row,
-			       "cursor_col", &cursor_col,
-			       NULL);
-
-		e_canvas_hide_tooltip (E_CANVAS(GNOME_CANVAS_ITEM(eti)->canvas));
-
-#ifdef DO_TOOLTIPS
-		if (g_getenv ("GAL_DO_TOOLTIPS")) {
-			if (eti->tooltip->timer > 0)
-				gtk_timeout_remove (eti->tooltip->timer);
-			eti->tooltip->col = col;
-			eti->tooltip->row = row;
-			eti->tooltip->cx = e->motion.x;
-			eti->tooltip->cy = e->motion.y;
-			eti->tooltip->timer = gtk_timeout_add (100, (GSourceFunc)_do_tooltip, eti);
-		}
-#endif
-
-		if (cursor_row == view_to_model_row(eti, row) && cursor_col == view_to_model_col(eti, col)){
-			ecell_view = eti->cell_views [col];
-
-			/*
-			 * Adjust the event positions
-			 */
-			e->motion.x = x1;
-			e->motion.y = y1;
-			
-			return_val = eti_e_cell_event (eti, ecell_view, e, e->motion.time,
-						       view_to_model_col(eti, col), col, row, E_CELL_EDITING);
-		}
-		break;
-	}
-		
-	case GDK_KEY_PRESS: {
-		gint cursor_row, cursor_col;
-		gint handled = TRUE;
-
-		gtk_object_get(GTK_OBJECT(eti->selection),
-			       "cursor_row", &cursor_row,
-			       "cursor_col", &cursor_col,
-			       NULL);
-
-		if (eti->tooltip->timer) {
-			gtk_timeout_remove (eti->tooltip->timer);
-			eti->tooltip->timer = 0;
-		}
-		e_canvas_hide_tooltip (E_CANVAS(GNOME_CANVAS_ITEM(eti)->canvas));
-
-		if (cursor_col == -1)
-			return FALSE;
-
-		eti->in_key_press = TRUE;
-
-		switch (e->key.keyval){
-		case GDK_Left:
-		case GDK_KP_Left:
-			if (eti_editing (eti)) {
-				handled = FALSE;
-				break;
-			}
-			
-			gtk_signal_emit (GTK_OBJECT (eti), eti_signals [KEY_PRESS],
-					 model_to_view_row(eti, cursor_row), cursor_col, e, &return_val);
-			if ((!return_val) && eti->cursor_mode != E_CURSOR_LINE && cursor_col != view_to_model_col(eti, 0))
-				eti_cursor_move_left (eti);
-			return_val = 1;
-			break;
-
-		case GDK_Right:
-		case GDK_KP_Right:
-			if (eti_editing (eti)) {
-				handled = FALSE;
-				break;
-			}
-
-			gtk_signal_emit (GTK_OBJECT (eti), eti_signals [KEY_PRESS],
-					 model_to_view_row(eti, cursor_row), cursor_col, e, &return_val);
-			if ((!return_val) && eti->cursor_mode != E_CURSOR_LINE && cursor_col != view_to_model_col(eti, eti->cols - 1))
-				eti_cursor_move_right (eti);
-			return_val = 1;
-			break;
-			
-		case GDK_Up:
-		case GDK_KP_Up:
-		case GDK_Down:
-		case GDK_KP_Down:
-			return_val = e_selection_model_key_press(E_SELECTION_MODEL (eti->selection), (GdkEventKey *) e);
-			break;
-		case GDK_Home:
-		case GDK_KP_Home:
-			if (eti->cursor_mode != E_CURSOR_LINE) {
-				eti_cursor_move (eti, model_to_view_row(eti, cursor_row), 0);
-				return_val = TRUE;
-			} else 
-				return_val = e_selection_model_key_press(E_SELECTION_MODEL (eti->selection), (GdkEventKey *) e);
-			break;
-		case GDK_End:
-		case GDK_KP_End:
-			if (eti->cursor_mode != E_CURSOR_LINE) {
-				eti_cursor_move (eti, model_to_view_row(eti, cursor_row), eti->cols - 1);
-				return_val = TRUE;
-			} else 
-				return_val = e_selection_model_key_press(E_SELECTION_MODEL (eti->selection), (GdkEventKey *) e);
-			break;
-		case GDK_Tab:
-		case GDK_KP_Tab:
-		case GDK_ISO_Left_Tab:
-			if (eti->cursor_mode == E_CURSOR_SPREADSHEET) {
-				if ((e->key.state & GDK_SHIFT_MASK) != 0){
-				/* shift tab */
-					if (cursor_col != view_to_model_col(eti, 0))
-						eti_cursor_move_left (eti);
-					else if (cursor_row != view_to_model_row(eti, 0))
-						eti_cursor_move (eti, model_to_view_row(eti, cursor_row) - 1, eti->cols - 1);
-					else
-						return_val = FALSE;
-				} else {
-					if (cursor_col != view_to_model_col (eti, eti->cols - 1))
-						eti_cursor_move_right (eti);
-					else if (cursor_row != view_to_model_row(eti, eti->rows - 1))
-						eti_cursor_move (eti, model_to_view_row(eti, cursor_row) + 1, 0);
-					else 
-						return_val = FALSE;
-				}
-				gtk_object_get(GTK_OBJECT(eti->selection),
-					       "cursor_row", &cursor_row,
-					       "cursor_col", &cursor_col,
-					       NULL);
-
-				if (cursor_col >= 0 && cursor_row >= 0 && return_val &&
-				    (!eti_editing(eti)) && e_table_model_is_cell_editable(eti->table_model, cursor_col, model_to_view_row (eti, cursor_row))) {
-					e_table_item_enter_edit (eti, model_to_view_col(eti, cursor_col), model_to_view_row(eti, cursor_row));
-				}
-				break;
-			} else {
-			/* Let tab send you to the next widget. */
-			return_val = FALSE;
-			break;
-			}
-
-		case GDK_Return:
-		case GDK_KP_Enter:
-		case GDK_ISO_Enter:
-		case GDK_3270_Enter:
-			if (eti_editing (eti)){
-				e_table_item_leave_edit (eti);
-#if 0
-				ecell_view = eti->cell_views [eti->editing_col];
-				return_val = eti_e_cell_event (eti, ecell_view, e, e->key.time,
-							       view_to_model_col(eti, eti->editing_col),
-							       eti->editing_col, eti->editing_row, E_CELL_EDITING);
-#endif
-			}
-			gtk_signal_emit (GTK_OBJECT (eti), eti_signals [KEY_PRESS],
-					 model_to_view_row(eti, cursor_row), cursor_col, e, &return_val);
-			if (!return_val)
-				return_val = e_selection_model_key_press(E_SELECTION_MODEL (eti->selection), (GdkEventKey *) e);
-			break;
-			
-		default:
-			handled = FALSE;
-			break;
-		}
-
-		if (!handled) {
-			switch (e->key.keyval) {
-			case GDK_Scroll_Lock:
-			case GDK_Sys_Req:
-			case GDK_Shift_L:
-			case GDK_Shift_R:
-			case GDK_Control_L:
-			case GDK_Control_R:
-			case GDK_Caps_Lock:
-			case GDK_Shift_Lock:
-			case GDK_Meta_L:
-			case GDK_Meta_R:
-			case GDK_Alt_L:
-			case GDK_Alt_R:
-			case GDK_Super_L:
-			case GDK_Super_R:
-			case GDK_Hyper_L:
-			case GDK_Hyper_R:
-			case GDK_ISO_Lock:
-				break;
-
-			default:
-				if (!eti_editing (eti)){
-					gint col, row;
-					row = model_to_view_row(eti, cursor_row);
-					col = model_to_view_col(eti, cursor_col);
-					if (col != -1 && row != -1 && e_table_model_is_cell_editable(eti->table_model, cursor_col, row)) { 
-						e_table_item_enter_edit (eti, col, row);
-					}
-				}
-				if (!eti_editing (eti)){
-					gtk_signal_emit (GTK_OBJECT (eti), eti_signals [KEY_PRESS],
-							 model_to_view_row(eti, cursor_row), cursor_col, e, &return_val);
-					if (!return_val)
-						e_selection_model_key_press(E_SELECTION_MODEL (eti->selection), (GdkEventKey *) e);
-				} else {
-					ecell_view = eti->cell_views [eti->editing_col];
-					return_val = eti_e_cell_event (eti, ecell_view, e, e->key.time,
-								       view_to_model_col(eti, eti->editing_col),
-								       eti->editing_col, eti->editing_row, E_CELL_EDITING);
-					if (!return_val)
-						e_selection_model_key_press(E_SELECTION_MODEL (eti->selection), (GdkEventKey *) e);
-				}
-				break;
-			}
-		}
-		eti->in_key_press = FALSE;
-		break;
-	}
-	
-	case GDK_KEY_RELEASE: {
-		gint cursor_row, cursor_col;
-
-		gtk_object_get(GTK_OBJECT(eti->selection),
-			       "cursor_row", &cursor_row,
-			       "cursor_col", &cursor_col,
-			       NULL);
-
-		if (cursor_col == -1)
-			return FALSE;
-
-		if (eti_editing (eti)){
-			ecell_view = eti->cell_views [eti->editing_col];
-			return_val = eti_e_cell_event (eti, ecell_view, e, e->key.time,
-						       view_to_model_col(eti, eti->editing_col),
-						       eti->editing_col, eti->editing_row, E_CELL_EDITING);
-		}
-		break;
-	}
-
-	case GDK_LEAVE_NOTIFY:
-	case GDK_ENTER_NOTIFY:
-		if (eti->tooltip->timer > 0)
-			gtk_timeout_remove (eti->tooltip->timer);
-		eti->tooltip->timer = 0;
-		break;
-
-	case GDK_FOCUS_CHANGE:
-		if (! e->focus_change.in) {
-			if (eti_editing (eti))
-				e_table_item_leave_edit (eti);
-		}
-
-	default:
-		return_val = FALSE;
-	}
-	return return_val;
-}
-
-static void
-eti_class_init (GtkObjectClass *object_class)
-{
-	GnomeCanvasItemClass *item_class = (GnomeCanvasItemClass *) object_class;
-	ETableItemClass *eti_class  = (ETableItemClass *) object_class;
-	
-	eti_parent_class            = gtk_type_class (PARENT_OBJECT_TYPE);
-	
-	object_class->destroy       = eti_destroy;
-	object_class->set_arg       = eti_set_arg;
-	object_class->get_arg       = eti_get_arg;
-
-	item_class->update          = eti_update;
-	item_class->realize         = eti_realize;
-	item_class->unrealize       = eti_unrealize;
-	item_class->draw            = eti_draw;
-	item_class->point           = eti_point;
-	item_class->event           = eti_event;
-	
-	eti_class->cursor_change    = NULL;
-	eti_class->cursor_activated = NULL;
-	eti_class->double_click     = NULL;
-	eti_class->right_click      = NULL;
-	eti_class->click            = NULL;
-	eti_class->key_press        = NULL;
-
-	gtk_object_add_arg_type ("ETableItem::ETableHeader", E_TABLE_HEADER_TYPE,
-				 GTK_ARG_WRITABLE, ARG_TABLE_HEADER);
-	gtk_object_add_arg_type ("ETableItem::ETableModel", E_TABLE_MODEL_TYPE,
-				 GTK_ARG_WRITABLE, ARG_TABLE_MODEL);
-	gtk_object_add_arg_type ("ETableItem::selection_model", E_SELECTION_MODEL_TYPE,
-				 GTK_ARG_WRITABLE, ARG_SELECTION_MODEL);
-	gtk_object_add_arg_type ("ETableItem::alternating_row_colors", GTK_TYPE_BOOL,
-				 GTK_ARG_WRITABLE, ARG_TABLE_ALTERNATING_ROW_COLORS);
-	gtk_object_add_arg_type ("ETableItem::horizontal_draw_grid", GTK_TYPE_BOOL,
-				 GTK_ARG_WRITABLE, ARG_TABLE_HORIZONTAL_DRAW_GRID);
-	gtk_object_add_arg_type ("ETableItem::vertical_draw_grid", GTK_TYPE_BOOL,
-				 GTK_ARG_WRITABLE, ARG_TABLE_VERTICAL_DRAW_GRID);
-	gtk_object_add_arg_type ("ETableItem::drawfocus", GTK_TYPE_BOOL,
-				 GTK_ARG_WRITABLE, ARG_TABLE_DRAW_FOCUS);
-	gtk_object_add_arg_type ("ETableItem::cursor_mode", GTK_TYPE_INT,
-				 GTK_ARG_WRITABLE, ARG_CURSOR_MODE);
-	gtk_object_add_arg_type ("ETableItem::length_threshold", GTK_TYPE_INT,
-				 GTK_ARG_WRITABLE, ARG_LENGTH_THRESHOLD);
-
-	gtk_object_add_arg_type ("ETableItem::minimum_width", GTK_TYPE_DOUBLE, 
-				 GTK_ARG_READWRITE, ARG_MINIMUM_WIDTH); 
-	gtk_object_add_arg_type ("ETableItem::width", GTK_TYPE_DOUBLE, 
-				 GTK_ARG_READWRITE, ARG_WIDTH); 
-	gtk_object_add_arg_type ("ETableItem::height", GTK_TYPE_DOUBLE, 
-				 GTK_ARG_READABLE, ARG_HEIGHT);
-	gtk_object_add_arg_type ("ETableItem::cursor_row", GTK_TYPE_INT,
-				 GTK_ARG_READWRITE, ARG_CURSOR_ROW);
-
-	eti_signals [CURSOR_CHANGE] =
-		gtk_signal_new ("cursor_change",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableItemClass, cursor_change),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
-
-	eti_signals [CURSOR_ACTIVATED] =
-		gtk_signal_new ("cursor_activated",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableItemClass, cursor_activated),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
-
-	eti_signals [DOUBLE_CLICK] =
-		gtk_signal_new ("double_click",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableItemClass, double_click),
-				gtk_marshal_NONE__INT_INT_POINTER,
-				GTK_TYPE_NONE, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
-
-	eti_signals [RIGHT_CLICK] =
-		gtk_signal_new ("right_click",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableItemClass, right_click),
-				e_marshal_INT__INT_INT_POINTER,
-				GTK_TYPE_INT, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
-
-	eti_signals [CLICK] =
-		gtk_signal_new ("click",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableItemClass, click),
-				e_marshal_INT__INT_INT_POINTER,
-				GTK_TYPE_INT, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
-
-	eti_signals [KEY_PRESS] =
-		gtk_signal_new ("key_press",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableItemClass, key_press),
-				e_marshal_INT__INT_INT_POINTER,
-				GTK_TYPE_INT, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
-
-	gtk_object_class_add_signals (object_class, eti_signals, LAST_SIGNAL);
-
-}
-
-GtkType
-e_table_item_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"ETableItem",
-			sizeof (ETableItem),
-			sizeof (ETableItemClass),
-			(GtkClassInitFunc) eti_class_init,
-			(GtkObjectInitFunc) eti_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_OBJECT_TYPE, &info);
-	}
-
-	return type;
-}
-
-/** 
- * e_table_item_set_cursor:
- * @eti: %ETableItem which will have the cursor set.
- * @col: Column to select.  -1 means the last column.
- * @row: Row to select.  -1 means the last row.
- *
- * This routine sets the cursor of the %ETableItem canvas item.
- */
-void
-e_table_item_set_cursor    (ETableItem *eti, int col, int row)
-{
-	e_table_item_focus(eti, col, view_to_model_row(eti, row), 0);
-}
-
-static void
-e_table_item_focus (ETableItem *eti, int col, int row, GdkModifierType state)
-{
-	g_return_if_fail (eti != NULL);
-	g_return_if_fail (E_IS_TABLE_ITEM (eti));
-	
-	if (row == -1) {
-		row = view_to_model_row(eti, eti->rows - 1);
-	}
-
-	if (col == -1) {
-		col = eti->cols - 1;
-	}
-
-	if (row != -1) {
-		e_selection_model_do_something(E_SELECTION_MODEL (eti->selection),
-					       row, col,
-					       state);
-	}
-}
-
-/** 
- * e_table_item_get_focused_column:
- * @eti: %ETableItem which will have the cursor retrieved.
- *
- * This routine gets the cursor of the %ETableItem canvas item.
- *
- * Returns: The current cursor column.
- */
-gint
-e_table_item_get_focused_column (ETableItem *eti)
-{	
-	int cursor_col;
-
-	g_return_val_if_fail (eti != NULL, -1);
-	g_return_val_if_fail (E_IS_TABLE_ITEM (eti), -1);
-	
-	gtk_object_get(GTK_OBJECT(eti->selection),
-		       "cursor_col", &cursor_col,
-		       NULL);
-
-	return cursor_col;
-}
-
-static void
-eti_cursor_change (ESelectionModel *selection, int row, int col, ETableItem *eti)
-{
-	int view_row;
-	int view_col;
-
-	if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED))
-		return;
-
-	view_row = model_to_view_row(eti, row);
-	view_col = model_to_view_col(eti, col);
-	
-	if (view_row == -1 || view_col == -1) {
-		e_table_item_leave_edit (eti);
-		return;
-	}
-
-	if (! e_table_model_has_change_pending (eti->table_model)) {
-		if (!eti->in_key_press) {
-			eti_request_region_show (eti, view_col, view_row, view_col, view_row, DOUBLE_CLICK_TIME + 10);
-		} else {
-			eti_request_region_show (eti, view_col, view_row, view_col, view_row, 0);
-		}
-	}
-
-	e_canvas_item_grab_focus(GNOME_CANVAS_ITEM(eti), FALSE);
-	if (eti_editing(eti))
-		e_table_item_leave_edit (eti);
-	gtk_signal_emit (GTK_OBJECT (eti), eti_signals [CURSOR_CHANGE],
-			 view_row);
-	eti->needs_redraw = TRUE;
-	gnome_canvas_item_request_update(GNOME_CANVAS_ITEM(eti));
-}
-
-static void
-eti_cursor_activated (ESelectionModel *selection, int row, int col, ETableItem *eti)
-{
-	int view_row;
-	int view_col;
-
-	if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED))
-		return;
-
-	view_row = model_to_view_row(eti, row);
-	view_col = model_to_view_col(eti, col);
-	
-	if (view_row == -1 || view_col == -1) {
-		e_table_item_leave_edit (eti);
-		return;
-	}
-
-	if (eti_editing(eti))
-		e_table_item_leave_edit (eti);
-	gtk_signal_emit (GTK_OBJECT (eti), eti_signals [CURSOR_ACTIVATED],
-			 view_row);
-}
-
-static void
-eti_selection_change (ESelectionModel *selection, ETableItem *eti)
-{
-	if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED))
-		return;
-
-	eti->needs_redraw = TRUE;
-	gnome_canvas_item_request_update(GNOME_CANVAS_ITEM(eti));
-}
-
-
-/** 
- * e_table_item_enter_edit
- * @eti: %ETableItem which will start being edited
- * @col: The view col to edit.
- * @row: The view row to edit.
- *
- * This routine starts the given %ETableItem editing at the given view
- * column and row.
- */
-void
-e_table_item_enter_edit (ETableItem *eti, int col, int row)
-{
-	g_return_if_fail (eti != NULL);
-	g_return_if_fail (E_IS_TABLE_ITEM (eti));
-	
-	if (eti_editing (eti))
-		e_table_item_leave_edit(eti);
-
-	eti->editing_col = col;
-	eti->editing_row = row;
-
-	eti->edit_ctx = e_cell_enter_edit (eti->cell_views [col], view_to_model_col(eti, col), col, row);
-}
-
-/** 
- * e_table_item_leave_edit
- * @eti: %ETableItem which will stop being edited
- *
- * This routine stops the given %ETableItem from editing.
- */
-void
-e_table_item_leave_edit (ETableItem *eti)
-{
-	int col, row;
-	void *edit_ctx;
-	
-	g_return_if_fail (eti != NULL);
-	g_return_if_fail (E_IS_TABLE_ITEM (eti));
-
-	if (!eti_editing (eti))
-		return;
-
-	col = eti->editing_col;
-	row = eti->editing_row;
-	edit_ctx = eti->edit_ctx;
-
-	eti->editing_col = -1;
-	eti->editing_row = -1;
-	eti->edit_ctx = NULL;
-
-	e_cell_leave_edit (eti->cell_views [col],
-			   view_to_model_col(eti, col),
-			   col, row, edit_ctx);
-}
-
-/** 
- * e_table_item_compute_location
- * @eti: %ETableItem to look in.
- * @x: A pointer to the x location to find in the %ETableItem.
- * @y: A pointer to the y location to find in the %ETableItem.
- * @row: A pointer to the location to store the found row in.
- * @col: A pointer to the location to store the found col in.
- *
- * This routine locates the pixel location (*x, *y) in the
- * %ETableItem.  If that location is in the %ETableItem, *row and *col
- * are set to the view row and column where it was found.  If that
- * location is not in the %ETableItem, the height of the %ETableItem
- * is removed from the value y points to.
- */
-void 
-e_table_item_compute_location (ETableItem        *eti,
-			       int               *x,
-			       int               *y,
-			       int               *row,
-			       int               *col)
-{
-	/* Save the grabbed row but make sure that we don't get flawed
-           results because the cursor is grabbed. */
-	int grabbed_row = eti->grabbed_row;
-	eti->grabbed_row = -1;
-
-	if (!find_cell (eti, *x, *y, col, row, NULL, NULL)) {
-		*y -= eti_get_height(eti);
-	}
-
-	eti->grabbed_row = grabbed_row;
-}
-
-void
-e_table_item_get_cell_geometry   (ETableItem        *eti,
-				  int               *row,
-				  int               *col,
-				  int               *x,
-				  int               *y,
-				  int               *width,
-				  int               *height)
-{
-	if (eti->rows > *row) {
-		if (x)
-			*x = e_table_header_col_diff (eti->header, 0, *col);
-		if (y)
-			*y = e_table_item_row_diff (eti, 0, *row);
-		if (width)
-			*width = e_table_header_col_diff (eti->header, *col, *col + 1);
-		if (height)
-			*height = ETI_ROW_HEIGHT (eti, *row);
-		*row = -1;
-		*col = -1;
-	} else {
-		*row -= eti->rows;
-	}
-}
-
-typedef struct {
-	ETableItem *item;
-	int rows_printed;
-} ETableItemPrintContext;
-
-static gdouble *
-e_table_item_calculate_print_widths (ETableHeader *eth, gdouble width)
-{
-	int i;
-	double extra;
-	double expansion;
-	int last_resizable = -1;
-	gdouble scale = 300.0L / 70.0L;
-	gdouble *widths = g_new(gdouble, e_table_header_count(eth));
-	/* - 1 to account for the last pixel border. */
-	extra = width - 1;
-	expansion = 0;
-	for (i = 0; i < eth->col_count; i++) {
-		extra -= eth->columns[i]->min_width * scale;
-		if (eth->columns[i]->resizable && eth->columns[i]->expansion > 0)
-			last_resizable = i;
-		expansion += eth->columns[i]->resizable ? eth->columns[i]->expansion : 0;
-		widths[i] = eth->columns[i]->min_width * scale;
-	}
-	for (i = 0; i <= last_resizable; i++) {
-		widths[i] += extra * (eth->columns[i]->resizable ? eth->columns[i]->expansion : 0)/expansion;
-	}
-
-	return widths;
-}
-
-static gdouble
-eti_printed_row_height (ETableItem *eti, gdouble *widths, GnomePrintContext *context, gint row)
-{
-	int col;
-	int cols = eti->cols;
-	gdouble height = 0;
-	for (col = 0; col < cols; col++) {
-		ECellView *ecell_view = eti->cell_views [col];
-		gdouble this_height = e_cell_print_height (ecell_view, context, view_to_model_col(eti, col), col, row, 
-							   widths[col] - 1);
-		if (this_height > height)
-			height = this_height;
-	}
-	return height;
-}
-
-#define CHECK(x) if((x) == -1) return -1;
-
-static gint
-gp_draw_rect (GnomePrintContext *context, gdouble x, gdouble y, gdouble width, gdouble height)
-{
-	CHECK(gnome_print_moveto(context, x, y));
-	CHECK(gnome_print_lineto(context, x + width, y));
-	CHECK(gnome_print_lineto(context, x + width, y - height));
-	CHECK(gnome_print_lineto(context, x, y - height));
-	CHECK(gnome_print_lineto(context, x, y));
-	return gnome_print_fill(context);
-}
-
-static void
-e_table_item_print_page  (EPrintable *ep,
-			  GnomePrintContext *context,
-			  gdouble width,
-			  gdouble height,
-			  gboolean quantize,
-			  ETableItemPrintContext *itemcontext)
-{
-	ETableItem *eti = itemcontext->item;
-	const int rows = eti->rows;
-	const int cols = eti->cols;
-	int rows_printed = itemcontext->rows_printed;
-	gdouble *widths;
-	int row, col;
-	gdouble yd = height;
-	
-	widths = e_table_item_calculate_print_widths (itemcontext->item->header, width);
-
-	/*
-	 * Draw cells
-	 */
-	if (eti->horizontal_draw_grid){
-		gp_draw_rect(context, 0, yd, width, 1);
-	}
-	yd--;
-	
-	for (row = rows_printed; row < rows; row++){
-		gdouble xd = 1, row_height;
-		
-		row_height = eti_printed_row_height(eti, widths, context, row);
-		if (quantize) {
-			if (yd - row_height - 1 < 0 && row != rows_printed) {
-				break;
-			}
-		} else {
-			if (yd < 0) {
-				break;
-			}
-		}
-
-		for (col = 0; col < cols; col++){
-			ECellView *ecell_view = eti->cell_views [col];
-
-			if (gnome_print_gsave(context) == -1)
-				/* FIXME */;
-			if (gnome_print_translate(context, xd, yd - row_height) == -1)
-				/* FIXME */;
-
-			if (gnome_print_moveto(context, 0, 0) == -1)
-				/* FIXME */;
-			if (gnome_print_lineto(context, widths[col] - 1, 0) == -1)
-				/* FIXME */;
-			if (gnome_print_lineto(context, widths[col] - 1, row_height) == -1)
-				/* FIXME */;
-			if (gnome_print_lineto(context, 0, row_height) == -1)
-				/* FIXME */;
-			if (gnome_print_lineto(context, 0, 0) == -1)
-				/* FIXME */;
-			if (gnome_print_clip(context) == -1)
-				/* FIXME */;
-
-			e_cell_print (ecell_view, context, view_to_model_col(eti, col), col, row, 
-				      widths[col] - 1, row_height);
-
-			if (gnome_print_grestore(context) == -1)
-				/* FIXME */;
-			
-			xd += widths[col];
-		}
-		yd -= row_height;
-
-		if (eti->horizontal_draw_grid){
-			gp_draw_rect(context, 0, yd, width, 1);
-		}
-		yd--;
-	}
-
-	itemcontext->rows_printed = row;
-
-	if (eti->vertical_draw_grid){
-		gdouble xd = 0;
-		
-		for (col = 0; col < cols; col++){
-			gp_draw_rect(context, xd, height, 1, height - yd);
-			
-			xd += widths[col];
-		}
-		gp_draw_rect(context, xd, height, 1, height - yd);
-	}
-
-	g_free (widths);
-}
-
-static gboolean
-e_table_item_data_left   (EPrintable *ep,
-			  ETableItemPrintContext *itemcontext)
-{
-	ETableItem *item = itemcontext->item;
-	int rows_printed = itemcontext->rows_printed;
-
-	gtk_signal_emit_stop_by_name(GTK_OBJECT(ep), "data_left");
-	return rows_printed < item->rows;
-}
-
-static void
-e_table_item_reset       (EPrintable *ep,
-			  ETableItemPrintContext *itemcontext)
-{
-	itemcontext->rows_printed = 0;
-}
-
-static gdouble
-e_table_item_height      (EPrintable *ep,
-			  GnomePrintContext *context,
-			  gdouble width,
-			  gdouble max_height,
-			  gboolean quantize,
-			  ETableItemPrintContext *itemcontext)
-{
-	ETableItem *item = itemcontext->item;
-	const int rows = item->rows;
-	int rows_printed = itemcontext->rows_printed;
-	gdouble *widths;
-	int row;
-	gdouble yd = 0;
-	
-	widths = e_table_item_calculate_print_widths (itemcontext->item->header, width);
-
-	/*
-	 * Draw cells
-	 */
-	yd++;
-	
-	for (row = rows_printed; row < rows; row++){
-		gdouble row_height;
-		
-		row_height = eti_printed_row_height(item, widths, context, row);
-		if (quantize) {
-			if (max_height != -1 && yd + row_height + 1 > max_height && row != rows_printed) {
-				break;
-			}
-		} else {
-			if (max_height != -1 && yd > max_height) {
-				break;
-			}
-		}
-
-		yd += row_height;
-
-		yd++;
-	}
-
-	g_free (widths);
-	
-	if (max_height != -1 && (!quantize) && yd > max_height)
-		yd = max_height;
-
-	gtk_signal_emit_stop_by_name(GTK_OBJECT(ep), "height");
-	return yd;
-}
-
-static gboolean
-e_table_item_will_fit     (EPrintable *ep,
-			   GnomePrintContext *context,
-			   gdouble width,
-			   gdouble max_height,
-			   gboolean quantize,
-			   ETableItemPrintContext *itemcontext)
-{
-	ETableItem *item = itemcontext->item;
-	const int rows = item->rows;
-	int rows_printed = itemcontext->rows_printed;
-	gdouble *widths;
-	int row;
-	gdouble yd = 0;
-	gboolean ret_val = TRUE;
-	
-	widths = e_table_item_calculate_print_widths (itemcontext->item->header, width);
-
-	/*
-	 * Draw cells
-	 */
-	yd++;
-	
-	for (row = rows_printed; row < rows; row++){
-		gdouble row_height;
-		
-		row_height = eti_printed_row_height(item, widths, context, row);
-		if (quantize) {
-			if (max_height != -1 && yd + row_height + 1 > max_height && row != rows_printed) {
-				ret_val = FALSE;
-				break;
-			}
-		} else {
-			if (max_height != -1 && yd > max_height) {
-				ret_val = FALSE;
-				break;
-			}
-		}
-
-		yd += row_height;
-
-		yd++;
-	}
-
-	g_free (widths);
-
-	gtk_signal_emit_stop_by_name(GTK_OBJECT(ep), "will_fit");
-	return ret_val;
-}
-
-static void
-e_table_item_printable_destroy (GtkObject *object,
-				ETableItemPrintContext *itemcontext)
-{
-	gtk_object_unref(GTK_OBJECT(itemcontext->item));
-	g_free(itemcontext);
-}
-
-/** 
- * e_table_item_get_printable
- * @eti: %ETableItem which will be printed
- *
- * This routine creates and returns an %EPrintable that can be used to
- * print the given %ETableItem.
- *
- * Returns: The %EPrintable. 
- */
-EPrintable *
-e_table_item_get_printable (ETableItem *item)
-{
-	EPrintable *printable = e_printable_new();
-	ETableItemPrintContext *itemcontext;
-
-	itemcontext = g_new(ETableItemPrintContext, 1);
-	itemcontext->item = item;
-	gtk_object_ref(GTK_OBJECT(item));
-	itemcontext->rows_printed = 0;
-
-	gtk_signal_connect (GTK_OBJECT(printable),
-			    "print_page",
-			    GTK_SIGNAL_FUNC(e_table_item_print_page),
-			    itemcontext);
-	gtk_signal_connect (GTK_OBJECT(printable),
-			    "data_left",
-			    GTK_SIGNAL_FUNC(e_table_item_data_left),
-			    itemcontext);
-	gtk_signal_connect (GTK_OBJECT(printable),
-			    "reset",
-			    GTK_SIGNAL_FUNC(e_table_item_reset),
-			    itemcontext);
-	gtk_signal_connect (GTK_OBJECT(printable),
-			    "height",
-			    GTK_SIGNAL_FUNC(e_table_item_height),
-			    itemcontext);
-	gtk_signal_connect (GTK_OBJECT(printable),
-			    "will_fit",
-			    GTK_SIGNAL_FUNC(e_table_item_will_fit),
-			    itemcontext);
-	gtk_signal_connect (GTK_OBJECT(printable),
-			    "destroy",
-			    GTK_SIGNAL_FUNC(e_table_item_printable_destroy),
-			    itemcontext);
-
-	return printable;
-}
diff --git a/widgets/table/e-table-item.h b/widgets/table/e-table-item.h
deleted file mode 100644
index 87394dc26d..0000000000
--- a/widgets/table/e-table-item.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_ITEM_H_
-#define _E_TABLE_ITEM_H_
-
-#include <libgnomeui/gnome-canvas.h>
-#include <gal/e-table/e-table-model.h>
-#include <gal/e-table/e-table-header.h>
-#include <gal/e-table/e-table-defines.h>
-#include <gal/e-table/e-table-tooltip.h>
-#include <gal/widgets/e-selection-model.h>
-#include <gal/widgets/e-printable.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TABLE_ITEM_TYPE        (e_table_item_get_type ())
-#define E_TABLE_ITEM(o)          (GTK_CHECK_CAST ((o), E_TABLE_ITEM_TYPE, ETableItem))
-#define E_TABLE_ITEM_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_ITEM_TYPE, ETableItemClass))
-#define E_IS_TABLE_ITEM(o)       (GTK_CHECK_TYPE ((o), E_TABLE_ITEM_TYPE))
-#define E_IS_TABLE_ITEM_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_ITEM_TYPE))
-
-typedef struct {
-	GnomeCanvasItem  parent;
-	ETableModel     *table_model;
-	ETableHeader    *header;
-
-	ETableModel     *source_model;
-	ESelectionModel *selection;
-
-	int              x1, y1;
-	int              minimum_width, width, height;
-
-	int              cols, rows;
-
-	int              click_count;
-	
-	/*
-	 * Ids for the signals we connect to
-	 */
-	int              header_dim_change_id;
-	int              header_structure_change_id;
-	int              header_request_width_id;
-	int              table_model_pre_change_id;
-	int              table_model_change_id;
-	int              table_model_row_change_id;
-	int              table_model_cell_change_id;
-	int              table_model_rows_inserted_id;
-	int              table_model_rows_deleted_id;
-
-	int              selection_change_id;
-	int              cursor_change_id;
-	int              cursor_activated_id;
-	
-	GdkGC           *fill_gc;
-	GdkGC           *grid_gc;
-	GdkGC           *focus_gc;
-	GdkBitmap       *stipple;
-
-	guint		 alternating_row_colors:1;
-	guint 		 horizontal_draw_grid:1;
-	guint 		 vertical_draw_grid:1;
-	guint 		 draw_focus:1;
-	guint 		 renderers_can_change_size:1;
-	guint 		 cell_views_realized:1;
-	      	    
-	guint 		 needs_redraw : 1;
-	guint 		 needs_compute_height : 1;
-	guint 		 needs_compute_width : 1;
-
-	guint            uses_source_model : 1;
-
-	guint            in_key_press : 1;
-
-	/*
-	 * Realized views, per column
-	 */
-	ECellView      **cell_views;
-	int              n_cells;
-
-	int             *height_cache;
-	int              height_cache_idle_id;
-	int              height_cache_idle_count;
-
-	/*
-	 * Lengh Threshold: above this, we stop computing correctly
-	 * the size
-	 */
-	int              length_threshold;
-	
-	gint             row_guess;
-	ECursorMode      cursor_mode;
-
-	/*
-	 * During editing
-	 */
-	int              editing_col, editing_row;
-	void            *edit_ctx;
-
-	int grabbed_col, grabbed_row;
-
-	/*
-	 * Tooltip
-	 */
-	ETableTooltip *tooltip;
-
-} ETableItem;
-
-typedef struct {
-	GnomeCanvasItemClass parent_class;
-
-	void        (*cursor_change) (ETableItem *eti, int row);
-	void        (*cursor_activated) (ETableItem *eti, int row);
-	void        (*double_click)  (ETableItem *eti, int row, int col, GdkEvent *event);
-	gint        (*right_click)   (ETableItem *eti, int row, int col, GdkEvent *event);
-	gint        (*click)   (ETableItem *eti, int row, int col, GdkEvent *event);
-	gint        (*key_press)     (ETableItem *eti, int row, int col, GdkEvent *event);
-} ETableItemClass;
-GtkType     e_table_item_get_type            (void);
-
-
-/*
- * Focus
- */
-void        e_table_item_set_cursor          (ETableItem        *eti,
-					      int                col,
-					      int                row);
-
-gint        e_table_item_get_focused_column  (ETableItem        *eti);
-
-void        e_table_item_leave_edit          (ETableItem        *eti);
-void        e_table_item_enter_edit          (ETableItem        *eti,
-					      int                col,
-					      int                row);
-
-void        e_table_item_redraw_range        (ETableItem        *eti,
-					      int                start_col,
-					      int                start_row,
-					      int                end_col,
-					      int                end_row);
-
-EPrintable *e_table_item_get_printable       (ETableItem        *eti);
-void        e_table_item_compute_location    (ETableItem        *eti,
-					      int               *x,
-					      int               *y,
-					      int               *row,
-					      int               *col);
-void        e_table_item_get_cell_geometry   (ETableItem        *eti,
-					      int               *row,
-					      int               *col,
-					      int               *x,
-					      int               *y,
-					      int               *width,
-					      int               *height);
-
-int	    e_table_item_row_diff	     (ETableItem	*eti,
-					      int		 start_row,
-					      int		 end_row);
-
-END_GNOME_DECLS
-
-#endif /* _E_TABLE_ITEM_H_ */
diff --git a/widgets/table/e-table-memory-callbacks.c b/widgets/table/e-table-memory-callbacks.c
deleted file mode 100644
index c1089b5f28..0000000000
--- a/widgets/table/e-table-memory-callbacks.c
+++ /dev/null
@@ -1,254 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-table-memory-callbacks.c: a simple table model implementation
- * that uses function pointers to simplify the creation of new, exotic
- * and colorful tables in no time.
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * (C) 1999, 2000 Ximian, Inc.
- */
-
-#include <config.h>
-#include "e-table-memory-callbacks.h"
-
-enum {
-	ARG_0,
-	ARG_APPEND_ROW,
-};
-
-#define PARENT_TYPE e_table_memory_get_type ()
-
-static int
-etmc_column_count (ETableModel *etm)
-{
-	ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS(etm);
-
-	if (etmc->col_count)
-		return etmc->col_count (etm, etmc->data);
-	else
-		return 0;
-}
-
-static void *
-etmc_value_at (ETableModel *etm, int col, int row)
-{
-	ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS(etm);
-
-	if (etmc->value_at)
-		return etmc->value_at (etm, col, row, etmc->data);
-	else
-		return NULL;
-}
-
-static void
-etmc_set_value_at (ETableModel *etm, int col, int row, const void *val)
-{
-	ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS(etm);
-
-	if (etmc->set_value_at)
-		etmc->set_value_at (etm, col, row, val, etmc->data);
-}
-
-static gboolean
-etmc_is_cell_editable (ETableModel *etm, int col, int row)
-{
-	ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS(etm);
-
-	if (etmc->is_cell_editable)
-		return etmc->is_cell_editable (etm, col, row, etmc->data);
-	else
-		return FALSE;
-}
-
-/* The default for etmc_duplicate_value is to return the raw value. */
-static void *
-etmc_duplicate_value (ETableModel *etm, int col, const void *value)
-{
-	ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS(etm);
-
-	if (etmc->duplicate_value)
-		return etmc->duplicate_value (etm, col, value, etmc->data);
-	else
-		return (void *)value;
-}
-
-static void
-etmc_free_value (ETableModel *etm, int col, void *value)
-{
-	ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS(etm);
-
-	if (etmc->free_value)
-		etmc->free_value (etm, col, value, etmc->data);
-}
-
-static void *
-etmc_initialize_value (ETableModel *etm, int col)
-{
-	ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS(etm);
-	
-	if (etmc->initialize_value)
-		return etmc->initialize_value (etm, col, etmc->data);
-	else
-		return NULL;
-}
-
-static gboolean
-etmc_value_is_empty (ETableModel *etm, int col, const void *value)
-{
-	ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS(etm);
-	
-	if (etmc->value_is_empty)
-		return etmc->value_is_empty (etm, col, value, etmc->data);
-	else
-		return FALSE;
-}
-
-static char *
-etmc_value_to_string (ETableModel *etm, int col, const void *value)
-{
-	ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS(etm);
-	
-	if (etmc->value_to_string)
-		return etmc->value_to_string (etm, col, value, etmc->data);
-	else
-		return g_strdup ("");
-}
-
-static void
-etmc_append_row (ETableModel *etm, ETableModel *source, int row)
-{
-	ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS(etm);
-	
-	if (etmc->append_row)
-		etmc->append_row (etm, source, row, etmc->data);
-}
-
-static void
-etmc_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS (o);
-
-	switch (arg_id){
-	case ARG_APPEND_ROW:
-		GTK_VALUE_POINTER(*arg) = etmc->append_row;
-		break;
-	}
-}
-
-static void
-etmc_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS (o);
-	
-	switch (arg_id){
-	case ARG_APPEND_ROW:
-		etmc->append_row = GTK_VALUE_POINTER(*arg);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-	}
-}
-
-static void
-e_table_memory_callbacks_class_init (GtkObjectClass *object_class)
-{
-	ETableModelClass *model_class = (ETableModelClass *) object_class;
-
-	object_class->set_arg         = etmc_set_arg;
-	object_class->get_arg         = etmc_get_arg;
-
-	model_class->column_count     = etmc_column_count;
-	model_class->value_at         = etmc_value_at;
-	model_class->set_value_at     = etmc_set_value_at;
-	model_class->is_cell_editable = etmc_is_cell_editable;
-	model_class->duplicate_value  = etmc_duplicate_value;
-	model_class->free_value       = etmc_free_value;
-	model_class->initialize_value = etmc_initialize_value;
-	model_class->value_is_empty   = etmc_value_is_empty;
-	model_class->value_to_string  = etmc_value_to_string;
-	model_class->append_row       = etmc_append_row;
-
-	gtk_object_add_arg_type ("ETableMemoryCalbacks::append_row", GTK_TYPE_POINTER,
-				 GTK_ARG_READWRITE, ARG_APPEND_ROW);
-}
-
-GtkType
-e_table_memory_callbacks_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"ETableMemoryCalbacks",
-			sizeof (ETableMemoryCalbacks),
-			sizeof (ETableMemoryCalbacksClass),
-			(GtkClassInitFunc) e_table_memory_callbacks_class_init,
-			(GtkObjectInitFunc) NULL,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-/**
- * e_table_memory_callbacks_new:
- * @col_count:
- * @value_at:
- * @set_value_at:
- * @is_cell_editable:
- * @duplicate_value:
- * @free_value:
- * @initialize_value:
- * @value_is_empty:
- * @value_to_string:
- * @data: closure pointer.
- *
- * This initializes a new ETableMemoryCalbacksModel object.  ETableMemoryCalbacksModel is
- * an implementaiton of the abstract class ETableModel.  The ETableMemoryCalbacksModel
- * is designed to allow people to easily create ETableModels without having
- * to create a new GtkType derived from ETableModel every time they need one.
- *
- * Instead, ETableMemoryCalbacksModel uses a setup based in callback functions, every
- * callback function signature mimics the signature of each ETableModel method
- * and passes the extra @data pointer to each one of the method to provide them
- * with any context they might want to use. 
- *
- * Returns: An ETableMemoryCalbacksModel object (which is also an ETableModel
- * object).
- */
-ETableModel *
-e_table_memory_callbacks_new (ETableMemoryCalbacksColumnCountFn col_count,
-			      ETableMemoryCalbacksValueAtFn value_at,
-			      ETableMemoryCalbacksSetValueAtFn set_value_at,
-			      ETableMemoryCalbacksIsCellEditableFn is_cell_editable,
-			      ETableMemoryCalbacksDuplicateValueFn duplicate_value,
-			      ETableMemoryCalbacksFreeValueFn free_value,
-			      ETableMemoryCalbacksInitializeValueFn initialize_value,
-			      ETableMemoryCalbacksValueIsEmptyFn value_is_empty,
-			      ETableMemoryCalbacksValueToStringFn value_to_string,
-			      void *data)
-{
-	ETableMemoryCalbacks *et;
-
-	et                   = gtk_type_new (e_table_memory_callbacks_get_type ());
-
-	et->col_count        = col_count;
-	et->value_at         = value_at;
-	et->set_value_at     = set_value_at;
-	et->is_cell_editable = is_cell_editable;
-	et->duplicate_value  = duplicate_value;
-	et->free_value       = free_value;
-	et->initialize_value = initialize_value;
-	et->value_is_empty   = value_is_empty;
-	et->value_to_string  = value_to_string;
-	et->data             = data;
-	
-	return (ETableModel *) et;
- }
diff --git a/widgets/table/e-table-memory-callbacks.h b/widgets/table/e-table-memory-callbacks.h
deleted file mode 100644
index 72f637f764..0000000000
--- a/widgets/table/e-table-memory-callbacks.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_MEMORY_CALLBACKS_H_
-#define _E_TABLE_MEMORY_CALLBACKS_H_
-
-#include <gal/e-table/e-table-memory.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_TABLE_MEMORY_CALLBACKS_TYPE        (e_table_memory_callbacks_get_type ())
-#define E_TABLE_MEMORY_CALLBACKS(o)          (GTK_CHECK_CAST ((o), E_TABLE_MEMORY_CALLBACKS_TYPE, ETableMemoryCalbacks))
-#define E_TABLE_MEMORY_CALLBACKS_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_MEMORY_CALLBACKS_TYPE, ETableMemoryCalbacksClass))
-#define E_IS_TABLE_MEMORY_CALLBACKS(o)       (GTK_CHECK_TYPE ((o), E_TABLE_MEMORY_CALLBACKS_TYPE))
-#define E_IS_TABLE_MEMORY_CALLBACKS_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_MEMORY_CALLBACKS_TYPE))
-
-typedef int         (*ETableMemoryCalbacksColumnCountFn)     (ETableModel *etm, void *data);
-typedef void        (*ETableMemoryCalbacksAppendRowFn)       (ETableModel *etm, ETableModel *model, int row, void *data);
-
-typedef	void       *(*ETableMemoryCalbacksValueAtFn)         (ETableModel *etm, int col, int row, void *data);
-typedef	void        (*ETableMemoryCalbacksSetValueAtFn)      (ETableModel *etm, int col, int row, const void *val, void *data);
-typedef	gboolean    (*ETableMemoryCalbacksIsCellEditableFn)  (ETableModel *etm, int col, int row, void *data);
-
-typedef	void       *(*ETableMemoryCalbacksDuplicateValueFn)  (ETableModel *etm, int col, const void *val, void *data);
-typedef	void        (*ETableMemoryCalbacksFreeValueFn)       (ETableModel *etm, int col, void *val, void *data);
-typedef void       *(*ETableMemoryCalbacksInitializeValueFn) (ETableModel *etm, int col, void *data);
-typedef gboolean    (*ETableMemoryCalbacksValueIsEmptyFn)    (ETableModel *etm, int col, const void *val, void *data);
-typedef char       *(*ETableMemoryCalbacksValueToStringFn)   (ETableModel *etm, int col, const void *val, void *data);
-
-typedef struct {
-	ETableMemory parent;
-
-	ETableMemoryCalbacksColumnCountFn     col_count;
-	ETableMemoryCalbacksAppendRowFn       append_row;
-
-	ETableMemoryCalbacksValueAtFn         value_at;
-	ETableMemoryCalbacksSetValueAtFn      set_value_at;
-	ETableMemoryCalbacksIsCellEditableFn  is_cell_editable;
-
-	ETableMemoryCalbacksDuplicateValueFn  duplicate_value;
-	ETableMemoryCalbacksFreeValueFn       free_value;
-	ETableMemoryCalbacksInitializeValueFn initialize_value;
-	ETableMemoryCalbacksValueIsEmptyFn    value_is_empty;
-	ETableMemoryCalbacksValueToStringFn   value_to_string;
-	void *data;
-} ETableMemoryCalbacks;
-
-typedef struct {
-	ETableMemoryClass parent_class;
-} ETableMemoryCalbacksClass;
-
-GtkType e_table_memory_callbacks_get_type (void);
-
-ETableModel *e_table_memory_callbacks_new (ETableMemoryCalbacksColumnCountFn col_count,
-
-				 ETableMemoryCalbacksValueAtFn value_at,
-				 ETableMemoryCalbacksSetValueAtFn set_value_at,
-				 ETableMemoryCalbacksIsCellEditableFn is_cell_editable,
-
-				 ETableMemoryCalbacksDuplicateValueFn duplicate_value,
-				 ETableMemoryCalbacksFreeValueFn free_value,
-				 ETableMemoryCalbacksInitializeValueFn initialize_value,
-				 ETableMemoryCalbacksValueIsEmptyFn value_is_empty,
-				 ETableMemoryCalbacksValueToStringFn value_to_string,
-				 void *data);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TABLE_MEMORY_CALLBACKS_H_ */
-
diff --git a/widgets/table/e-table-memory.c b/widgets/table/e-table-memory.c
deleted file mode 100644
index b92881a847..0000000000
--- a/widgets/table/e-table-memory.c
+++ /dev/null
@@ -1,284 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-table-memory.c: a Table Model implementation that the programmer builds in memory.
- *
- * Author:
- *   Chris Toshok (toshok@ximian.com)
- *   Chris Lahey <clahey@ximian.com>
- *
- * Adapted from the gtable code and ETableModel.
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#include <config.h>
-
-#include "e-table-memory.h"
-
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-#include <gtk/gtksignal.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include "gal/util/e-util.h"
-#include "gal/util/e-xml-utils.h"
-#include <string.h>
-
-#define PARENT_TYPE E_TABLE_MODEL_TYPE
-
-static ETableModel *parent_class;
-
-struct ETableMemoryPriv {
-	gpointer *data;
-	int num_rows;
-	gint frozen;
-};
-
-
-/* virtual methods */
-
-static void
-etmm_destroy (GtkObject *object)
-{
-	ETableMemory *etmm = E_TABLE_MEMORY (object);
-	ETableMemoryPriv *priv = etmm->priv;
-
-	/* XXX lots of stuff to free here */
-
-	g_free (priv->data);
-	g_free (priv);
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-static int
-etmm_row_count (ETableModel *etm)
-{
-	ETableMemory *etmm = E_TABLE_MEMORY (etm);
-
-	return etmm->priv->num_rows;
-}
-
-
-static void
-e_table_memory_class_init (GtkObjectClass *klass)
-{
-	ETableModelClass *table_class = (ETableModelClass *) klass;
-
-	parent_class               = gtk_type_class (PARENT_TYPE);
-	
-	klass->destroy             = etmm_destroy;
-
-	table_class->row_count     = etmm_row_count;
-}
-
-static void
-e_table_memory_init (GtkObject *object)
-{
-	ETableMemory *etmm = (ETableMemory *)object;
-
-	ETableMemoryPriv *priv;
-
-	priv = g_new0 (ETableMemoryPriv, 1);
-	etmm->priv = priv;
-
-	priv->data = NULL;
-	priv->num_rows = 0;
-	priv->frozen = 0;
-}
-
-E_MAKE_TYPE(e_table_memory, "ETableMemory", ETableMemory, e_table_memory_class_init, e_table_memory_init, PARENT_TYPE)
-
-
-
-/**
- * e_table_memory_construct:
- * @etable: 
- * 
- * 
- **/
-void
-e_table_memory_construct (ETableMemory *etmm)
-{
-}
-
-/**
- * e_table_memory_new
- *
- * XXX docs here.
- *
- * return values: a newly constructed ETableMemory.
- */
-ETableMemory *
-e_table_memory_new (void)
-{
-	ETableMemory *etmm;
-
-	etmm = gtk_type_new (e_table_memory_get_type ());
-
-	e_table_memory_construct(etmm);
-
-	return etmm;
-}
-
-/**
- * e_table_memory_get_data:
- * @etmm: 
- * @row: 
- * 
- * 
- * 
- * Return value: 
- **/
-gpointer
-e_table_memory_get_data (ETableMemory *etmm, int row)
-{
-	g_return_val_if_fail(row >= 0, NULL);
-	g_return_val_if_fail(row < etmm->priv->num_rows, NULL);
-
-	return etmm->priv->data[row];
-}
-
-/**
- * e_table_memory_set_data:
- * @etmm: 
- * @row: 
- * @data: 
- * 
- * 
- **/
-void
-e_table_memory_set_data (ETableMemory *etmm, int row, gpointer data)
-{
-	g_return_if_fail(row >= 0);
-	g_return_if_fail(row < etmm->priv->num_rows);
-
-	etmm->priv->data[row] = data;
-}
-
-/**
- * e_table_memory_insert:
- * @table_model: 
- * @parent_path: 
- * @position: 
- * @data: 
- * 
- * 
- * 
- * Return value: 
- **/
-void
-e_table_memory_insert (ETableMemory *etmm,
-		       int row,
-		       gpointer data)
-{
-	g_return_if_fail(row >= -1);
-	g_return_if_fail(row <= etmm->priv->num_rows);
-
-	if (!etmm->priv->frozen)
-		e_table_model_pre_change(E_TABLE_MODEL(etmm));
-
-	if (row == -1)
-		row = etmm->priv->num_rows;
-	etmm->priv->data = g_renew(gpointer, etmm->priv->data, etmm->priv->num_rows + 1);
-	memmove(etmm->priv->data + row + 1, etmm->priv->data + row, (etmm->priv->num_rows - row) * sizeof (gpointer));
-	etmm->priv->data[row] = data;
-	etmm->priv->num_rows ++;
-	if (!etmm->priv->frozen)
-		e_table_model_row_inserted(E_TABLE_MODEL(etmm), row);
-}
-
-
-
-/**
- * e_table_memory_remove:
- * @etable: 
- * @path: 
- * 
- * 
- * 
- * Return value: 
- **/
-gpointer
-e_table_memory_remove (ETableMemory *etmm, int row)
-{
-	gpointer ret;
-
-	g_return_val_if_fail(row >= 0, NULL);
-	g_return_val_if_fail(row < etmm->priv->num_rows, NULL);
-
-	if (!etmm->priv->frozen)
-		e_table_model_pre_change(E_TABLE_MODEL(etmm));
-	ret = etmm->priv->data[row];
-	memmove(etmm->priv->data + row, etmm->priv->data + row + 1, (etmm->priv->num_rows - row - 1) * sizeof (gpointer));
-	etmm->priv->num_rows --;
-	if (!etmm->priv->frozen)
-		e_table_model_row_deleted(E_TABLE_MODEL(etmm), row);
-	return ret;
-}
-
-/**
- * e_table_memory_clear:
- * @etable: 
- * @path: 
- * 
- * 
- * 
- * Return value: 
- **/
-void
-e_table_memory_clear (ETableMemory *etmm)
-{
-	if (!etmm->priv->frozen)
-		e_table_model_pre_change(E_TABLE_MODEL(etmm));
-	g_free(etmm->priv->data);
-	etmm->priv->data = NULL;
-	etmm->priv->num_rows = 0;
-	if (!etmm->priv->frozen)
-		e_table_model_changed(E_TABLE_MODEL(etmm));
-}
-
-/**
- * e_table_memory_freeze:
- * @etmm: the ETableModel to freeze.
- * 
- * This function prepares an ETableModel for a period of much change.
- * All signals regarding changes to the table are deferred until we
- * thaw the table.
- * 
- **/
-void
-e_table_memory_freeze(ETableMemory *etmm)
-{
-	ETableMemoryPriv *priv = etmm->priv;
-
-	if (priv->frozen == 0)
-		e_table_model_pre_change(E_TABLE_MODEL(etmm));
-
-	priv->frozen ++;
-}
-
-/**
- * e_table_memory_thaw:
- * @etmm: the ETableMemory to thaw.
- * 
- * This function thaws an ETableMemory.  All the defered signals can add
- * up to a lot, we don't know - so we just emit a model_changed
- * signal.
- * 
- **/
-void
-e_table_memory_thaw(ETableMemory *etmm)
-{
-	ETableMemoryPriv *priv = etmm->priv;
-
-	if (priv->frozen > 0)
-		priv->frozen --;
-	if (priv->frozen == 0) {
-		e_table_model_changed(E_TABLE_MODEL(etmm));
-	}
-}
diff --git a/widgets/table/e-table-memory.h b/widgets/table/e-table-memory.h
deleted file mode 100644
index e1a70d506c..0000000000
--- a/widgets/table/e-table-memory.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_MEMORY_H_
-#define _E_TABLE_MEMORY_H_
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gal/e-table/e-table-model.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-#define E_TABLE_MEMORY_TYPE        (e_table_memory_get_type ())
-#define E_TABLE_MEMORY(o)          (GTK_CHECK_CAST ((o), E_TABLE_MEMORY_TYPE, ETableMemory))
-#define E_TABLE_MEMORY_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_MEMORY_TYPE, ETableMemoryClass))
-#define E_IS_TABLE_MEMORY(o)       (GTK_CHECK_TYPE ((o), E_TABLE_MEMORY_TYPE))
-#define E_IS_TABLE_MEMORY_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_MEMORY_TYPE))
-
-typedef struct ETableMemory ETableMemory;
-typedef struct ETableMemoryPriv ETableMemoryPriv;
-typedef struct ETableMemoryClass ETableMemoryClass;
-
-struct ETableMemory {
-	ETableModel base;
-	ETableMemoryPriv *priv;
-};
-
-struct ETableMemoryClass {
-	ETableModelClass parent_class;
-};
-
-
-GtkType       e_table_memory_get_type     (void);
-void          e_table_memory_construct    (ETableMemory *etable);
-ETableMemory *e_table_memory_new          (void);
-
-/* row operations */
-void          e_table_memory_insert  (ETableMemory *etable,
-				      int           row,
-				      gpointer      data);
-gpointer      e_table_memory_remove  (ETableMemory *etable,
-				      int           row);
-void          e_table_memory_clear   (ETableMemory *etable);
-
-/* Freeze and thaw */
-void          e_table_memory_freeze       (ETableMemory *etable);
-void          e_table_memory_thaw         (ETableMemory *etable);
-gpointer      e_table_memory_get_data     (ETableMemory *etm,
-					   int           row);
-void          e_table_memory_set_data     (ETableMemory *etm,
-					   int           row,
-					   gpointer      data);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TABLE_MEMORY_H */
diff --git a/widgets/table/e-table-model.c b/widgets/table/e-table-model.c
deleted file mode 100644
index 9429aeb0f9..0000000000
--- a/widgets/table/e-table-model.c
+++ /dev/null
@@ -1,541 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-table-model.c: a Table Model
- *
- * Authors:
- *   Miguel de Icaza (miguel@gnu.org)
- *   Chris Lahey (clahey@ximian.com)
- *
- * (C) 1999, 2000 Ximian, Inc.
- */
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "e-table-model.h"
-
-#define ETM_CLASS(e) ((ETableModelClass *)((GtkObject *)e)->klass)
-
-#define PARENT_TYPE gtk_object_get_type ()
-
-#define d(x)
-
-d(static gint depth = 0);
-
-
-static GtkObjectClass *e_table_model_parent_class;
-
-enum {
-	MODEL_CHANGED,
-	MODEL_PRE_CHANGE,
-	MODEL_ROW_CHANGED,
-	MODEL_CELL_CHANGED,
-	MODEL_ROWS_INSERTED,
-	MODEL_ROWS_DELETED,
-	ROW_SELECTION,
-	LAST_SIGNAL
-};
-
-static guint e_table_model_signals [LAST_SIGNAL] = { 0, };
-
-/**
- * e_table_model_column_count:
- * @e_table_model: The e-table-model to operate on
- *
- * Returns: the number of columns in the table model.
- */
-int
-e_table_model_column_count (ETableModel *e_table_model)
-{
-	g_return_val_if_fail (e_table_model != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), 0);
-
-	return ETM_CLASS (e_table_model)->column_count (e_table_model);
-}
-
-
-/**
- * e_table_model_row_count:
- * @e_table_model: the e-table-model to operate on
- *
- * Returns: the number of rows in the Table model.
- */
-int
-e_table_model_row_count (ETableModel *e_table_model)
-{
-	g_return_val_if_fail (e_table_model != NULL, 0);
-	g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), 0);
-
-	return ETM_CLASS (e_table_model)->row_count (e_table_model);
-}
-
-/**
- * e_table_model_append_row:
- * @e_table_model: the table model to append the a row to.
- * @source:
- * @row:
- *
- */
-void
-e_table_model_append_row (ETableModel *e_table_model, ETableModel *source, int row)
-{
-	g_return_if_fail (e_table_model != NULL);
-	g_return_if_fail (E_IS_TABLE_MODEL (e_table_model));
-
-	if (ETM_CLASS (e_table_model)->append_row)
-		ETM_CLASS (e_table_model)->append_row (e_table_model, source, row);
-}
-
-/**
- * e_table_value_at:
- * @e_table_model: the e-table-model to operate on
- * @col: column in the model to pull data from.
- * @row: row in the model to pull data from.
- *
- * Return value: This function returns the value that is stored
- * by the @e_table_model in column @col and row @row.  The data
- * returned can be a pointer or any data value that can be stored
- * inside a pointer.
- *
- * The data returned is typically used by an ECell renderer
- */
-void *
-e_table_model_value_at (ETableModel *e_table_model, int col, int row)
-{
-	g_return_val_if_fail (e_table_model != NULL, NULL);
-	g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), NULL);
-
-	return ETM_CLASS (e_table_model)->value_at (e_table_model, col, row);
-}
-
-/**
- * e_table_model_set_value_at:
- * @e_table_model: the table model to operate on.
- * @col: the column where the data will be stored in the model.
- * @row: the row where the data will be stored in the model. 
- * @value: the data to be stored.
- *
- * This function instructs the model to store the value in @data in the
- * the @e_table_model at column @col and row @row.  The @data typically
- * comes from one of the ECell rendering objects.
- *
- * There should be an agreement between the Table Model and the user
- * of this function about the data being stored.  Typically it will
- * be a pointer to a set of data, or a datum that fits inside a void *.
- */
-void
-e_table_model_set_value_at (ETableModel *e_table_model, int col, int row, const void *value)
-{
-	g_return_if_fail (e_table_model != NULL);
-	g_return_if_fail (E_IS_TABLE_MODEL (e_table_model));
-
-	ETM_CLASS (e_table_model)->set_value_at (e_table_model, col, row, value);
-}
-
-/**
- * e_table_model_is_cell_editable:
- * @e_table_model: the table model to query.
- * @col: column to query.
- * @row: row to query.
- *
- * Returns: %TRUE if the cell in @e_table_model at @col,@row can be
- * edited, %FALSE otherwise
- */
-gboolean
-e_table_model_is_cell_editable (ETableModel *e_table_model, int col, int row)
-{
-	g_return_val_if_fail (e_table_model != NULL, FALSE);
-	g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), FALSE);
-
-	return ETM_CLASS (e_table_model)->is_cell_editable (e_table_model, col, row);
-}
-
-
-void *
-e_table_model_duplicate_value (ETableModel *e_table_model, int col, const void *value)
-{
-	g_return_val_if_fail (e_table_model != NULL, NULL);
-	g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), NULL);
-
-	if (ETM_CLASS (e_table_model)->duplicate_value)
-		return ETM_CLASS (e_table_model)->duplicate_value (e_table_model, col, value);
-	else
-		return NULL;
-}
-
-void
-e_table_model_free_value (ETableModel *e_table_model, int col, void *value)
-{
-	g_return_if_fail (e_table_model != NULL);
-	g_return_if_fail (E_IS_TABLE_MODEL (e_table_model));
-
-	if (ETM_CLASS (e_table_model)->free_value)
-		ETM_CLASS (e_table_model)->free_value (e_table_model, col, value);
-}
-
-char *
-e_table_model_get_save_id(ETableModel *e_table_model, int row)
-{
-	g_return_val_if_fail (e_table_model != NULL, "/");
-	g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), "/");
-
-	if (ETM_CLASS (e_table_model)->get_save_id)
-		return ETM_CLASS (e_table_model)->get_save_id (e_table_model, row);
-	else
-		return NULL;
-}
-
-gboolean
-e_table_model_has_save_id(ETableModel *e_table_model)
-{
-	g_return_val_if_fail (e_table_model != NULL, FALSE);
-	g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), FALSE);
-
-	if (ETM_CLASS (e_table_model)->has_save_id)
-		return ETM_CLASS (e_table_model)->has_save_id (e_table_model);
-	else
-		return FALSE;
-}
-
-gboolean
-e_table_model_has_change_pending(ETableModel *e_table_model)
-{
-	g_return_val_if_fail (e_table_model != NULL, FALSE);
-	g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), FALSE);
-
-	if (ETM_CLASS (e_table_model)->has_change_pending)
-		return ETM_CLASS (e_table_model)->has_change_pending (e_table_model);
-	else
-		return FALSE;
-}
-
-void *
-e_table_model_initialize_value (ETableModel *e_table_model, int col)
-{
-	g_return_val_if_fail (e_table_model != NULL, NULL);
-	g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), NULL);
-
-	if (ETM_CLASS (e_table_model)->initialize_value)
-		return ETM_CLASS (e_table_model)->initialize_value (e_table_model, col);
-	else
-		return NULL;
-}
-
-gboolean
-e_table_model_value_is_empty (ETableModel *e_table_model, int col, const void *value)
-{
-	g_return_val_if_fail (e_table_model != NULL, FALSE);
-	g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), FALSE);
-
-	if (ETM_CLASS (e_table_model)->value_is_empty)
-		return ETM_CLASS (e_table_model)->value_is_empty (e_table_model, col, value);
-	else
-		return FALSE;
-}
-
-char *
-e_table_model_value_to_string (ETableModel *e_table_model, int col, const void *value)
-{
-	g_return_val_if_fail (e_table_model != NULL, NULL);
-	g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), NULL);
-
-	if (ETM_CLASS (e_table_model)->value_to_string)
-		return ETM_CLASS (e_table_model)->value_to_string (e_table_model, col, value);
-	else
-		return g_strdup("");
-}
-
-static void
-e_table_model_destroy (GtkObject *object)
-{
-	if (e_table_model_parent_class->destroy)
-		(*e_table_model_parent_class->destroy)(object);
-}
-
-static void
-e_table_model_class_init (GtkObjectClass *object_class)
-{
-	ETableModelClass *klass = E_TABLE_MODEL_CLASS(object_class);
-	e_table_model_parent_class = gtk_type_class (PARENT_TYPE);
-	
-	object_class->destroy = e_table_model_destroy;
-
-	e_table_model_signals [MODEL_CHANGED] =
-		gtk_signal_new ("model_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableModelClass, model_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_table_model_signals [MODEL_PRE_CHANGE] =
-		gtk_signal_new ("model_pre_change",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableModelClass, model_pre_change),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_table_model_signals [MODEL_ROW_CHANGED] =
-		gtk_signal_new ("model_row_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableModelClass, model_row_changed),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
-
-	e_table_model_signals [MODEL_CELL_CHANGED] =
-		gtk_signal_new ("model_cell_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableModelClass, model_cell_changed),
-				gtk_marshal_NONE__INT_INT,
-				GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
-
-	e_table_model_signals [MODEL_ROWS_INSERTED] =
-		gtk_signal_new ("model_rows_inserted",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableModelClass, model_rows_inserted),
-				gtk_marshal_NONE__INT_INT,
-				GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
-
-	e_table_model_signals [MODEL_ROWS_DELETED] =
-		gtk_signal_new ("model_rows_deleted",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableModelClass, model_rows_deleted),
-				gtk_marshal_NONE__INT_INT,
-				GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
-
-	gtk_object_class_add_signals (object_class, e_table_model_signals, LAST_SIGNAL);
-
-	klass->column_count        = NULL;     
-	klass->row_count           = NULL;        
-	klass->append_row          = NULL;
-
-	klass->value_at            = NULL;         
-	klass->set_value_at        = NULL;     
-	klass->is_cell_editable    = NULL; 
-
-	klass->get_save_id         = NULL;
-	klass->has_save_id         = NULL;
-
-	klass->has_change_pending  = NULL;
-
-	klass->duplicate_value     = NULL;  
-	klass->free_value          = NULL;       
-	klass->initialize_value    = NULL; 
-	klass->value_is_empty      = NULL;   
-	klass->value_to_string     = NULL;
-
-	klass->model_changed       = NULL;    
-	klass->model_row_changed   = NULL;
-	klass->model_cell_changed  = NULL;
-	klass->model_rows_inserted = NULL;
-	klass->model_rows_deleted  = NULL;
-}
-
-
-guint
-e_table_model_get_type (void)
-{
-	static guint type = 0;
-	
-	if (!type)
-	{
-		GtkTypeInfo info =
-		{
-			"ETableModel",
-			sizeof (ETableModel),
-			sizeof (ETableModelClass),
-			(GtkClassInitFunc) e_table_model_class_init,
-			NULL,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-		
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-  return type;
-}
-
-#if d(!)0
-static void
-print_tabs (void)
-{
-	int i;
-	for (i = 0; i < depth; i++)
-		g_print("\t");
-}
-#endif
-
-void
-e_table_model_pre_change (ETableModel *e_table_model)
-{
-	g_return_if_fail (e_table_model != NULL);
-	g_return_if_fail (E_IS_TABLE_MODEL (e_table_model));
-	
-	d(print_tabs());
-	d(g_print("Emitting pre_change on model 0x%p.\n", e_table_model));
-	d(depth++);
-	gtk_signal_emit (GTK_OBJECT (e_table_model),
-			 e_table_model_signals [MODEL_PRE_CHANGE]);
-	d(depth--);
-}
-
-/**
- * e_table_model_changed:
- * @e_table_model: the table model to notify of the change
- *
- * Use this function to notify any views of this table model that
- * the contents of the table model have changed.  This will emit
- * the signal "model_changed" on the @e_table_model object.
- *
- * It is preferable to use the e_table_model_row_changed() and
- * the e_table_model_cell_changed() to notify of smaller changes
- * than to invalidate the entire model, as the views might have
- * ways of caching the information they render from the model.
- */
-void
-e_table_model_changed (ETableModel *e_table_model)
-{
-	g_return_if_fail (e_table_model != NULL);
-	g_return_if_fail (E_IS_TABLE_MODEL (e_table_model));
-	
-	d(print_tabs());
-	d(g_print("Emitting model_changed on model 0x%p.\n", e_table_model));
-	d(depth++);
-	gtk_signal_emit (GTK_OBJECT (e_table_model),
-			 e_table_model_signals [MODEL_CHANGED]);
-	d(depth--);
-}
-
-/**
- * e_table_model_row_changed:
- * @e_table_model: the table model to notify of the change
- * @row: the row that was changed in the model.
- *
- * Use this function to notify any views of the table model that
- * the contents of row @row have changed in model.  This function
- * will emit the "model_row_changed" signal on the @e_table_model
- * object
- */
-void
-e_table_model_row_changed (ETableModel *e_table_model, int row)
-{
-	g_return_if_fail (e_table_model != NULL);
-	g_return_if_fail (E_IS_TABLE_MODEL (e_table_model));
-
-	d(print_tabs());
-	d(g_print("Emitting row_changed on model 0x%p, row %d.\n", e_table_model, row));
-	d(depth++);
-	gtk_signal_emit (GTK_OBJECT (e_table_model),
-			 e_table_model_signals [MODEL_ROW_CHANGED], row);
-	d(depth--);
-}
-
-/**
- * e_table_model_cell_changed:
- * @e_table_model: the table model to notify of the change
- * @col: the column.
- * @row: the row
- *
- * Use this function to notify any views of the table model that
- * contents of the cell at @col,@row has changed. This will emit
- * the "model_cell_changed" signal on the @e_table_model
- * object
- */
-void
-e_table_model_cell_changed (ETableModel *e_table_model, int col, int row)
-{
-	g_return_if_fail (e_table_model != NULL);
-	g_return_if_fail (E_IS_TABLE_MODEL (e_table_model));
-
-	d(print_tabs());
-	d(g_print("Emitting cell_changed on model 0x%p, row %d, col %d.\n", e_table_model, row, col));
-	d(depth++);
-	gtk_signal_emit (GTK_OBJECT (e_table_model),
-			 e_table_model_signals [MODEL_CELL_CHANGED], col, row);
-	d(depth--);
-}
-
-/**
- * e_table_model_rows_inserted:
- * @e_table_model: the table model to notify of the change
- * @row: the row that was inserted into the model.
- * @count: The number of rows that were inserted.
- *
- * Use this function to notify any views of the table model that
- * @count rows at row @row have been inserted into the model.  This
- * function will emit the "model_rows_inserted" signal on the
- * @e_table_model object
- */
-void
-e_table_model_rows_inserted (ETableModel *e_table_model, int row, int count)
-{
-	g_return_if_fail (e_table_model != NULL);
-	g_return_if_fail (E_IS_TABLE_MODEL (e_table_model));
-
-	d(print_tabs());
-	d(g_print("Emitting row_inserted on model 0x%p, row %d.\n", e_table_model, row));
-	d(depth++);
-	gtk_signal_emit (GTK_OBJECT (e_table_model),
-			 e_table_model_signals [MODEL_ROWS_INSERTED], row, count);
-	d(depth--);
-}
-
-/**
- * e_table_model_row_inserted:
- * @e_table_model: the table model to notify of the change
- * @row: the row that was inserted into the model.
- *
- * Use this function to notify any views of the table model that the
- * row @row has been inserted into the model.  This function will emit
- * the "model_rows_inserted" signal on the @e_table_model object
- */
-void
-e_table_model_row_inserted (ETableModel *e_table_model, int row)
-{
-	e_table_model_rows_inserted(e_table_model, row, 1);
-}
-
-/**
- * e_table_model_row_deleted:
- * @e_table_model: the table model to notify of the change
- * @row: the row that was deleted
- * @count: The number of rows deleted
- *
- * Use this function to notify any views of the table model that
- * @count rows at row @row have been deleted from the model.  This
- * function will emit the "model_rows_deleted" signal on the
- * @e_table_model object
- */
-void
-e_table_model_rows_deleted (ETableModel *e_table_model, int row, int count)
-{
-	g_return_if_fail (e_table_model != NULL);
-	g_return_if_fail (E_IS_TABLE_MODEL (e_table_model));
-
-	d(print_tabs());
-	d(g_print("Emitting row_deleted on model 0x%p, row %d.\n", e_table_model, row));
-	d(depth++);
-	gtk_signal_emit (GTK_OBJECT (e_table_model),
-			 e_table_model_signals [MODEL_ROWS_DELETED], row, count);
-	d(depth--);
-}
-
-/**
- * e_table_model_row_deleted:
- * @e_table_model: the table model to notify of the change
- * @row: the row that was deleted
- *
- * Use this function to notify any views of the table model that the
- * row @row has been deleted from the model.  This function will emit
- * the "model_rows_deleted" signal on the @e_table_model object
- */
-void
-e_table_model_row_deleted (ETableModel *e_table_model, int row)
-{
-	e_table_model_rows_deleted(e_table_model, row, 1);
-}
diff --git a/widgets/table/e-table-model.h b/widgets/table/e-table-model.h
deleted file mode 100644
index 333ab0fcfc..0000000000
--- a/widgets/table/e-table-model.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_MODEL_H_
-#define _E_TABLE_MODEL_H_
-
-#include <gtk/gtkobject.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_TABLE_MODEL_TYPE        (e_table_model_get_type ())
-#define E_TABLE_MODEL(o)          (GTK_CHECK_CAST ((o), E_TABLE_MODEL_TYPE, ETableModel))
-#define E_TABLE_MODEL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_MODEL_TYPE, ETableModelClass))
-#define E_IS_TABLE_MODEL(o)       (GTK_CHECK_TYPE ((o), E_TABLE_MODEL_TYPE))
-#define E_IS_TABLE_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_MODEL_TYPE))
-
-typedef struct {
-	GtkObject   base;
-} ETableModel;
-
-typedef struct {
-	GtkObjectClass parent_class;
-
-	/*
-	 * Virtual methods
-	 */
-	int         (*column_count)       (ETableModel *etm);
-	int         (*row_count)          (ETableModel *etm);
-	void        (*append_row)         (ETableModel *etm, ETableModel *source, int row);
-
-	void       *(*value_at)           (ETableModel *etm, int col, int row);
-	void        (*set_value_at)       (ETableModel *etm, int col, int row, const void *value);
-	gboolean    (*is_cell_editable)   (ETableModel *etm, int col, int row);
-
-	char       *(*get_save_id)        (ETableModel *etm, int row);
-	gboolean    (*has_save_id)        (ETableModel *etm);
-
-	gboolean    (*has_change_pending) (ETableModel *etm);
-
-	/* Allocate a copy of the given value. */
-	void       *(*duplicate_value)    (ETableModel *etm, int col, const void *value);
-	/* Free an allocated value. */
-	void        (*free_value)         (ETableModel *etm, int col, void *value);
-	/* Return an allocated empty value. */
-	void	   *(*initialize_value)   (ETableModel *etm, int col);
-	/* Return TRUE if value is equivalent to an empty cell. */
-	gboolean    (*value_is_empty)     (ETableModel *etm, int col, const void *value);
-	/* Return an allocated string. */
-	char       *(*value_to_string)    (ETableModel *etm, int col, const void *value);
-
-	
-	/*
-	 * Signals
-	 */
-
-	/*
-	 * These all come after the change has been made.
-	 * Major structural changes: model_changed
-	 * Changes only in a row: row_changed
-	 * Only changes in a cell: cell_changed
-	 * A row inserted: row_inserted
-	 * A row deleted: row_deleted
-	 */
-	void        (*model_pre_change)    (ETableModel *etm);
-
-	void        (*model_changed)       (ETableModel *etm);
-	void        (*model_row_changed)   (ETableModel *etm, int row);
-	void        (*model_cell_changed)  (ETableModel *etm, int col, int row);
-	void        (*model_rows_inserted) (ETableModel *etm, int row, int count);
-	void        (*model_rows_deleted)  (ETableModel *etm, int row, int count);
-} ETableModelClass;
-
-GtkType     e_table_model_get_type            (void);
-
-/**/
-int         e_table_model_column_count        (ETableModel *e_table_model);
-const char *e_table_model_column_name         (ETableModel *e_table_model,
-					       int          col);
-int         e_table_model_row_count           (ETableModel *e_table_model);
-void        e_table_model_append_row          (ETableModel *e_table_model,
-					       ETableModel *source,
-					       int          row);
-
-/**/
-void       *e_table_model_value_at            (ETableModel *e_table_model,
-					       int          col,
-					       int          row);
-void        e_table_model_set_value_at        (ETableModel *e_table_model,
-					       int          col,
-					       int          row,
-					       const void  *value);
-gboolean    e_table_model_is_cell_editable    (ETableModel *e_table_model,
-					       int          col,
-					       int          row);
-
-/**/
-char       *e_table_model_get_save_id         (ETableModel *etm,
-					       int          row);
-gboolean    e_table_model_has_save_id         (ETableModel *etm);
-
-/**/
-gboolean    e_table_model_has_change_pending  (ETableModel *etm);
-
-
-/**/
-void       *e_table_model_duplicate_value     (ETableModel *e_table_model,
-					       int          col,
-					       const void  *value);
-void        e_table_model_free_value          (ETableModel *e_table_model,
-					       int          col,
-					       void        *value);
-void       *e_table_model_initialize_value    (ETableModel *e_table_model,
-					       int          col);
-gboolean    e_table_model_value_is_empty      (ETableModel *e_table_model,
-					       int          col,
-					       const void  *value);
-char       *e_table_model_value_to_string     (ETableModel *e_table_model,
-					       int          col,
-					       const void  *value);
-
-/*
- * Routines for emitting signals on the e_table
- */
-void        e_table_model_pre_change          (ETableModel *e_table_model);
-void        e_table_model_changed             (ETableModel *e_table_model);
-void        e_table_model_row_changed         (ETableModel *e_table_model,
-					       int          row);
-void        e_table_model_cell_changed        (ETableModel *e_table_model,
-					       int          col,
-					       int          row);
-void        e_table_model_rows_inserted       (ETableModel *e_table_model,
-int          row,
-int          count);
-void        e_table_model_rows_deleted        (ETableModel *e_table_model,
-int          row,
-int          count);
-
-/**/
-void        e_table_model_row_inserted        (ETableModel *e_table_model,
-int          row);
-void        e_table_model_row_deleted         (ETableModel *e_table_model,
-int          row);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TABLE_MODEL_H_ */
diff --git a/widgets/table/e-table-one.c b/widgets/table/e-table-one.c
deleted file mode 100644
index eee4a916cb..0000000000
--- a/widgets/table/e-table-one.c
+++ /dev/null
@@ -1,236 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-table-model.c: a one table model implementation that uses function
- * pointers to simplify the creation of new, exotic and colorful tables in
- * no time.
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * (C) 1999 Ximian, Inc.
- */
-
-#include <config.h>
-#include "e-table-one.h"
-
-#define PARENT_TYPE e_table_model_get_type ()
-
-static int
-one_column_count (ETableModel *etm)
-{
-	ETableOne *one = E_TABLE_ONE(etm);
-
-	if (one->source)
-		return e_table_model_column_count(one->source);
-	else
-		return 0;
-}
-
-static int
-one_row_count (ETableModel *etm)
-{
-	return 1;
-}
-
-static void *
-one_value_at (ETableModel *etm, int col, int row)
-{
-	ETableOne *one = E_TABLE_ONE(etm);
-
-	if (one->data)
-		return one->data[col];
-	else
-		return NULL;
-}
-
-static void
-one_set_value_at (ETableModel *etm, int col, int row, const void *val)
-{
-	ETableOne *one = E_TABLE_ONE(etm);
-
-	if (one->data && one->source) {
-		e_table_model_free_value(one->source, col, one->data[col]);
-		one->data[col] = e_table_model_duplicate_value(one->source, col, val);
-	}
-}
-
-static gboolean
-one_is_cell_editable (ETableModel *etm, int col, int row)
-{
-	ETableOne *one = E_TABLE_ONE(etm);
-
-	if (one->source)
-		return e_table_model_is_cell_editable(one->source, col, -1);
-	else
-		return FALSE;
-}
-
-/* The default for one_duplicate_value is to return the raw value. */
-static void *
-one_duplicate_value (ETableModel *etm, int col, const void *value)
-{
-	ETableOne *one = E_TABLE_ONE(etm);
-
-	if (one->source)
-		return e_table_model_duplicate_value(one->source, col, value);
-	else
-		return (void *)value;
-}
-
-static void
-one_free_value (ETableModel *etm, int col, void *value)
-{
-	ETableOne *one = E_TABLE_ONE(etm);
-
-	if (one->source)
-		e_table_model_free_value(one->source, col, value);
-}
-
-static void *
-one_initialize_value (ETableModel *etm, int col)
-{
-	ETableOne *one = E_TABLE_ONE(etm);
-	
-	if (one->source)
-		return e_table_model_initialize_value (one->source, col);
-	else
-		return NULL;
-}
-
-static gboolean
-one_value_is_empty (ETableModel *etm, int col, const void *value)
-{
-	ETableOne *one = E_TABLE_ONE(etm);
-	
-	if (one->source)
-		return e_table_model_value_is_empty (one->source, col, value);
-	else
-		return FALSE;
-}
-
-static char *
-one_value_to_string (ETableModel *etm, int col, const void *value)
-{
-	ETableOne *one = E_TABLE_ONE(etm);
-	
-	if (one->source)
-		return e_table_model_value_to_string (one->source, col, value);
-	else
-		return g_strdup("");
-}
-
-static void
-one_destroy (GtkObject *object)
-{
-	ETableOne *one = E_TABLE_ONE(object);
-	
-	if (one->source) {
-		int i;
-		int col_count;
-
-		col_count = e_table_model_column_count(one->source);
-		
-		if (one->data) {
-			for (i = 0; i < col_count; i++) {
-				e_table_model_free_value(one->source, i, one->data[i]);
-			}
-		}
-
-		gtk_object_unref(GTK_OBJECT(one->source));
-	}
-
-	g_free(one->data);
-}
-
-static void
-e_table_one_class_init (GtkObjectClass *object_class)
-{
-	ETableModelClass *model_class = (ETableModelClass *) object_class;
-
-	model_class->column_count = one_column_count;
-	model_class->row_count = one_row_count;
-	model_class->value_at = one_value_at;
-	model_class->set_value_at = one_set_value_at;
-	model_class->is_cell_editable = one_is_cell_editable;
-	model_class->duplicate_value = one_duplicate_value;
-	model_class->free_value = one_free_value;
-	model_class->initialize_value = one_initialize_value;
-	model_class->value_is_empty = one_value_is_empty;
-	model_class->value_to_string = one_value_to_string;
-
-	object_class->destroy = one_destroy;
-}
-
-static void
-e_table_one_init (GtkObject *object)
-{
-	ETableOne *one = E_TABLE_ONE(object);
-
-	one->source = NULL;
-	one->data = NULL;
-}
-
-GtkType
-e_table_one_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"ETableOne",
-			sizeof (ETableOne),
-			sizeof (ETableOneClass),
-			(GtkClassInitFunc) e_table_one_class_init,
-			(GtkObjectInitFunc) e_table_one_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-ETableModel *
-e_table_one_new (ETableModel *source)
-{
-	ETableOne *eto;
-	int col_count;
-	int i;
-
-	eto = gtk_type_new (e_table_one_get_type ());
-
-	eto->source = source;
-	
-	col_count = e_table_model_column_count(source);
-	eto->data = g_new(void *, col_count);
-	for (i = 0; i < col_count; i++) {
-		eto->data[i] = e_table_model_initialize_value(source, i);
-	}
-	
-	if (source)
-		gtk_object_ref(GTK_OBJECT(source));
-	
-	return (ETableModel *) eto;
-}
-
-void
-e_table_one_commit (ETableOne *one)
-{
-	if (one->source) {
-		int empty = TRUE;
-		int col;
-		int cols = e_table_model_column_count(one->source);
-		for (col = 0; col < cols; col++) {
-			if (!e_table_model_value_is_empty(one->source, col, one->data[col])) {
-				empty = FALSE;
-				break;
-			}
-		}
-		if (!empty) {
-			e_table_model_append_row(one->source, E_TABLE_MODEL(one), 0);
-		}
-	}
-}
diff --git a/widgets/table/e-table-one.h b/widgets/table/e-table-one.h
deleted file mode 100644
index 2636f018ab..0000000000
--- a/widgets/table/e-table-one.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_ONE_H_
-#define _E_TABLE_ONE_H_
-
-#include <gal/e-table/e-table-model.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-#define E_TABLE_ONE_TYPE        (e_table_one_get_type ())
-#define E_TABLE_ONE(o)          (GTK_CHECK_CAST ((o), E_TABLE_ONE_TYPE, ETableOne))
-#define E_TABLE_ONE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_ONE_TYPE, ETableOneClass))
-#define E_IS_TABLE_ONE(o)       (GTK_CHECK_TYPE ((o), E_TABLE_ONE_TYPE))
-#define E_IS_TABLE_ONE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_ONE_TYPE))
-
-typedef struct {
-	ETableModel   parent;
-		    
-	ETableModel  *source;
-	void        **data;
-} ETableOne;
-
-typedef struct {
-	ETableModelClass parent_class;
-} ETableOneClass;
-
-GtkType e_table_one_get_type (void);
-
-ETableModel *e_table_one_new (ETableModel *source);
-void         e_table_one_commit (ETableOne *one);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TABLE_ONE_H_ */
-
diff --git a/widgets/table/e-table-scrolled.c b/widgets/table/e-table-scrolled.c
deleted file mode 100644
index fcf9d64199..0000000000
--- a/widgets/table/e-table-scrolled.c
+++ /dev/null
@@ -1,211 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-scrolled.c: A graphical view of a Table.
- *
- * Author:
- *   Chris Lahey <clahey@ximian.com>
- *   Miguel de Icaza (miguel@ximian.com)
- *
- * Copyright 2000, 1999, Ximian, Inc
- */
-#include <config.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdio.h>
-#include <libgnomeui/gnome-canvas.h>
-#include <gtk/gtksignal.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include "e-table.h"
-#include "e-table-scrolled.h"
-
-#define COLUMN_HEADER_HEIGHT 16
-
-#define PARENT_TYPE e_scroll_frame_get_type ()
-
-static GtkObjectClass *parent_class;
-
-enum {
-	ARG_0,
-	ARG_TABLE,
-};
-
-static void
-e_table_scrolled_init (GtkObject *object)
-{
-	ETableScrolled *ets;
-	EScrollFrame *scroll_frame;
-
-	ets          = E_TABLE_SCROLLED (object);
-	scroll_frame = E_SCROLL_FRAME   (object);
-
-	GTK_WIDGET_SET_FLAGS (ets, GTK_CAN_FOCUS);
-
-	ets->table = gtk_type_new(e_table_get_type());
-
-	e_scroll_frame_set_policy      (scroll_frame, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	e_scroll_frame_set_shadow_type (scroll_frame, GTK_SHADOW_IN);
-}
-
-static void
-e_table_scrolled_real_construct (ETableScrolled *ets)
-{
-	gtk_container_add(GTK_CONTAINER(ets), GTK_WIDGET(ets->table));
-
-	gtk_widget_show(GTK_WIDGET(ets->table));
-}
-
-ETableScrolled *e_table_scrolled_construct                 (ETableScrolled    *ets,
-							    ETableModel       *etm,
-							    ETableExtras      *ete,
-							    const char        *spec,
-							    const char        *state)
-{
-	g_return_val_if_fail(ets != NULL, NULL);
-	g_return_val_if_fail(E_IS_TABLE_SCROLLED(ets), NULL);
-	g_return_val_if_fail(etm != NULL, NULL);
-	g_return_val_if_fail(E_IS_TABLE_MODEL(etm), NULL);
-	g_return_val_if_fail(ete == NULL || E_IS_TABLE_EXTRAS(ete), NULL);
-	g_return_val_if_fail(spec != NULL, NULL);
-
-	e_table_construct(ets->table, etm, ete, spec, state);
-
-	e_table_scrolled_real_construct(ets);
-
-	return ets;
-}
-
-GtkWidget      *e_table_scrolled_new                       (ETableModel       *etm,
-							    ETableExtras      *ete,
-							    const char        *spec,
-							    const char        *state)
-{
-	ETableScrolled *ets;
-
-	g_return_val_if_fail(etm != NULL, NULL);
-	g_return_val_if_fail(E_IS_TABLE_MODEL(etm), NULL);
-	g_return_val_if_fail(ete == NULL || E_IS_TABLE_EXTRAS(ete), NULL);
-	g_return_val_if_fail(spec != NULL, NULL);
-
-	ets = E_TABLE_SCROLLED (gtk_widget_new (e_table_scrolled_get_type (),
-						"hadjustment", NULL,
-						"vadjustment", NULL,
-						NULL));
-
-	ets = e_table_scrolled_construct (ets, etm, ete, spec, state);
-
-	return GTK_WIDGET (ets);
-}
-
-ETableScrolled *e_table_scrolled_construct_from_spec_file  (ETableScrolled    *ets,
-							    ETableModel       *etm,
-							    ETableExtras      *ete,
-							    const char        *spec_fn,
-							    const char        *state_fn)
-{
-	g_return_val_if_fail(ets != NULL, NULL);
-	g_return_val_if_fail(E_IS_TABLE_SCROLLED(ets), NULL);
-	g_return_val_if_fail(etm != NULL, NULL);
-	g_return_val_if_fail(E_IS_TABLE_MODEL(etm), NULL);
-	g_return_val_if_fail(ete == NULL || E_IS_TABLE_EXTRAS(ete), NULL);
-	g_return_val_if_fail(spec_fn != NULL, NULL);
-
-	e_table_construct_from_spec_file(ets->table, etm, ete, spec_fn, state_fn);
-
-	e_table_scrolled_real_construct(ets);
-
-	return ets;
-}
-
-GtkWidget      *e_table_scrolled_new_from_spec_file        (ETableModel       *etm,
-							    ETableExtras      *ete,
-							    const char        *spec_fn,
-							    const char        *state_fn)
-{
-	ETableScrolled *ets;
-
-	g_return_val_if_fail(etm != NULL, NULL);
-	g_return_val_if_fail(E_IS_TABLE_MODEL(etm), NULL);
-	g_return_val_if_fail(ete == NULL || E_IS_TABLE_EXTRAS(ete), NULL);
-	g_return_val_if_fail(spec_fn != NULL, NULL);
-
-	ets = E_TABLE_SCROLLED (gtk_widget_new (e_table_scrolled_get_type (),
-						"hadjustment", NULL,
-						"vadjustment", NULL,
-						NULL));
-
-	ets = e_table_scrolled_construct_from_spec_file (ets, etm, ete, spec_fn, state_fn);
-
-	return GTK_WIDGET (ets);
-}
-
-ETable *
-e_table_scrolled_get_table                 (ETableScrolled *ets)
-{
-	return ets->table;
-}
-
-static void
-ets_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ETableScrolled *ets = E_TABLE_SCROLLED (o);
-
-	switch (arg_id){
-	case ARG_TABLE:
-		if (ets->table)
-			GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(ets->table);
-		else
-			GTK_VALUE_OBJECT (*arg) = NULL;
-		break;
-	}
-}
-
-/* Grab_focus handler for the scrolled ETable */
-static void
-ets_grab_focus (GtkWidget *widget)
-{
-	ETableScrolled *ets;
-
-	ets = E_TABLE_SCROLLED (widget);
-
-	gtk_widget_grab_focus (GTK_WIDGET (ets->table));
-}
-
-/* Focus handler for the scrolled ETable */
-static gint
-ets_focus (GtkContainer *container, GtkDirectionType direction)
-{
-	ETableScrolled *ets;
-
-	ets = E_TABLE_SCROLLED (container);
-
-	return gtk_container_focus (GTK_CONTAINER (ets->table), direction);
-}
-
-static void
-e_table_scrolled_class_init (ETableScrolledClass *class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	GtkContainerClass *container_class;
-
-	object_class = (GtkObjectClass *) class;
-	widget_class = (GtkWidgetClass *) class;
-	container_class = (GtkContainerClass *) class;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->get_arg = ets_get_arg;
-
-	widget_class->grab_focus = ets_grab_focus;
-
-	container_class->focus = ets_focus;
-
-	gtk_object_add_arg_type ("ETableScrolled::table", GTK_TYPE_OBJECT,
-				 GTK_ARG_READABLE, ARG_TABLE);
-}
-
-E_MAKE_TYPE(e_table_scrolled, "ETableScrolled", ETableScrolled, e_table_scrolled_class_init, e_table_scrolled_init, PARENT_TYPE);
-
diff --git a/widgets/table/e-table-scrolled.h b/widgets/table/e-table-scrolled.h
deleted file mode 100644
index 82643b214d..0000000000
--- a/widgets/table/e-table-scrolled.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_SCROLLED_H_
-#define _E_TABLE_SCROLLED_H_
-
-#include <gal/widgets/e-scroll-frame.h>
-#include <gal/e-table/e-table-model.h>
-#include <gal/e-table/e-table.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TABLE_SCROLLED_TYPE        (e_table_scrolled_get_type ())
-#define E_TABLE_SCROLLED(o)          (GTK_CHECK_CAST ((o), E_TABLE_SCROLLED_TYPE, ETableScrolled))
-#define E_TABLE_SCROLLED_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_SCROLLED_TYPE, ETableScrolledClass))
-#define E_IS_TABLE_SCROLLED(o)       (GTK_CHECK_TYPE ((o), E_TABLE_SCROLLED_TYPE))
-#define E_IS_TABLE_SCROLLED_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_SCROLLED_TYPE))
-
-typedef struct {
-	EScrollFrame parent;
-
-	ETable *table;
-} ETableScrolled;
-
-typedef struct {
-	EScrollFrameClass parent_class;
-} ETableScrolledClass;
-
-GtkType         e_table_scrolled_get_type                  (void);
-
-ETableScrolled *e_table_scrolled_construct                 (ETableScrolled *ets,
-							    ETableModel    *etm,
-							    ETableExtras   *ete,
-							    const char     *spec,
-							    const char     *state);
-GtkWidget      *e_table_scrolled_new                       (ETableModel    *etm,
-							    ETableExtras   *ete,
-							    const char     *spec,
-							    const char     *state);
-
-ETableScrolled *e_table_scrolled_construct_from_spec_file  (ETableScrolled *ets,
-							    ETableModel    *etm,
-							    ETableExtras   *ete,
-							    const char     *spec_fn,
-							    const char     *state_fn);
-GtkWidget      *e_table_scrolled_new_from_spec_file        (ETableModel    *etm,
-							    ETableExtras   *ete,
-							    const char     *spec_fn,
-							    const char     *state_fn);
-
-ETable         *e_table_scrolled_get_table                 (ETableScrolled *ets);
-
-END_GNOME_DECLS
-
-#endif /* _E_TABLE_SCROLLED_H_ */
-
diff --git a/widgets/table/e-table-selection-model.c b/widgets/table/e-table-selection-model.c
deleted file mode 100644
index d8d806afb8..0000000000
--- a/widgets/table/e-table-selection-model.c
+++ /dev/null
@@ -1,303 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-table-selection-model.c: a Table Selection Model
- *
- * Author:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#include <config.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtksignal.h>
-#include "e-table-selection-model.h"
-#include "gal/util/e-util.h"
-
-#define ETSM_CLASS(e) ((ETableSelectionModelClass *)((GtkObject *)e)->klass)
-
-#define PARENT_TYPE e_selection_model_array_get_type ()
-
-static ESelectionModelArray *parent_class;
-
-static gint etsm_get_row_count (ESelectionModelArray *esm);
-
-enum {
-	ARG_0,
-	ARG_MODEL,
-};
-
-#if 0
-static void
-save_to_hash(int model_row, gpointer closure)
-{
-	ETableSelectionModel *etsm = closure;
-	gchar *key = e_table_model_get_save_id(etsm->model, model_row);
-
-	g_hash_table_insert(etsm->hash, key, key);
-}
-#endif
-
-static void
-free_key(gpointer key, gpointer value, gpointer closure)
-{
-	g_free(key);
-}
-
-static void
-free_hash(ETableSelectionModel *etsm)
-{
-	if (etsm->hash) {
-		g_hash_table_foreach(etsm->hash, free_key, NULL);
-		g_hash_table_destroy(etsm->hash);
-		etsm->hash = NULL;
-	}
-	g_free(etsm->cursor_id);
-	etsm->cursor_id = NULL;
-}
-
-static void
-model_pre_change (ETableModel *etm, ETableSelectionModel *etsm)
-{
-	free_hash(etsm);
-
-#if 0
-	if (etsm->model && (!etsm->hash) && e_table_model_has_save_id(etsm->model)) {
-		gint cursor_row;
-		etsm->hash = g_hash_table_new(g_str_hash, g_str_equal);
-		e_selection_model_foreach(E_SELECTION_MODEL(etsm), save_to_hash, etsm);
-		gtk_object_get(GTK_OBJECT(etsm),
-			       "cursor_row", &cursor_row,
-			       NULL);
-		if (cursor_row != -1) {
-			etsm->cursor_id = e_table_model_get_save_id(etm, cursor_row);
-		}
-	}
-#endif
-}
-
-#if 0
-static gint
-model_changed_idle(ETableSelectionModel *etsm)
-{
-	ETableModel *etm = etsm->model;
-
-	e_selection_model_clear(E_SELECTION_MODEL(etsm));
-
-	if (etsm->hash && etm && e_table_model_has_save_id(etm)) {
-		int row_count = e_table_model_row_count(etm);
-		int i;
-		e_selection_model_array_confirm_row_count(E_SELECTION_MODEL_ARRAY(etsm));
-		for (i = 0; i < row_count; i++) {
-			char *save_id = e_table_model_get_save_id(etm, i);
-			if (g_hash_table_lookup(etsm->hash, save_id))
-				e_selection_model_change_one_row(E_SELECTION_MODEL(etsm), i, TRUE);
-			if (etsm->cursor_id && !strcmp(etsm->cursor_id, save_id)) {
-				e_selection_model_change_cursor(E_SELECTION_MODEL(etsm), i, e_selection_model_cursor_row(E_SELECTION_MODEL(etsm)));
-				g_free(etsm->cursor_id);
-				etsm->cursor_id = NULL;
-			}
-			g_free(save_id);
-		}
-		free_hash(etsm);
-	}
-	etsm->model_changed_idle_id = 0;
-	return FALSE;
-}
-#endif
-
-static void
-model_changed(ETableModel *etm, ETableSelectionModel *etsm)
-{
-	e_selection_model_clear(E_SELECTION_MODEL(etsm));
-#if 0
-	if (!etsm->model_changed_idle_id && etm && e_table_model_has_save_id(etm)) {
-		etsm->model_changed_idle_id = g_idle_add_full(G_PRIORITY_HIGH, (GSourceFunc) model_changed_idle, etsm, NULL);
-	}
-#endif
-}
-
-static void
-model_row_changed(ETableModel *etm, int row, ETableSelectionModel *etsm)
-{
-	if (etsm->hash)
-		free_hash(etsm);
-}
-
-static void
-model_cell_changed(ETableModel *etm, int col, int row, ETableSelectionModel *etsm)
-{
-	if (etsm->hash)
-		free_hash(etsm);
-}
-
-#if 1
-static void
-model_rows_inserted(ETableModel *etm, int row, int count, ETableSelectionModel *etsm)
-{
-	e_selection_model_array_insert_rows(E_SELECTION_MODEL_ARRAY(etsm), row, count);
-	if (etsm->hash)
-		free_hash(etsm);
-}
-
-static void
-model_rows_deleted(ETableModel *etm, int row, int count, ETableSelectionModel *etsm)
-{
-	e_selection_model_array_delete_rows(E_SELECTION_MODEL_ARRAY(etsm), row, count);
-	if (etsm->hash)
-		free_hash(etsm);
-}
-
-#else
-
-static void
-model_rows_inserted(ETableModel *etm, int row, int count, ETableSelectionModel *etsm)
-{
-	model_changed(etm, etsm);
-}
-
-static void
-model_rows_deleted(ETableModel *etm, int row, int count, ETableSelectionModel *etsm)
-{
-	model_changed(etm, etsm);
-}
-#endif
-
-inline static void
-add_model(ETableSelectionModel *etsm, ETableModel *model)
-{
-	etsm->model = model;
-	if (model) {
-		gtk_object_ref(GTK_OBJECT(model));
-		etsm->model_pre_change_id = gtk_signal_connect(GTK_OBJECT(model), "model_pre_change",
-							       GTK_SIGNAL_FUNC(model_pre_change), etsm);
-		etsm->model_changed_id = gtk_signal_connect(GTK_OBJECT(model), "model_changed",
-							    GTK_SIGNAL_FUNC(model_changed), etsm);
-		etsm->model_row_changed_id = gtk_signal_connect(GTK_OBJECT(model), "model_row_changed",
-								GTK_SIGNAL_FUNC(model_row_changed), etsm);
-		etsm->model_cell_changed_id = gtk_signal_connect(GTK_OBJECT(model), "model_cell_changed",
-								 GTK_SIGNAL_FUNC(model_cell_changed), etsm);
-		etsm->model_rows_inserted_id = gtk_signal_connect(GTK_OBJECT(model), "model_rows_inserted",
-								  GTK_SIGNAL_FUNC(model_rows_inserted), etsm);
-		etsm->model_rows_deleted_id = gtk_signal_connect(GTK_OBJECT(model), "model_rows_deleted",
-								 GTK_SIGNAL_FUNC(model_rows_deleted), etsm);
-	}
-}
-
-inline static void
-drop_model(ETableSelectionModel *etsm)
-{
-	if (etsm->model) {
-		gtk_signal_disconnect(GTK_OBJECT(etsm->model),
-				      etsm->model_pre_change_id);
-		gtk_signal_disconnect(GTK_OBJECT(etsm->model),
-				      etsm->model_changed_id);
-		gtk_signal_disconnect(GTK_OBJECT(etsm->model),
-				      etsm->model_row_changed_id);
-		gtk_signal_disconnect(GTK_OBJECT(etsm->model),
-				      etsm->model_cell_changed_id);
-		gtk_signal_disconnect(GTK_OBJECT(etsm->model),
-				      etsm->model_rows_inserted_id);
-		gtk_signal_disconnect(GTK_OBJECT(etsm->model),
-				      etsm->model_rows_deleted_id);
-
-		gtk_object_unref(GTK_OBJECT(etsm->model));
-	}
-	etsm->model = NULL;
-}
-
-static void
-etsm_destroy (GtkObject *object)
-{
-	ETableSelectionModel *etsm;
-
-	etsm = E_TABLE_SELECTION_MODEL (object);
-
-	if (etsm->model_changed_idle_id) {
-		g_source_remove(etsm->model_changed_idle_id);
-	}
-	drop_model(etsm);
-	free_hash(etsm);
-
-	if (GTK_OBJECT_CLASS(parent_class)->destroy)
-		GTK_OBJECT_CLASS(parent_class)->destroy (object);
-}
-
-static void
-etsm_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ETableSelectionModel *etsm = E_TABLE_SELECTION_MODEL (o);
-
-	switch (arg_id){
-	case ARG_MODEL:
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(etsm->model);
-		break;
-	}
-}
-
-static void
-etsm_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ETableSelectionModel *etsm = E_TABLE_SELECTION_MODEL (o);
-	
-	switch (arg_id){
-	case ARG_MODEL:
-		drop_model(etsm);
-		add_model(etsm, GTK_VALUE_OBJECT (*arg) ? E_TABLE_MODEL(GTK_VALUE_OBJECT (*arg)) : NULL);
-		break;
-	}
-}
-
-static void
-e_table_selection_model_init (ETableSelectionModel *selection)
-{
-	selection->model = NULL;
-	selection->hash = NULL;
-	selection->cursor_id = NULL;
-
-	selection->model_changed_idle_id = 0;
-}
-
-static void
-e_table_selection_model_class_init (ETableSelectionModelClass *klass)
-{
-	GtkObjectClass *object_class;
-	ESelectionModelArrayClass *esma_class;
-
-	parent_class             = gtk_type_class (PARENT_TYPE);
-
-	object_class             = GTK_OBJECT_CLASS(klass);
-	esma_class               = E_SELECTION_MODEL_ARRAY_CLASS(klass);
-
-	object_class->destroy    = etsm_destroy;
-	object_class->get_arg    = etsm_get_arg;
-	object_class->set_arg    = etsm_set_arg;
-
-	esma_class->get_row_count = etsm_get_row_count;
-
-	gtk_object_add_arg_type ("ETableSelectionModel::model", GTK_TYPE_OBJECT,
-				 GTK_ARG_READWRITE, ARG_MODEL);
-}
-
-E_MAKE_TYPE(e_table_selection_model, "ETableSelectionModel", ETableSelectionModel,
-	    e_table_selection_model_class_init, e_table_selection_model_init, PARENT_TYPE);
-
-/** 
- * e_table_selection_model_new
- *
- * This routine creates a new #ETableSelectionModel.
- *
- * Returns: The new #ETableSelectionModel.
- */
-ETableSelectionModel *
-e_table_selection_model_new (void)
-{
-	return gtk_type_new (e_table_selection_model_get_type ());
-}
-
-static gint
-etsm_get_row_count (ESelectionModelArray *esma)
-{
-	ETableSelectionModel *etsm = E_TABLE_SELECTION_MODEL(esma);
-
-	return e_table_model_row_count (etsm->model);
-}
diff --git a/widgets/table/e-table-selection-model.h b/widgets/table/e-table-selection-model.h
deleted file mode 100644
index 94eaf2bb94..0000000000
--- a/widgets/table/e-table-selection-model.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_SELECTION_MODEL_H_
-#define _E_TABLE_SELECTION_MODEL_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/widgets/e-selection-model-array.h>
-#include <gal/e-table/e-table-model.h>
-#include <gal/e-table/e-table-defines.h>
-#include <gal/e-table/e-table-sorter.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_TABLE_SELECTION_MODEL_TYPE        (e_table_selection_model_get_type ())
-#define E_TABLE_SELECTION_MODEL(o)          (GTK_CHECK_CAST ((o), E_TABLE_SELECTION_MODEL_TYPE, ETableSelectionModel))
-#define E_TABLE_SELECTION_MODEL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_SELECTION_MODEL_TYPE, ETableSelectionModelClass))
-#define E_IS_TABLE_SELECTION_MODEL(o)       (GTK_CHECK_TYPE ((o), E_TABLE_SELECTION_MODEL_TYPE))
-#define E_IS_TABLE_SELECTION_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_SELECTION_MODEL_TYPE))
-
-typedef struct {
-	ESelectionModelArray base;
-
-	ETableModel  *model;
-
-	guint model_pre_change_id;
-	guint model_changed_id;
-	guint model_row_changed_id;
-	guint model_cell_changed_id;
-	guint model_rows_inserted_id;
-	guint model_rows_deleted_id;
-
-	guint model_changed_idle_id;
-
-	guint frozen : 1;
-	guint selection_model_changed : 1;
-	guint group_info_changed : 1;
-
-	GHashTable *hash;
-	gchar      *cursor_id;
-} ETableSelectionModel;
-
-typedef struct {
-	ESelectionModelArrayClass parent_class;
-} ETableSelectionModelClass;
-
-GtkType               e_table_selection_model_get_type            (void);
-ETableSelectionModel *e_table_selection_model_new                 (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* _E_TABLE_SELECTION_MODEL_H_ */
diff --git a/widgets/table/e-table-simple.c b/widgets/table/e-table-simple.c
deleted file mode 100644
index 82d29bd6c7..0000000000
--- a/widgets/table/e-table-simple.c
+++ /dev/null
@@ -1,269 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-table-model.c: a simple table model implementation that uses function
- * pointers to simplify the creation of new, exotic and colorful tables in
- * no time.
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * (C) 1999, 2000 Ximian, Inc.
- */
-
-#include <config.h>
-#include "e-table-simple.h"
-
-enum {
-	ARG_0,
-	ARG_APPEND_ROW,
-};
-
-#define PARENT_TYPE e_table_model_get_type ()
-
-static int
-simple_column_count (ETableModel *etm)
-{
-	ETableSimple *simple = E_TABLE_SIMPLE(etm);
-
-	if (simple->col_count)
-		return simple->col_count (etm, simple->data);
-	else
-		return 0;
-}
-
-static int
-simple_row_count (ETableModel *etm)
-{
-	ETableSimple *simple = E_TABLE_SIMPLE(etm);
-
-	if (simple->row_count)
-		return simple->row_count (etm, simple->data);
-	else
-		return 0;
-}
-
-static void *
-simple_value_at (ETableModel *etm, int col, int row)
-{
-	ETableSimple *simple = E_TABLE_SIMPLE(etm);
-
-	if (simple->value_at)
-		return simple->value_at (etm, col, row, simple->data);
-	else
-		return NULL;
-}
-
-static void
-simple_set_value_at (ETableModel *etm, int col, int row, const void *val)
-{
-	ETableSimple *simple = E_TABLE_SIMPLE(etm);
-
-	if (simple->set_value_at)
-		simple->set_value_at (etm, col, row, val, simple->data);
-}
-
-static gboolean
-simple_is_cell_editable (ETableModel *etm, int col, int row)
-{
-	ETableSimple *simple = E_TABLE_SIMPLE(etm);
-
-	if (simple->is_cell_editable)
-		return simple->is_cell_editable (etm, col, row, simple->data);
-	else
-		return FALSE;
-}
-
-/* The default for simple_duplicate_value is to return the raw value. */
-static void *
-simple_duplicate_value (ETableModel *etm, int col, const void *value)
-{
-	ETableSimple *simple = E_TABLE_SIMPLE(etm);
-
-	if (simple->duplicate_value)
-		return simple->duplicate_value (etm, col, value, simple->data);
-	else
-		return (void *)value;
-}
-
-static void
-simple_free_value (ETableModel *etm, int col, void *value)
-{
-	ETableSimple *simple = E_TABLE_SIMPLE(etm);
-
-	if (simple->free_value)
-		simple->free_value (etm, col, value, simple->data);
-}
-
-static void *
-simple_initialize_value (ETableModel *etm, int col)
-{
-	ETableSimple *simple = E_TABLE_SIMPLE(etm);
-	
-	if (simple->initialize_value)
-		return simple->initialize_value (etm, col, simple->data);
-	else
-		return NULL;
-}
-
-static gboolean
-simple_value_is_empty (ETableModel *etm, int col, const void *value)
-{
-	ETableSimple *simple = E_TABLE_SIMPLE(etm);
-	
-	if (simple->value_is_empty)
-		return simple->value_is_empty (etm, col, value, simple->data);
-	else
-		return FALSE;
-}
-
-static char *
-simple_value_to_string (ETableModel *etm, int col, const void *value)
-{
-	ETableSimple *simple = E_TABLE_SIMPLE(etm);
-	
-	if (simple->value_to_string)
-		return simple->value_to_string (etm, col, value, simple->data);
-	else
-		return g_strdup ("");
-}
-
-static void
-simple_append_row (ETableModel *etm, ETableModel *source, int row)
-{
-	ETableSimple *simple = E_TABLE_SIMPLE(etm);
-	
-	if (simple->append_row)
-		simple->append_row (etm, source, row, simple->data);
-}
-
-static void
-simple_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ETableSimple *simple = E_TABLE_SIMPLE (o);
-
-	switch (arg_id){
-	case ARG_APPEND_ROW:
-		GTK_VALUE_POINTER(*arg) = simple->append_row;
-		break;
-	}
-}
-
-static void
-simple_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ETableSimple *simple = E_TABLE_SIMPLE (o);
-	
-	switch (arg_id){
-	case ARG_APPEND_ROW:
-		simple->append_row = GTK_VALUE_POINTER(*arg);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-	}
-}
-
-static void
-e_table_simple_class_init (GtkObjectClass *object_class)
-{
-	ETableModelClass *model_class = (ETableModelClass *) object_class;
-
-	object_class->set_arg = simple_set_arg;
-	object_class->get_arg = simple_get_arg;
-
-	model_class->column_count = simple_column_count;
-	model_class->row_count = simple_row_count;
-	model_class->value_at = simple_value_at;
-	model_class->set_value_at = simple_set_value_at;
-	model_class->is_cell_editable = simple_is_cell_editable;
-	model_class->duplicate_value = simple_duplicate_value;
-	model_class->free_value = simple_free_value;
-	model_class->initialize_value = simple_initialize_value;
-	model_class->value_is_empty = simple_value_is_empty;
-	model_class->value_to_string = simple_value_to_string;
-	model_class->append_row = simple_append_row;
-
-	gtk_object_add_arg_type ("ETableSimple::append_row", GTK_TYPE_POINTER,
-				 GTK_ARG_READWRITE, ARG_APPEND_ROW);
-}
-
-GtkType
-e_table_simple_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"ETableSimple",
-			sizeof (ETableSimple),
-			sizeof (ETableSimpleClass),
-			(GtkClassInitFunc) e_table_simple_class_init,
-			(GtkObjectInitFunc) NULL,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-/**
- * e_table_simple_new:
- * @col_count:
- * @row_count:
- * @value_at:
- * @set_value_at:
- * @is_cell_editable:
- * @duplicate_value:
- * @free_value:
- * @initialize_value:
- * @value_is_empty:
- * @value_to_string:
- * @data: closure pointer.
- *
- * This initializes a new ETableSimpleModel object.  ETableSimpleModel is
- * an implementaiton of the abstract class ETableModel.  The ETableSimpleModel
- * is designed to allow people to easily create ETableModels without having
- * to create a new GtkType derived from ETableModel every time they need one.
- *
- * Instead, ETableSimpleModel uses a setup based in callback functions, every
- * callback function signature mimics the signature of each ETableModel method
- * and passes the extra @data pointer to each one of the method to provide them
- * with any context they might want to use. 
- *
- * Returns: An ETableSimpleModel object (which is also an ETableModel
- * object).
- */
-ETableModel *
-e_table_simple_new (ETableSimpleColumnCountFn col_count,
-		    ETableSimpleRowCountFn row_count,
-		    ETableSimpleValueAtFn value_at,
-		    ETableSimpleSetValueAtFn set_value_at,
-		    ETableSimpleIsCellEditableFn is_cell_editable,
-		    ETableSimpleDuplicateValueFn duplicate_value,
-		    ETableSimpleFreeValueFn free_value,
-		    ETableSimpleInitializeValueFn initialize_value,
-		    ETableSimpleValueIsEmptyFn value_is_empty,
-		    ETableSimpleValueToStringFn value_to_string,
-		    void *data)
-{
-	ETableSimple *et;
-
-	et = gtk_type_new (e_table_simple_get_type ());
-
-	et->col_count = col_count;
-	et->row_count = row_count;
-	et->value_at = value_at;
-	et->set_value_at = set_value_at;
-	et->is_cell_editable = is_cell_editable;
-	et->duplicate_value = duplicate_value;
-	et->free_value = free_value;
-	et->initialize_value = initialize_value;
-	et->value_is_empty = value_is_empty;
-	et->value_to_string = value_to_string;
-	et->data = data;
-	
-	return (ETableModel *) et;
- }
diff --git a/widgets/table/e-table-simple.h b/widgets/table/e-table-simple.h
deleted file mode 100644
index f0f949afc0..0000000000
--- a/widgets/table/e-table-simple.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_SIMPLE_H_
-#define _E_TABLE_SIMPLE_H_
-
-#include <gal/e-table/e-table-model.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_TABLE_SIMPLE_TYPE        (e_table_simple_get_type ())
-#define E_TABLE_SIMPLE(o)          (GTK_CHECK_CAST ((o), E_TABLE_SIMPLE_TYPE, ETableSimple))
-#define E_TABLE_SIMPLE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_SIMPLE_TYPE, ETableSimpleClass))
-#define E_IS_TABLE_SIMPLE(o)       (GTK_CHECK_TYPE ((o), E_TABLE_SIMPLE_TYPE))
-#define E_IS_TABLE_SIMPLE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_SIMPLE_TYPE))
-
-typedef int         (*ETableSimpleColumnCountFn)     (ETableModel *etm, void *data);
-typedef	int         (*ETableSimpleRowCountFn)        (ETableModel *etm, void *data);
-typedef void        (*ETableSimpleAppendRowFn)       (ETableModel *etm, ETableModel *model, int row, void *data);
-
-typedef	void       *(*ETableSimpleValueAtFn)         (ETableModel *etm, int col, int row, void *data);
-typedef	void        (*ETableSimpleSetValueAtFn)      (ETableModel *etm, int col, int row, const void *val, void *data);
-typedef	gboolean    (*ETableSimpleIsCellEditableFn)  (ETableModel *etm, int col, int row, void *data);
-
-typedef	void       *(*ETableSimpleDuplicateValueFn)  (ETableModel *etm, int col, const void *val, void *data);
-typedef	void        (*ETableSimpleFreeValueFn)       (ETableModel *etm, int col, void *val, void *data);
-typedef void       *(*ETableSimpleInitializeValueFn) (ETableModel *etm, int col, void *data);
-typedef gboolean    (*ETableSimpleValueIsEmptyFn)    (ETableModel *etm, int col, const void *val, void *data);
-typedef char       *(*ETableSimpleValueToStringFn)   (ETableModel *etm, int col, const void *val, void *data);
-
-typedef struct {
-	ETableModel parent;
-
-	ETableSimpleColumnCountFn     col_count;
-	ETableSimpleRowCountFn        row_count;
-	ETableSimpleAppendRowFn       append_row;
-
-	ETableSimpleValueAtFn         value_at;
-	ETableSimpleSetValueAtFn      set_value_at;
-	ETableSimpleIsCellEditableFn  is_cell_editable;
-
-	ETableSimpleDuplicateValueFn  duplicate_value;
-	ETableSimpleFreeValueFn       free_value;
-	ETableSimpleInitializeValueFn initialize_value;
-	ETableSimpleValueIsEmptyFn    value_is_empty;
-	ETableSimpleValueToStringFn   value_to_string;
-	void *data;
-} ETableSimple;
-
-typedef struct {
-	ETableModelClass parent_class;
-} ETableSimpleClass;
-
-GtkType e_table_simple_get_type (void);
-
-ETableModel *e_table_simple_new (ETableSimpleColumnCountFn col_count,
-				 ETableSimpleRowCountFn row_count,
-
-				 ETableSimpleValueAtFn value_at,
-				 ETableSimpleSetValueAtFn set_value_at,
-				 ETableSimpleIsCellEditableFn is_cell_editable,
-
-				 ETableSimpleDuplicateValueFn duplicate_value,
-				 ETableSimpleFreeValueFn free_value,
-				 ETableSimpleInitializeValueFn initialize_value,
-				 ETableSimpleValueIsEmptyFn value_is_empty,
-				 ETableSimpleValueToStringFn value_to_string,
-				 void *data);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TABLE_SIMPLE_H_ */
-
diff --git a/widgets/table/e-table-size-test.c b/widgets/table/e-table-size-test.c
deleted file mode 100644
index acb6e4296d..0000000000
--- a/widgets/table/e-table-size-test.c
+++ /dev/null
@@ -1,287 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* This code is GPL. */
-#include <stdio.h>
-#include <string.h>
-#include <gnome.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include "gal/e-util/e-cursors.h"
-#include "e-table-simple.h"
-#include "e-table-header.h"
-#include "e-table-header-item.h"
-#include "e-table-item.h"
-#include "e-cell-text.h"
-#include "e-cell-checkbox.h"
-#include "e-table.h"
-
-#include "table-test.h"
-
-/*
- * One way in which we make it simpler to build an ETableModel is through
- * the ETableSimple class.  Instead of creating your own ETableModel
- * class, you simply create a new object of the ETableSimple class.  You
- * give it a bunch of functions that act as callbacks.
- * 
- * You also get to pass a void * to ETableSimple and it gets passed to
- * your callbacks.  This would be for having multiple models of the same
- * type.  This is just an example though, so we statically define all the
- * data and ignore the void *data parameter.
- * 
- * In our example we will be creating a table model with 6 columns and 10
- * rows.  This corresponds to having 6 different types of information and
- * 10 different sets of data in our database.
- * 
- * The headers will be hard coded, as will be the example data.
- *
- */
-
-/*
- * There are two different meanings to the word "column".  The first is
- * the model column.  A model column corresponds to a specific type of
- * data.  This is very much like the usage in a database table where a
- * column is a field in the database.
- *
- * The second type of column is a view column.  A view column
- * corresponds to a visually displayed column.  Each view column
- * corresponds to a specific model column, though a model column may
- * have any number of view columns associated with it, from zero to
- * greater than one.
- *
- * Also, a view column doesn't necessarily depend on only one model
- * column.  In some cases, the view column renderer can be given a
- * reference to another column to get extra information about its
- * display.
-*/
-
-#define ROWS 5000
-#define COLS 4
-
-#define IMPORTANCE_COLUMN 4
-#define COLOR_COLUMN 5
-
-/*
- * Here we define the initial layout of the table.  This is an xml
- * format that allows you to change the initial ordering of the
- * columns or to do sorting or grouping initially.  This specification
- * shows all 5 columns, but moves the importance column nearer to the
- * front.  It also sorts by the "Full Name" column (ascending.)
- * Sorting and grouping take the model column as their arguments
- * (sorting is specified by the "column" argument to the leaf elemnt.
- */
-
-#define INITIAL_SPEC "<ETableSpecification>                    	       \
-	<columns-shown>                  			       \
-		<column> 0 </column>     			       \
-		<column> 4 </column>     			       \
-		<column> 1 </column>     			       \
-		<column> 2 </column>     			       \
-		<column> 3 </column>     			       \
-	</columns-shown>                 			       \
-	<grouping> <leaf column=\"1\" ascending=\"true\"/> </grouping>    \
-</ETableSpecification>"
-
-char *headers [COLS] = {
-  "Email",
-  "Full Name",
-  "Address",
-  "Phone"
-};
-
-/*
- * Virtual Column list:
- * 0   Email
- * 1   Full Name
- * 2   Address
- * 3   Phone
- */
-
-/*
- * ETableSimple callbacks
- * These are the callbacks that define the behavior of our custom model.
- */
-
-/*
- * Since our model is a constant size, we can just return its size in
- * the column and row count fields.
- */
-
-/* This function returns the number of columns in our ETableModel. */
-static int
-my_col_count (ETableModel *etc, void *data)
-{
-	return COLS;
-}
-
-/* This function returns the number of rows in our ETableModel. */
-static int
-my_row_count (ETableModel *etc, void *data)
-{
-	return ROWS;
-}
-
-/* This function returns the value at a particular point in our ETableModel. */
-static void *
-my_value_at (ETableModel *etc, int col, int row, void *data)
-{
-	static guchar t[] = {'A', 0xc3, 0x84, 0xc3, 0x95, 0xc3, 0x94, 0xc3, 0xb5, 0x00};
-
-#if 0
-	if (col == 1) return "toshok@ximian.com";
-#else
-	if (col == 1) return t;
-#endif
-        else if (col == 2) return "Chris Toshok";
-        else if (col == 3) return "43 Vicksburg, SF";
-        else if (col == 4) return "415-867-5309";
-	else return NULL;
-}
-
-/* This function sets the value at a particular point in our ETableModel. */
-static void
-my_set_value_at (ETableModel *etc, int col, int row, const void *val, void *data)
-{
-}
-
-/* This function returns whether a particular cell is editable. */
-static gboolean
-my_is_cell_editable (ETableModel *etc, int col, int row, void *data)
-{
-	return FALSE;
-}
-
-/* This function duplicates the value passed to it. */
-static void *
-my_duplicate_value (ETableModel *etc, int col, const void *value, void *data)
-{
-	return g_strdup (value);
-}
-
-/* This function frees the value passed to it. */
-static void
-my_free_value (ETableModel *etc, int col, void *value, void *data)
-{
-	g_free (value);
-}
-
-/* This function creates an empty value. */
-static void *
-my_initialize_value (ETableModel *etc, int col, void *data)
-{
-	return g_strdup ("");
-}
-
-/* This function reports if a value is empty. */
-static gboolean
-my_value_is_empty (ETableModel *etc, int col, const void *value, void *data)
-{
-	return !(value && *(char *)value);
-}
-
-/* This function reports if a value is empty. */
-static char *
-my_value_to_string (ETableModel *etc, int col, const void *value, void *data)
-{
-	return g_strdup(value);
-}
-
-/* We create a window containing our new table. */
-static void
-create_table (void)
-{
-	GtkWidget *e_table, *window, *frame;
-	ECell *cell_left_just;
-	ETableHeader *e_table_header;
-	ETableModel *e_table_model = NULL;
-        int i;
-
-	/* Next we create our model.  This uses the functions we defined
-	   earlier. */
-	e_table_model = e_table_simple_new (
-					    my_col_count, my_row_count, my_value_at,
-					    my_set_value_at, my_is_cell_editable,
-					    my_duplicate_value, my_free_value,
-					    my_initialize_value, my_value_is_empty,
-					    my_value_to_string,
-					    NULL);
-	/*
-	 * Next we create a header.  The ETableHeader is used in two
-	 * different way.  The first is the full_header.  This is the
-	 * list of possible columns in the view.  The second use is
-	 * completely internal.  Many of the ETableHeader functions are
-	 * for that purpose.  The only functions we really need are
-	 * e_table_header_new and e_table_header_add_col.
-	 *
-	 * First we create the header.
-	 */
-	e_table_header = e_table_header_new ();
-	
-	/*
-	 * Next we have to build renderers for all of the columns.
-	 * Since all our columns are text columns, we can simply use
-	 * the same renderer over and over again.  If we had different
-	 * types of columns, we could use a different renderer for
-	 * each column.
-	 */
-	cell_left_just = e_cell_text_new (e_table_model, NULL, GTK_JUSTIFY_LEFT);
-
-	/*
-	 * Next we create a column object for each view column and add
-	 * them to the header.  We don't create a column object for
-	 * the importance column since it will not be shown.
-	 */
-	for (i = 0; i < COLS; i++) {
-		/* Create the column. */
-		ETableCol *ecol = e_table_col_new (
-						   i, headers [i],
-						   1.0, 20, cell_left_just,
-						   g_str_compare, TRUE);
-		/* Add it to the header. */
-		e_table_header_add_column (e_table_header, ecol, i);
-	}
-
-	/*
-	 * Here we create a window for our new table.  This window
-	 * will get shown and the person will be able to test their
-	 * item.
-	 */
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-	/* This frame is simply to get a bevel around our table. */
-	frame = gtk_frame_new (NULL);
-
-	/*
-	 * Here we create the table.  We give it the three pieces of
-	 * the table we've created, the header, the model, and the
-	 * initial layout.  It does the rest.
-	 */
-	e_table = e_table_new (e_table_header, e_table_model, INITIAL_SPEC);
-
-	/* Build the gtk widget hierarchy. */
-	gtk_container_add (GTK_CONTAINER (frame), e_table);
-	gtk_container_add (GTK_CONTAINER (window), frame);
-
-	/* Size the initial window. */
-	gtk_widget_set_usize (window, 300, 200);
-
-	/* Show it all. */
-	gtk_widget_show_all (window);
-}
-
-/* This is the main function which just initializes gnome and call our create_table function */
-
-int
-main (int argc, char *argv [])
-{
-	gnome_init ("TableExample", "TableExample", argc, argv);
-	e_cursors_init ();
-
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-
-	create_table ();
-	
-	gtk_main ();
-
-	e_cursors_shutdown ();
-	return 0;
-}
-
diff --git a/widgets/table/e-table-sort-info.c b/widgets/table/e-table-sort-info.c
deleted file mode 100644
index bc4cf16f39..0000000000
--- a/widgets/table/e-table-sort-info.c
+++ /dev/null
@@ -1,452 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-table-sort-info.c: a Table Model
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- *   Chris Lahey (clahey@ximian.com)
- *
- * (C) 1999, 2000, 2001 Ximian, Inc.
- */
-#include <config.h>
-
-#include "e-table-sort-info.h"
-
-#include <gtk/gtksignal.h>
-#include "gal/util/e-util.h"
-#include "gal/util/e-xml-utils.h"
-#include <string.h>
-
-#define ETM_CLASS(e) ((ETableSortInfoClass *)((GtkObject *)e)->klass)
-
-#define PARENT_TYPE gtk_object_get_type ()
-					  
-
-static GtkObjectClass *e_table_sort_info_parent_class;
-
-enum {
-	SORT_INFO_CHANGED,
-	GROUP_INFO_CHANGED,
-	LAST_SIGNAL
-};
-
-static guint e_table_sort_info_signals [LAST_SIGNAL] = { 0, };
-
-static void
-etsi_destroy (GtkObject *object)
-{
-	ETableSortInfo *etsi;
-
-	etsi = E_TABLE_SORT_INFO (object);
-	
-	if (etsi->groupings)
-		g_free(etsi->groupings);
-	if (etsi->sortings)
-		g_free(etsi->sortings);
-}
-
-static void
-e_table_sort_info_init (ETableSortInfo *info)
-{
-	GTK_OBJECT_UNSET_FLAGS (GTK_OBJECT (info), GTK_FLOATING);
-
-	info->group_count = 0;
-	info->groupings = NULL;
-	info->sort_count = 0;
-	info->sortings = NULL;
-	info->frozen = 0;
-	info->sort_info_changed = 0;
-	info->group_info_changed = 0;
-}
-
-static void
-e_table_sort_info_class_init (ETableSortInfoClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	e_table_sort_info_parent_class = gtk_type_class (gtk_object_get_type ());
-
-	object_class = GTK_OBJECT_CLASS(klass);
-	
-	object_class->destroy = etsi_destroy;
-
-	e_table_sort_info_signals [SORT_INFO_CHANGED] =
-		gtk_signal_new ("sort_info_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableSortInfoClass, sort_info_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_table_sort_info_signals [GROUP_INFO_CHANGED] =
-		gtk_signal_new ("group_info_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableSortInfoClass, group_info_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	klass->sort_info_changed = NULL;
-	klass->group_info_changed = NULL;
-
-	gtk_object_class_add_signals (object_class, e_table_sort_info_signals, LAST_SIGNAL);
-}
-
-E_MAKE_TYPE(e_table_sort_info, "ETableSortInfo", ETableSortInfo,
-	    e_table_sort_info_class_init, e_table_sort_info_init, PARENT_TYPE);
-
-static void
-e_table_sort_info_sort_info_changed (ETableSortInfo *info)
-{
-	g_return_if_fail (info != NULL);
-	g_return_if_fail (E_IS_TABLE_SORT_INFO (info));
-	
-	if (info->frozen) {
-		info->sort_info_changed = 1;
-	} else {
-		gtk_signal_emit (GTK_OBJECT (info),
-				 e_table_sort_info_signals [SORT_INFO_CHANGED]);
-	}
-}
-
-static void
-e_table_sort_info_group_info_changed (ETableSortInfo *info)
-{
-	g_return_if_fail (info != NULL);
-	g_return_if_fail (E_IS_TABLE_SORT_INFO (info));
-	
-	if (info->frozen) {
-		info->group_info_changed = 1;
-	} else {
-		gtk_signal_emit (GTK_OBJECT (info),
-				 e_table_sort_info_signals [GROUP_INFO_CHANGED]);
-	}
-}
-
-/**
- * e_table_sort_info_freeze:
- * @info: The ETableSortInfo object
- *
- * This functions allows the programmer to cluster various changes to the
- * ETableSortInfo (grouping and sorting) without having the object emit
- * "group_info_changed" or "sort_info_changed" signals on each change.
- *
- * To thaw, invoke the e_table_sort_info_thaw() function, which will
- * trigger any signals that might have been queued.
- */
-void 
-e_table_sort_info_freeze             (ETableSortInfo *info)
-{
-	info->frozen++;
-}
-
-/**
- * e_table_sort_info_thaw:
- * @info: The ETableSortInfo object
- *
- * This functions allows the programmer to cluster various changes to the
- * ETableSortInfo (grouping and sorting) without having the object emit
- * "group_info_changed" or "sort_info_changed" signals on each change.
- *
- * This function will flush any pending signals that might be emited by
- * this object.
- */
-void
-e_table_sort_info_thaw               (ETableSortInfo *info)
-{
-	info->frozen--;
-	if (info->frozen != 0)
-		return;
-	
-	if (info->sort_info_changed) {
-		info->sort_info_changed = 0;
-		e_table_sort_info_sort_info_changed(info);
-	}
-	if (info->group_info_changed) {
-		info->group_info_changed = 0;
-		e_table_sort_info_group_info_changed(info);
-	}
-}
-
-/**
- * e_table_sort_info_grouping_get_count:
- * @info: The ETableSortInfo object
- *
- * Returns: the number of grouping criteria in the object.
- */
-guint
-e_table_sort_info_grouping_get_count (ETableSortInfo *info)
-{
-	return info->group_count;
-}
-
-static void
-e_table_sort_info_grouping_real_truncate  (ETableSortInfo *info, int length)
-{
-	if (length < info->group_count) {
-		info->group_count = length;
-	}
-	if (length > info->group_count) {
-		info->groupings = g_realloc(info->groupings, length * sizeof(ETableSortColumn));
-		info->group_count = length;
-	}
-}
-
-/**
- * e_table_sort_info_grouping_truncate:
- * @info: The ETableSortInfo object
- * @lenght: position where the truncation happens.
- *
- * This routine can be used to reduce or grow the number of grouping
- * criteria in the object.  
- */
-void
-e_table_sort_info_grouping_truncate  (ETableSortInfo *info, int length)
-{
-	e_table_sort_info_grouping_real_truncate(info, length);
-	e_table_sort_info_group_info_changed(info);
-}
-
-/**
- * e_table_sort_info_grouping_get_nth:
- * @info: The ETableSortInfo object
- * @n: Item information to fetch.
- *
- * Returns: the description of the @n-th grouping criteria in the @info object.
- */
-ETableSortColumn
-e_table_sort_info_grouping_get_nth   (ETableSortInfo *info, int n)
-{
-	if (n < info->group_count) {
-		return info->groupings[n];
-	} else {
-		ETableSortColumn fake = {0, 0};
-		return fake;
-	}
-}
-
-/**
- * e_table_sort_info_grouping_set_nth:
- * @info: The ETableSortInfo object
- * @n: Item information to fetch.
- * @column: new values for the grouping
- *
- * Sets the grouping criteria for index @n to be given by @column (a column number and
- * whether it is ascending or descending).
- */
-void
-e_table_sort_info_grouping_set_nth   (ETableSortInfo *info, int n, ETableSortColumn column)
-{
-	if (n >= info->group_count) {
-		e_table_sort_info_grouping_real_truncate(info, n + 1);
-	}
-	info->groupings[n] = column;
-	e_table_sort_info_group_info_changed(info);
-}
-
-
-/**
- * e_table_sort_info_get_count:
- * @info: The ETableSortInfo object
- *
- * Returns: the number of sorting criteria in the object.
- */
-guint
-e_table_sort_info_sorting_get_count (ETableSortInfo *info)
-{
-	return info->sort_count;
-}
-
-static void
-e_table_sort_info_sorting_real_truncate  (ETableSortInfo *info, int length)
-{
-	if (length < info->sort_count) {
-		info->sort_count = length;
-	}
-	if (length > info->sort_count) {
-		info->sortings = g_realloc(info->sortings, length * sizeof(ETableSortColumn));
-		info->sort_count = length;
-	}
-}
-
-/**
- * e_table_sort_info_sorting_truncate:
- * @info: The ETableSortInfo object
- * @lenght: position where the truncation happens.
- *
- * This routine can be used to reduce or grow the number of sort
- * criteria in the object.  
- */
-void
-e_table_sort_info_sorting_truncate  (ETableSortInfo *info, int length)
-{
-	e_table_sort_info_sorting_real_truncate  (info, length);
-	e_table_sort_info_sort_info_changed(info);
-}
-
-/**
- * e_table_sort_info_sorting_get_nth:
- * @info: The ETableSortInfo object
- * @n: Item information to fetch.
- *
- * Returns: the description of the @n-th grouping criteria in the @info object.
- */
-ETableSortColumn
-e_table_sort_info_sorting_get_nth   (ETableSortInfo *info, int n)
-{
-	if (n < info->sort_count) {
-		return info->sortings[n];
-	} else {
-		ETableSortColumn fake = {0, 0};
-		return fake;
-	}
-}
-
-/**
- * e_table_sort_info_sorting_get_nth:
- * @info: The ETableSortInfo object
- * @n: Item information to fetch.
- * @column: new values for the sorting
- *
- * Sets the sorting criteria for index @n to be given by @column (a
- * column number and whether it is ascending or descending).
- */
-void
-e_table_sort_info_sorting_set_nth   (ETableSortInfo *info, int n, ETableSortColumn column)
-{
-	if (n >= info->sort_count) {
-		e_table_sort_info_sorting_real_truncate(info, n + 1);
-	}
-	info->sortings[n] = column;
-	e_table_sort_info_sort_info_changed(info);
-}
-
-/**
- * e_table_sort_info_new:
- *
- * This creates a new e_table_sort_info object that contains no
- * grouping and no sorting defined as of yet.  This object is used
- * to keep track of multi-level sorting and multi-level grouping of
- * the ETable.  
- *
- * Returns: A new %ETableSortInfo object
- */
-ETableSortInfo *
-e_table_sort_info_new (void)
-{
-	return gtk_type_new (e_table_sort_info_get_type ());
-}
-
-/**
- * e_table_sort_info_load_from_node:
- * @info: The ETableSortInfo object
- * @node: pointer to the xmlNode that describes the sorting and grouping information
- * @state_version:
- *
- * This loads the state for the %ETableSortInfo object @info from the
- * xml node @node.
- */
-void
-e_table_sort_info_load_from_node (ETableSortInfo *info,
-				  xmlNode        *node,
-				  gdouble         state_version)
-{
-	int i;
-	xmlNode *grouping;
-
-	if (state_version <= 0.05) {
-		i = 0;
-		for (grouping = node->childs; grouping && !strcmp (grouping->name, "group"); grouping = grouping->childs) {
-			ETableSortColumn column;
-			column.column = e_xml_get_integer_prop_by_name (grouping, "column");
-			column.ascending = e_xml_get_bool_prop_by_name (grouping, "ascending");
-			e_table_sort_info_grouping_set_nth(info, i++, column);
-		}
-		i = 0;
-		for (; grouping && !strcmp (grouping->name, "leaf"); grouping = grouping->childs) {
-			ETableSortColumn column;
-			column.column = e_xml_get_integer_prop_by_name (grouping, "column");
-			column.ascending = e_xml_get_bool_prop_by_name (grouping, "ascending");
-			e_table_sort_info_sorting_set_nth(info, i++, column);
-		}
-	} else {
-		i = 0;
-		for (grouping = node->childs; grouping && !strcmp (grouping->name, "group"); grouping = grouping->next) {
-			ETableSortColumn column;
-			column.column = e_xml_get_integer_prop_by_name (grouping, "column");
-			column.ascending = e_xml_get_bool_prop_by_name (grouping, "ascending");
-			e_table_sort_info_grouping_set_nth(info, i++, column);
-		}
-		i = 0;
-		for (; grouping && !strcmp (grouping->name, "leaf"); grouping = grouping->next) {
-			ETableSortColumn column;
-			column.column = e_xml_get_integer_prop_by_name (grouping, "column");
-			column.ascending = e_xml_get_bool_prop_by_name (grouping, "ascending");
-			e_table_sort_info_sorting_set_nth(info, i++, column);
-		}
-	}
-	gtk_signal_emit (GTK_OBJECT (info),
-			 e_table_sort_info_signals [SORT_INFO_CHANGED]);
-	
-}
-
-/**
- * e_table_sort_info_save_to_node:
- * @info: The ETableSortInfo object
- * @parent: xmlNode that will be hosting the saved state of the @info object.
- *
- * This function is used
- *
- * Returns: the node that has been appended to @parent as a child containing
- * the sorting and grouping information for this ETableSortInfo object.
- */
-xmlNode *
-e_table_sort_info_save_to_node (ETableSortInfo *info,
-				xmlNode        *parent)
-{
-	xmlNode *grouping;
-	xmlNode *node;
-	int i;
-	const int sort_count = e_table_sort_info_sorting_get_count (info);
-	const int group_count = e_table_sort_info_grouping_get_count (info);
-	
-	grouping = xmlNewChild (parent, NULL, "grouping", NULL);
-
-	for (i = 0; i < group_count; i++) {
-		ETableSortColumn column = e_table_sort_info_grouping_get_nth(info, i);
-		xmlNode *new_node = xmlNewChild(grouping, NULL, "group", NULL);
-
-		e_xml_set_integer_prop_by_name (new_node, "column", column.column);
-		e_xml_set_bool_prop_by_name (new_node, "ascending", column.ascending);
-		node = new_node;
-	}
-
-	for (i = 0; i < sort_count; i++) {
-		ETableSortColumn column = e_table_sort_info_sorting_get_nth(info, i);
-		xmlNode *new_node = xmlNewChild(grouping, NULL, "leaf", NULL);
-		
-		e_xml_set_integer_prop_by_name (new_node, "column", column.column);
-		e_xml_set_bool_prop_by_name (new_node, "ascending", column.ascending);
-		node = new_node;
-	}
-
-	return grouping;
-}
-
-ETableSortInfo *
-e_table_sort_info_duplicate (ETableSortInfo *info)
-{
-	ETableSortInfo *new_info;
-
-	new_info = e_table_sort_info_new();
-
-	new_info->group_count = info->group_count;
-	new_info->groupings = g_new(ETableSortColumn, new_info->group_count);
-	memmove(new_info->groupings, info->groupings, sizeof (ETableSortColumn) * new_info->group_count);
-
-	new_info->sort_count = info->sort_count;
-	new_info->sortings = g_new(ETableSortColumn, new_info->sort_count);
-	memmove(new_info->sortings, info->sortings, sizeof (ETableSortColumn) * new_info->sort_count);
-
-	return new_info;
-}
diff --git a/widgets/table/e-table-sort-info.h b/widgets/table/e-table-sort-info.h
deleted file mode 100644
index a2cd4f43a0..0000000000
--- a/widgets/table/e-table-sort-info.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_SORT_INFO_H_
-#define _E_TABLE_SORT_INFO_H_
-
-#include <gtk/gtkobject.h>
-#include <gnome-xml/tree.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_TABLE_SORT_INFO_TYPE        (e_table_sort_info_get_type ())
-#define E_TABLE_SORT_INFO(o)          (GTK_CHECK_CAST ((o), E_TABLE_SORT_INFO_TYPE, ETableSortInfo))
-#define E_TABLE_SORT_INFO_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_SORT_INFO_TYPE, ETableSortInfoClass))
-#define E_IS_TABLE_SORT_INFO(o)       (GTK_CHECK_TYPE ((o), E_TABLE_SORT_INFO_TYPE))
-#define E_IS_TABLE_SORT_INFO_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_SORT_INFO_TYPE))
-
-typedef struct _ETableSortColumn ETableSortColumn;
-
-struct _ETableSortColumn {
-	guint column : 31;
-	guint ascending : 1;
-};
-
-typedef struct {
-	GtkObject   base;
-	
-	gint group_count;
-	ETableSortColumn *groupings;
-	gint sort_count;
-	ETableSortColumn *sortings;
-	
-	guint frozen : 1;
-	guint sort_info_changed : 1;
-	guint group_info_changed : 1;
-} ETableSortInfo;
-
-typedef struct {
-	GtkObjectClass parent_class;
-
-	/*
-	 * Signals
-	 */
-	void        (*sort_info_changed)      (ETableSortInfo *info);
-	void        (*group_info_changed)     (ETableSortInfo *info);
-} ETableSortInfoClass;
-
-GtkType           e_table_sort_info_get_type            (void);
-
-void              e_table_sort_info_freeze              (ETableSortInfo   *info);
-void              e_table_sort_info_thaw                (ETableSortInfo   *info);
-
-guint             e_table_sort_info_grouping_get_count  (ETableSortInfo   *info);
-void              e_table_sort_info_grouping_truncate   (ETableSortInfo   *info,
-							 int               length);
-ETableSortColumn  e_table_sort_info_grouping_get_nth    (ETableSortInfo   *info,
-							 int               n);
-void              e_table_sort_info_grouping_set_nth    (ETableSortInfo   *info,
-							 int               n,
-							 ETableSortColumn  column);
-
-guint             e_table_sort_info_sorting_get_count   (ETableSortInfo   *info);
-void              e_table_sort_info_sorting_truncate    (ETableSortInfo   *info,
-							 int               length);
-ETableSortColumn  e_table_sort_info_sorting_get_nth     (ETableSortInfo   *info,
-							 int               n);
-void              e_table_sort_info_sorting_set_nth     (ETableSortInfo   *info,
-							 int               n,
-							 ETableSortColumn  column);
-
-ETableSortInfo   *e_table_sort_info_new                 (void);
-void              e_table_sort_info_load_from_node      (ETableSortInfo   *info,
-							 xmlNode          *node,
-							 gdouble           state_version);
-xmlNode          *e_table_sort_info_save_to_node        (ETableSortInfo   *info,
-							 xmlNode          *parent);
-ETableSortInfo   *e_table_sort_info_duplicate           (ETableSortInfo   *info);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TABLE_SORT_INFO_H_ */
diff --git a/widgets/table/e-table-sorted-variable.c b/widgets/table/e-table-sorted-variable.c
deleted file mode 100644
index 665d5fd1d7..0000000000
--- a/widgets/table/e-table-sorted-variable.c
+++ /dev/null
@@ -1,210 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-sorted.c: Implements a table that sorts another table
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * (C) 1999 Ximian, Inc.
- */
-#include <config.h>
-#include <stdlib.h>
-#include <gtk/gtksignal.h>
-#include <string.h>
-#include "gal/util/e-util.h"
-#include "e-table-sorted-variable.h"
-#include "e-table-sorting-utils.h"
-
-#define d(x)
-
-#define PARENT_TYPE E_TABLE_SUBSET_VARIABLE_TYPE
-
-#define INCREMENT_AMOUNT 100
-
-/* maximum insertions between an idle event that we will do without scheduling an idle sort */
-#define ETSV_INSERT_MAX (4)
-
-static ETableSubsetVariableClass *etsv_parent_class;
-
-static void etsv_sort_info_changed        (ETableSortInfo *info, ETableSortedVariable *etsv);
-static void etsv_sort                     (ETableSortedVariable *etsv);
-static void etsv_add                      (ETableSubsetVariable *etssv, gint                  row);
-static void etsv_add_all                  (ETableSubsetVariable *etssv);
-
-static void
-etsv_destroy (GtkObject *object)
-{
-	ETableSortedVariable *etsv = E_TABLE_SORTED_VARIABLE (object);
-
-	gtk_signal_disconnect (GTK_OBJECT (etsv->sort_info),
-			       etsv->sort_info_changed_id);
-
-	if (etsv->sort_idle_id) {
-		g_source_remove(etsv->sort_idle_id);
-	}
-	if (etsv->insert_idle_id) {
-		g_source_remove(etsv->insert_idle_id);
-	}
-
-	if (etsv->sort_info)
-		gtk_object_unref(GTK_OBJECT(etsv->sort_info));
-	if (etsv->full_header)
-		gtk_object_unref(GTK_OBJECT(etsv->full_header));
-
-	GTK_OBJECT_CLASS (etsv_parent_class)->destroy (object);
-}
-
-static void
-etsv_class_init (GtkObjectClass *object_class)
-{
-	ETableSubsetVariableClass *etssv_class = E_TABLE_SUBSET_VARIABLE_CLASS(object_class);
-
-	etsv_parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->destroy = etsv_destroy;
-
-	etssv_class->add = etsv_add;
-	etssv_class->add_all = etsv_add_all;
-}
-
-static void
-etsv_init (ETableSortedVariable *etsv)
-{
-	etsv->full_header = NULL;
-	etsv->sort_info = NULL;
-
-	etsv->sort_info_changed_id = 0;
-
-	etsv->sort_idle_id = 0;
-	etsv->insert_count = 0;
-}
-
-E_MAKE_TYPE(e_table_sorted_variable, "ETableSortedVariable", ETableSortedVariable, etsv_class_init, etsv_init, PARENT_TYPE);
-
-static gboolean
-etsv_sort_idle(ETableSortedVariable *etsv)
-{
-	gtk_object_ref(GTK_OBJECT(etsv));
-	etsv_sort(etsv);
-	etsv->sort_idle_id = 0;
-	etsv->insert_count = 0;
-	gtk_object_unref(GTK_OBJECT(etsv));
-	return FALSE;
-}
-
-static gboolean
-etsv_insert_idle(ETableSortedVariable *etsv)
-{
-	etsv->insert_count = 0;
-	etsv->insert_idle_id = 0;
-	return FALSE;
-}
-
-
-static void
-etsv_add       (ETableSubsetVariable *etssv,
-		gint                  row)
-{
-	ETableModel *etm = E_TABLE_MODEL(etssv);
-	ETableSubset *etss = E_TABLE_SUBSET(etssv);
-	ETableSortedVariable *etsv = E_TABLE_SORTED_VARIABLE (etssv);
-	int i;
-
-	if (etss->n_map + 1 > etssv->n_vals_allocated) {
-		etssv->n_vals_allocated += INCREMENT_AMOUNT;
-		etss->map_table = g_realloc (etss->map_table, (etssv->n_vals_allocated) * sizeof(int));
-	}
-	i = etss->n_map;
-	if (etsv->sort_idle_id == 0) {
-		/* this is to see if we're inserting a lot of things between idle loops.
-		   If we are, we're busy, its faster to just append and perform a full sort later */
-		etsv->insert_count++;
-		if (etsv->insert_count > ETSV_INSERT_MAX) {
-			/* schedule a sort, and append instead */
-			etsv->sort_idle_id = g_idle_add_full(50, (GSourceFunc) etsv_sort_idle, etsv, NULL);
-		} else {
-			/* make sure we have an idle handler to reset the count every now and then */
-			if (etsv->insert_idle_id == 0) {
-				etsv->insert_idle_id = g_idle_add_full(40, (GSourceFunc) etsv_insert_idle, etsv, NULL);
-			}
-			i = e_table_sorting_utils_insert(etss->source, etsv->sort_info, etsv->full_header, etss->map_table, etss->n_map, row);
-			memmove(etss->map_table + i + 1, etss->map_table + i, (etss->n_map - i) * sizeof(int));
-		}
-	}
-	etss->map_table[i] = row;
-	etss->n_map++;
-
-	e_table_model_row_inserted (etm, i);
-}
-
-static void
-etsv_add_all   (ETableSubsetVariable *etssv)
-{
-	ETableModel *etm = E_TABLE_MODEL(etssv);
-	ETableSubset *etss = E_TABLE_SUBSET(etssv);
-	ETableSortedVariable *etsv = E_TABLE_SORTED_VARIABLE (etssv);
-	int rows;
-	int i;
-
-	e_table_model_pre_change(etm);
-
-	rows = e_table_model_row_count(etss->source);
-
-	if (etss->n_map + rows > etssv->n_vals_allocated){
-		etssv->n_vals_allocated += MAX(INCREMENT_AMOUNT, rows);
-		etss->map_table = g_realloc (etss->map_table, etssv->n_vals_allocated * sizeof(int));
-	}
-	for (i = 0; i < rows; i++)
-		etss->map_table[etss->n_map++] = i;
-
-	if (etsv->sort_idle_id == 0) {
-		etsv->sort_idle_id = g_idle_add_full(50, (GSourceFunc) etsv_sort_idle, etsv, NULL);
-	}
-
-	e_table_model_changed (etm);
-}
-
-ETableModel *
-e_table_sorted_variable_new (ETableModel *source, ETableHeader *full_header, ETableSortInfo *sort_info)
-{
-	ETableSortedVariable *etsv = gtk_type_new (E_TABLE_SORTED_VARIABLE_TYPE);
-	ETableSubsetVariable *etssv = E_TABLE_SUBSET_VARIABLE (etsv);
-
-	if (e_table_subset_variable_construct (etssv, source) == NULL){
-		gtk_object_unref (GTK_OBJECT (etsv));
-		return NULL;
-	}
-
-	etsv->sort_info = sort_info;
-	gtk_object_ref(GTK_OBJECT(etsv->sort_info));
-	etsv->full_header = full_header;
-	gtk_object_ref(GTK_OBJECT(etsv->full_header));
-
-	etsv->sort_info_changed_id = gtk_signal_connect (GTK_OBJECT (sort_info), "sort_info_changed",
-							 GTK_SIGNAL_FUNC (etsv_sort_info_changed), etsv);
-
-	return E_TABLE_MODEL(etsv);
-}
-
-static void
-etsv_sort_info_changed (ETableSortInfo *info, ETableSortedVariable *etsv)
-{
-	etsv_sort(etsv);
-}
-
-static void
-etsv_sort(ETableSortedVariable *etsv)
-{
-	ETableSubset *etss = E_TABLE_SUBSET(etsv);
-	static int reentering = 0;
-	if (reentering)
-		return;
-	reentering = 1;
-
-	e_table_model_pre_change(E_TABLE_MODEL(etsv));
-
-	e_table_sorting_utils_sort(etss->source, etsv->sort_info, etsv->full_header, etss->map_table, etss->n_map);
-
-	e_table_model_changed (E_TABLE_MODEL(etsv));
-	reentering = 0;
-}
diff --git a/widgets/table/e-table-sorted-variable.h b/widgets/table/e-table-sorted-variable.h
deleted file mode 100644
index d326e26df8..0000000000
--- a/widgets/table/e-table-sorted-variable.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_SORTED_VARIABLE_H_
-#define _E_TABLE_SORTED_VARIABLE_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/e-table/e-table-model.h>
-#include <gal/e-table/e-table-subset-variable.h>
-#include <gal/e-table/e-table-sort-info.h>
-#include <gal/e-table/e-table-header.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_TABLE_SORTED_VARIABLE_TYPE        (e_table_sorted_variable_get_type ())
-#define E_TABLE_SORTED_VARIABLE(o)          (GTK_CHECK_CAST ((o), E_TABLE_SORTED_VARIABLE_TYPE, ETableSortedVariable))
-#define E_TABLE_SORTED_VARIABLE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_SORTED_VARIABLE_TYPE, ETableSortedVariableClass))
-#define E_IS_TABLE_SORTED_VARIABLE(o)       (GTK_CHECK_TYPE ((o), E_TABLE_SORTED_VARIABLE_TYPE))
-#define E_IS_TABLE_SORTED_VARIABLE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_SORTED_VARIABLE_TYPE))
-
-typedef struct {
-	ETableSubsetVariable base;
-
-	ETableSortInfo *sort_info;
-	
-	ETableHeader *full_header;
-
-	int              sort_info_changed_id;
-	int              sort_idle_id;
-	int		 insert_idle_id;
-	int		 insert_count;
-
-} ETableSortedVariable;
-
-typedef struct {
-	ETableSubsetVariableClass parent_class;
-} ETableSortedVariableClass;
-
-GtkType      e_table_sorted_variable_get_type (void);
-ETableModel *e_table_sorted_variable_new      (ETableModel *etm, ETableHeader *header, ETableSortInfo *sort_info);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TABLE_SORTED_VARIABLE_H_ */
diff --git a/widgets/table/e-table-sorted.c b/widgets/table/e-table-sorted.c
deleted file mode 100644
index 4396b23ff3..0000000000
--- a/widgets/table/e-table-sorted.c
+++ /dev/null
@@ -1,274 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-sorted.c: Implements a table that sorts another table
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * (C) 1999 Ximian, Inc.
- */
-#include <config.h>
-#include <stdlib.h>
-#include <gtk/gtksignal.h>
-#include <string.h>
-#include "gal/util/e-util.h"
-#include "e-table-sorted.h"
-#include "e-table-sorting-utils.h"
-
-#define d(x)
-
-#define PARENT_TYPE E_TABLE_SUBSET_TYPE
-
-#define INCREMENT_AMOUNT 100
-
-/* maximum insertions between an idle event that we will do without scheduling an idle sort */
-#define ETS_INSERT_MAX (4)
-
-static ETableSubsetClass *ets_parent_class;
-
-static void ets_sort_info_changed        (ETableSortInfo *info, ETableSorted *ets);
-static void ets_sort                     (ETableSorted *ets);
-static void ets_proxy_model_changed      (ETableSubset *etss, ETableModel *source);
-static void ets_proxy_model_row_changed  (ETableSubset *etss, ETableModel *source, int row);
-static void ets_proxy_model_cell_changed (ETableSubset *etss, ETableModel *source, int col, int row);
-static void ets_proxy_model_rows_inserted (ETableSubset *etss, ETableModel *source, int row, int count);
-static void ets_proxy_model_rows_deleted  (ETableSubset *etss, ETableModel *source, int row, int count);
-
-static void
-ets_destroy (GtkObject *object)
-{
-	ETableSorted *ets = E_TABLE_SORTED (object);
-
-	if (ets->sort_idle_id) {
-		g_source_remove(ets->sort_idle_id);
-	}
-	if (ets->insert_idle_id) {
-		g_source_remove(ets->insert_idle_id);
-	}
-
-	if (ets->sort_info) {
-		gtk_signal_disconnect (GTK_OBJECT (ets->sort_info),
-				       ets->sort_info_changed_id);
-		gtk_object_unref(GTK_OBJECT(ets->sort_info));
-	}
-
-	if (ets->full_header)
-		gtk_object_unref(GTK_OBJECT(ets->full_header));
-
-	GTK_OBJECT_CLASS (ets_parent_class)->destroy (object);
-}
-
-static void
-ets_class_init (GtkObjectClass *object_class)
-{
-	ETableSubsetClass *etss_class = E_TABLE_SUBSET_CLASS(object_class);
-
-	ets_parent_class = gtk_type_class (PARENT_TYPE);
-
-	etss_class->proxy_model_changed = ets_proxy_model_changed;
-	etss_class->proxy_model_row_changed = ets_proxy_model_row_changed;
-	etss_class->proxy_model_cell_changed = ets_proxy_model_cell_changed;
-	etss_class->proxy_model_rows_inserted = ets_proxy_model_rows_inserted;
-	etss_class->proxy_model_rows_deleted = ets_proxy_model_rows_deleted;
-
-	object_class->destroy = ets_destroy;
-}
-
-static void
-ets_init (ETableSorted *ets)
-{
-	ets->full_header = NULL;
-	ets->sort_info = NULL;
-
-	ets->sort_info_changed_id = 0;
-
-	ets->sort_idle_id = 0;
-	ets->insert_count = 0;
-}
-
-E_MAKE_TYPE(e_table_sorted, "ETableSorted", ETableSorted, ets_class_init, ets_init, PARENT_TYPE);
-
-static gboolean
-ets_sort_idle(ETableSorted *ets)
-{
-	gtk_object_ref(GTK_OBJECT(ets));
-	ets_sort(ets);
-	ets->sort_idle_id = 0;
-	ets->insert_count = 0;
-	gtk_object_unref(GTK_OBJECT(ets));
-	return FALSE;
-}
-
-static gboolean
-ets_insert_idle(ETableSorted *ets)
-{
-	ets->insert_count = 0;
-	ets->insert_idle_id = 0;
-	return FALSE;
-}
-
-ETableModel *
-e_table_sorted_new (ETableModel *source, ETableHeader *full_header, ETableSortInfo *sort_info)
-{
-	ETableSorted *ets = gtk_type_new (E_TABLE_SORTED_TYPE);
-	ETableSubset *etss = E_TABLE_SUBSET (ets);
-
-	if (e_table_subset_construct (etss, source, 0) == NULL){
-		gtk_object_unref (GTK_OBJECT (ets));
-		return NULL;
-	}
-
-	ets->sort_info = sort_info;
-	gtk_object_ref(GTK_OBJECT(ets->sort_info));
-	ets->full_header = full_header;
-	gtk_object_ref(GTK_OBJECT(ets->full_header));
-
-	ets_proxy_model_changed(etss, source);
-
-	ets->sort_info_changed_id = gtk_signal_connect (GTK_OBJECT (sort_info), "sort_info_changed",
-							 GTK_SIGNAL_FUNC (ets_sort_info_changed), ets);
-
-	return E_TABLE_MODEL(ets);
-}
-
-static void
-ets_sort_info_changed (ETableSortInfo *info, ETableSorted *ets)
-{
-	ets_sort(ets);
-}
-
-static void
-ets_proxy_model_changed (ETableSubset *subset, ETableModel *source)
-{
-	int rows, i;
-
-	rows = e_table_model_row_count(source);
-
-	g_free(subset->map_table);
-	subset->n_map = rows;
-	subset->map_table = g_new(int, rows);
-
-	for (i = 0; i < rows; i++) {
-		subset->map_table[i] = i;
-	}
-
-	if (!E_TABLE_SORTED(subset)->sort_idle_id)
-		E_TABLE_SORTED(subset)->sort_idle_id = g_idle_add_full(50, (GSourceFunc) ets_sort_idle, subset, NULL);
-
-	e_table_model_changed(E_TABLE_MODEL(subset));
-}
-
-static void
-ets_proxy_model_row_changed (ETableSubset *subset, ETableModel *source, int row)
-{
-	if (!E_TABLE_SORTED(subset)->sort_idle_id)
-		E_TABLE_SORTED(subset)->sort_idle_id = g_idle_add_full(50, (GSourceFunc) ets_sort_idle, subset, NULL);
-	
-	if (ets_parent_class->proxy_model_row_changed)
-		(ets_parent_class->proxy_model_row_changed) (subset, source, row);
-}
-
-static void
-ets_proxy_model_cell_changed (ETableSubset *subset, ETableModel *source, int col, int row)
-{
-	ETableSorted *ets = E_TABLE_SORTED(subset);
-	if (e_table_sorting_utils_affects_sort(ets->sort_info, ets->full_header, col))
-		ets_proxy_model_row_changed(subset, source, row);
-	else if (ets_parent_class->proxy_model_cell_changed)
-		(ets_parent_class->proxy_model_cell_changed) (subset, source, col, row);
-}
-
-static void
-ets_proxy_model_rows_inserted (ETableSubset *etss, ETableModel *source, int row, int count)
-{
- 	ETableModel *etm = E_TABLE_MODEL(etss);
-	ETableSorted *ets = E_TABLE_SORTED(etss);
-	int i;
-
-	e_table_model_pre_change (etm);
-
-	for (i = 0; i < etss->n_map; i++) {
-		if (etss->map_table[i] >= row)
-			etss->map_table[i] += count;
-	}
-
-	etss->map_table = g_realloc (etss->map_table, (etss->n_map + count) * sizeof(int));
-
-	for (; count > 0; count --) {
-		i = etss->n_map;
-		if (ets->sort_idle_id == 0) {
-			/* this is to see if we're inserting a lot of things between idle loops.
-			   If we are, we're busy, its faster to just append and perform a full sort later */
-			ets->insert_count++;
-			if (ets->insert_count > ETS_INSERT_MAX) {
-				/* schedule a sort, and append instead */
-				ets->sort_idle_id = g_idle_add_full(50, (GSourceFunc) ets_sort_idle, ets, NULL);
-			} else {
-				/* make sure we have an idle handler to reset the count every now and then */
-				if (ets->insert_idle_id == 0) {
-					ets->insert_idle_id = g_idle_add_full(40, (GSourceFunc) ets_insert_idle, ets, NULL);
-				}
-				i = e_table_sorting_utils_insert(etss->source, ets->sort_info, ets->full_header, etss->map_table, etss->n_map, row);
-				memmove(etss->map_table + i + 1, etss->map_table + i, (etss->n_map - i) * sizeof(int));
-			}
-		}
-		etss->map_table[i] = row;
-		etss->n_map++;
-
-		e_table_model_row_inserted (etm, i);
-		d(g_print("inserted row %d", row));
-		row++;
-	}
-	d(e_table_subset_print_debugging(etss));
-}
-
-static void
-ets_proxy_model_rows_deleted (ETableSubset *etss, ETableModel *source, int row, int count)
-{
-	ETableModel *etm = E_TABLE_MODEL(etss);
-	int i;
-	gboolean shift;
-	int j;
-
-	shift = row == etss->n_map - count;
-	
-	for (j = 0; j < count; j++) {
-		for (i = 0; i < etss->n_map; i++){
-			if (etss->map_table[i] == row + j) {
-				e_table_model_pre_change (etm);
-				memmove (etss->map_table + i, etss->map_table + i + 1, (etss->n_map - i - 1) * sizeof(int));
-				etss->n_map --;
-				if (shift)
-					e_table_model_row_deleted (etm, i);
-			}
-		}
-	}
-	if (!shift) {
-		for (i = 0; i < etss->n_map; i++) {
-			if (etss->map_table[i] >= row)
-				etss->map_table[i] -= count;
-		}
-
-		e_table_model_changed (etm);
-	}
-
-	d(g_print("deleted row %d count %d", row, count));
-	d(e_table_subset_print_debugging(etss));
-}
-
-static void
-ets_sort(ETableSorted *ets)
-{
-	ETableSubset *etss = E_TABLE_SUBSET(ets);
-	static int reentering = 0;
-	if (reentering)
-		return;
-	reentering = 1;
-
-	e_table_model_pre_change(E_TABLE_MODEL(ets));
-
-	e_table_sorting_utils_sort(etss->source, ets->sort_info, ets->full_header, etss->map_table, etss->n_map);
-
-	e_table_model_changed (E_TABLE_MODEL(ets));
-	reentering = 0;
-}
diff --git a/widgets/table/e-table-sorted.h b/widgets/table/e-table-sorted.h
deleted file mode 100644
index a138cdeb04..0000000000
--- a/widgets/table/e-table-sorted.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_SORTED_H_
-#define _E_TABLE_SORTED_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/e-table/e-table-model.h>
-#include <gal/e-table/e-table-subset.h>
-#include <gal/e-table/e-table-sort-info.h>
-#include <gal/e-table/e-table-header.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_TABLE_SORTED_TYPE        (e_table_sorted_get_type ())
-#define E_TABLE_SORTED(o)          (GTK_CHECK_CAST ((o), E_TABLE_SORTED_TYPE, ETableSorted))
-#define E_TABLE_SORTED_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_SORTED_TYPE, ETableSortedClass))
-#define E_IS_TABLE_SORTED(o)       (GTK_CHECK_TYPE ((o), E_TABLE_SORTED_TYPE))
-#define E_IS_TABLE_SORTED_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_SORTED_TYPE))
-
-typedef struct {
-	ETableSubset base;
-
-	ETableSortInfo *sort_info;
-	
-	ETableHeader *full_header;
-
-	int              sort_info_changed_id;
-	int              sort_idle_id;
-	int		 insert_idle_id;
-	int		 insert_count;
-
-} ETableSorted;
-
-typedef struct {
-	ETableSubsetClass parent_class;
-} ETableSortedClass;
-
-GtkType      e_table_sorted_get_type (void);
-ETableModel *e_table_sorted_new      (ETableModel *etm, ETableHeader *header, ETableSortInfo *sort_info);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TABLE_SORTED_H_ */
diff --git a/widgets/table/e-table-sorter.c b/widgets/table/e-table-sorter.c
deleted file mode 100644
index 4f4ddfc7ba..0000000000
--- a/widgets/table/e-table-sorter.c
+++ /dev/null
@@ -1,395 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-sorted.c: Implements a table that sorts another table
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * (C) 1999 Ximian, Inc.
- */
-#include <config.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gtk/gtksignal.h>
-#include "gal/util/e-util.h"
-#include "e-table-sorter.h"
-
-#define d(x)
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_SORT_INFO
-};
-
-#define PARENT_TYPE e_sorter_get_type()
-
-#define INCREMENT_AMOUNT 100
-
-static ESorterClass *parent_class;
-
-static void    	ets_model_changed      (ETableModel *etm, ETableSorter *ets);
-static void    	ets_model_row_changed  (ETableModel *etm, int row, ETableSorter *ets);
-static void    	ets_model_cell_changed (ETableModel *etm, int col, int row, ETableSorter *ets);
-static void    	ets_sort_info_changed  (ETableSortInfo *info, ETableSorter *ets);
-static void    	ets_clean              (ETableSorter *ets);
-static void    	ets_sort               (ETableSorter *ets);
-static void    	ets_backsort           (ETableSorter *ets);
-
-static gint    	ets_model_to_sorted           (ESorter *sorter, int row);
-static gint    	ets_sorted_to_model           (ESorter *sorter, int row);
-static void    	ets_get_model_to_sorted_array (ESorter *sorter, int **array, int *count);
-static void    	ets_get_sorted_to_model_array (ESorter *sorter, int **array, int *count);
-static gboolean ets_needs_sorting             (ESorter *ets);
-
-static void
-ets_destroy (GtkObject *object)
-{
-	ETableSorter *ets = E_TABLE_SORTER (object);
-
-	gtk_signal_disconnect (GTK_OBJECT (ets->source),
-			       ets->table_model_changed_id);
-	gtk_signal_disconnect (GTK_OBJECT (ets->source),
-			       ets->table_model_row_changed_id);
-	gtk_signal_disconnect (GTK_OBJECT (ets->source),
-			       ets->table_model_cell_changed_id);
-	gtk_signal_disconnect (GTK_OBJECT (ets->sort_info),
-			       ets->sort_info_changed_id);
-
-	ets->table_model_changed_id = 0;
-	ets->table_model_row_changed_id = 0;
-	ets->table_model_cell_changed_id = 0;
-	ets->sort_info_changed_id = 0;
-	
-	if (ets->sort_info)
-		gtk_object_unref(GTK_OBJECT(ets->sort_info));
-	if (ets->full_header)
-		gtk_object_unref(GTK_OBJECT(ets->full_header));
-	if (ets->source)
-		gtk_object_unref(GTK_OBJECT(ets->source));
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-static void
-ets_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ETableSorter *ets = E_TABLE_SORTER (object);
-
-	switch (arg_id) {
-	case ARG_SORT_INFO:
-		if (ets->sort_info) {
-			if (ets->sort_info_changed_id)
-				gtk_signal_disconnect(GTK_OBJECT(ets->sort_info), ets->sort_info_changed_id);
-			gtk_object_unref(GTK_OBJECT(ets->sort_info));
-		}
-
-		ets->sort_info = E_TABLE_SORT_INFO(GTK_VALUE_OBJECT (*arg));
-		gtk_object_ref(GTK_OBJECT(ets->sort_info));
-		ets->sort_info_changed_id = gtk_signal_connect (GTK_OBJECT (ets->sort_info), "sort_info_changed",
-								GTK_SIGNAL_FUNC (ets_sort_info_changed), ets);
-
-		ets_clean (ets);
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-ets_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ETableSorter *ets = E_TABLE_SORTER (object);
-	switch (arg_id) {
-	case ARG_SORT_INFO:
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(ets->sort_info);
-		break;
-	}
-}
-
-static void
-ets_class_init (ETableSorterClass *klass)
-{
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS(klass);
-	ESorterClass *sorter_class = E_SORTER_CLASS(klass);
-
-	parent_class                            = gtk_type_class (PARENT_TYPE);
-
-	object_class->destroy                   = ets_destroy;
-	object_class->set_arg                   = ets_set_arg;
-	object_class->get_arg                   = ets_get_arg;
-
-	sorter_class->model_to_sorted           = ets_model_to_sorted           ;
-	sorter_class->sorted_to_model           = ets_sorted_to_model           ;
-	sorter_class->get_model_to_sorted_array = ets_get_model_to_sorted_array ;
-	sorter_class->get_sorted_to_model_array = ets_get_sorted_to_model_array ;		
-	sorter_class->needs_sorting             = ets_needs_sorting             ;
-
-	gtk_object_add_arg_type ("ETableSorter::sort_info", GTK_TYPE_OBJECT, 
-				 GTK_ARG_READWRITE, ARG_SORT_INFO); 
-}
-
-static void
-ets_init (ETableSorter *ets)
-{
-	ets->full_header = NULL;
-	ets->sort_info = NULL;
-	ets->source = NULL;
-
-	ets->needs_sorting = -1;
-
-	ets->table_model_changed_id = 0;
-	ets->table_model_row_changed_id = 0;
-	ets->table_model_cell_changed_id = 0;
-	ets->sort_info_changed_id = 0;
-}
-
-E_MAKE_TYPE(e_table_sorter, "ETableSorter", ETableSorter, ets_class_init, ets_init, PARENT_TYPE);
-
-ETableSorter *
-e_table_sorter_new (ETableModel *source, ETableHeader *full_header, ETableSortInfo *sort_info)
-{
-	ETableSorter *ets = gtk_type_new (E_TABLE_SORTER_TYPE);
-	
-	ets->sort_info = sort_info;
-	gtk_object_ref(GTK_OBJECT(ets->sort_info));
-	ets->full_header = full_header;
-	gtk_object_ref(GTK_OBJECT(ets->full_header));
-	ets->source = source;
-	gtk_object_ref(GTK_OBJECT(ets->source));
-
-	ets->table_model_changed_id = gtk_signal_connect (GTK_OBJECT (source), "model_changed",
-							   GTK_SIGNAL_FUNC (ets_model_changed), ets);
-	ets->table_model_row_changed_id = gtk_signal_connect (GTK_OBJECT (source), "model_row_changed",
-							       GTK_SIGNAL_FUNC (ets_model_row_changed), ets);
-	ets->table_model_cell_changed_id = gtk_signal_connect (GTK_OBJECT (source), "model_cell_changed",
-								GTK_SIGNAL_FUNC (ets_model_cell_changed), ets);
-	ets->sort_info_changed_id = gtk_signal_connect (GTK_OBJECT (sort_info), "sort_info_changed",
-							 GTK_SIGNAL_FUNC (ets_sort_info_changed), ets);
-	
-	return ets;
-}
-
-static void
-ets_model_changed (ETableModel *etm, ETableSorter *ets)
-{
-	ets_clean(ets);
-}
-
-static void
-ets_model_row_changed (ETableModel *etm, int row, ETableSorter *ets)
-{
-	ets_clean(ets);
-}
-
-static void
-ets_model_cell_changed (ETableModel *etm, int col, int row, ETableSorter *ets)
-{
-	ets_clean(ets);
-}
-
-static void
-ets_sort_info_changed (ETableSortInfo *info, ETableSorter *ets)
-{
-	printf ("sort info changed\n");
-	ets_clean(ets);
-}
-
-static ETableSorter *ets_closure;
-static void **vals_closure;
-static int cols_closure;
-static int *ascending_closure;
-static GCompareFunc *compare_closure;
-
-/* FIXME: Make it not cache the second and later columns (as if anyone cares.) */
-
-static int
-qsort_callback(const void *data1, const void *data2)
-{
-	gint row1 = *(int *)data1;
-	gint row2 = *(int *)data2;
-	int j;
-	int sort_count = e_table_sort_info_sorting_get_count(ets_closure->sort_info) + e_table_sort_info_grouping_get_count(ets_closure->sort_info);
-	int comp_val = 0;
-	int ascending = 1;
-	for (j = 0; j < sort_count; j++) {
-		comp_val = (*(compare_closure[j]))(vals_closure[cols_closure * row1 + j], vals_closure[cols_closure * row2 + j]);
-		ascending = ascending_closure[j];
-		if (comp_val != 0)
-			break;
-	}
-	if (comp_val == 0) {
-		if (row1 < row2)
-			comp_val = -1;
-		if (row1 > row2)
-			comp_val = 1;
-	}
-	if (!ascending)
-		comp_val = -comp_val;
-	return comp_val;
-}
-
-static void
-ets_clean(ETableSorter *ets)
-{
-	g_free(ets->sorted);
-	ets->sorted = NULL;
-
-	g_free(ets->backsorted);
-	ets->backsorted = NULL;
-
-	ets->needs_sorting = -1;
-}
-
-
-static void
-ets_sort(ETableSorter *ets)
-{
-	int rows;
-	int i;
-	int j;
-	int cols;
-	int group_cols;
-
-	if (ets->sorted)
-		return;
-
-	rows = e_table_model_row_count(ets->source);
-	group_cols = e_table_sort_info_grouping_get_count(ets->sort_info);
-	cols = e_table_sort_info_sorting_get_count(ets->sort_info) + group_cols;
-
-	ets->sorted = g_new(int, rows);
-	for (i = 0; i < rows; i++)
-		ets->sorted[i] = i;
-
-	cols_closure = cols;
-	ets_closure = ets;
-
-	vals_closure = g_new(void *, rows * cols);
-	ascending_closure = g_new(int, cols);
-	compare_closure = g_new(GCompareFunc, cols);
-
-	for (j = 0; j < cols; j++) {
-		ETableSortColumn column;
-		ETableCol *col;
-
-		if (j < group_cols)
-			column = e_table_sort_info_grouping_get_nth(ets->sort_info, j);
-		else
-			column = e_table_sort_info_sorting_get_nth(ets->sort_info, j - group_cols);
-
-		col = e_table_header_get_column_by_col_idx(ets->full_header, column.column);
-		if (col == NULL)
-			col = e_table_header_get_column (ets->full_header, e_table_header_count (ets->full_header) - 1);
-
-		for (i = 0; i < rows; i++) {
-			vals_closure[i * cols + j] = e_table_model_value_at (ets->source, col->col_idx, i);
-		}
-
-		compare_closure[j] = col->compare;
-		ascending_closure[j] = column.ascending;
-	}
-
-		qsort(ets->sorted, rows, sizeof(int), qsort_callback);
-
-	g_free(vals_closure);
-	g_free(ascending_closure);
-	g_free(compare_closure);
-}
-
-static void
-ets_backsort(ETableSorter *ets)
-{
-	int i, rows;
-
-	if (ets->backsorted)
-		return;
-
-	ets_sort(ets);
-
-	rows = e_table_model_row_count(ets->source);
-	ets->backsorted = g_new0(int, rows);
-
-	for (i = 0; i < rows; i++) {
-		ets->backsorted[ets->sorted[i]] = i;
-	}
-}
-
-
-static gint
-ets_model_to_sorted (ESorter *es, int row)
-{
-	ETableSorter *ets = E_TABLE_SORTER(es);
-	int rows = e_table_model_row_count(ets->source);
-
-	g_return_val_if_fail(row >= 0, -1);
-	g_return_val_if_fail(row < rows, -1);
-
-	if (ets_needs_sorting(es))
-		ets_backsort(ets);
-
-	if (ets->backsorted)
-		return ets->backsorted[row];
-	else
-		return row;
-}
-
-static gint
-ets_sorted_to_model (ESorter *es, int row)
-{
-	ETableSorter *ets = E_TABLE_SORTER(es);
-	int rows = e_table_model_row_count(ets->source);
-
-	g_return_val_if_fail(row >= 0, -1);
-	g_return_val_if_fail(row < rows, -1);
-
-	if (ets_needs_sorting(es))
-		ets_sort(ets);
-
-	if (ets->sorted)
-		return ets->sorted[row];
-	else
-		return row;
-}
-
-static void
-ets_get_model_to_sorted_array (ESorter *es, int **array, int *count)
-{
-	ETableSorter *ets = E_TABLE_SORTER(es);
-	if (array || count) {
-		ets_backsort(ets);
-
-		if (array)
-			*array = ets->backsorted;
-		if (count)
-			*count = e_table_model_row_count(ets->source);
-	}
-}
-
-static void
-ets_get_sorted_to_model_array (ESorter *es, int **array, int *count)
-{
-	ETableSorter *ets = E_TABLE_SORTER(es);
-	if (array || count) {
-		ets_sort(ets);
-
-		if (array)
-			*array = ets->sorted;
-		if (count)
-			*count = e_table_model_row_count(ets->source);
-	}
-}
-
-
-static gboolean
-ets_needs_sorting(ESorter *es)
-{
-	ETableSorter *ets = E_TABLE_SORTER(es);
-	if (ets->needs_sorting < 0) {
-		if (e_table_sort_info_sorting_get_count(ets->sort_info) + e_table_sort_info_grouping_get_count(ets->sort_info))
-			ets->needs_sorting = 1;
-		else
-			ets->needs_sorting = 0;
-	}
-	return ets->needs_sorting;
-}
diff --git a/widgets/table/e-table-sorter.h b/widgets/table/e-table-sorter.h
deleted file mode 100644
index a6c999f744..0000000000
--- a/widgets/table/e-table-sorter.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_SORTER_H_
-#define _E_TABLE_SORTER_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/util/e-sorter.h>
-#include <gal/e-table/e-table-model.h>
-#include <gal/e-table/e-table-subset-variable.h>
-#include <gal/e-table/e-table-sort-info.h>
-#include <gal/e-table/e-table-header.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TABLE_SORTER_TYPE        (e_table_sorter_get_type ())
-#define E_TABLE_SORTER(o)          (GTK_CHECK_CAST ((o), E_TABLE_SORTER_TYPE, ETableSorter))
-#define E_TABLE_SORTER_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_SORTER_TYPE, ETableSorterClass))
-#define E_IS_TABLE_SORTER(o)       (GTK_CHECK_TYPE ((o), E_TABLE_SORTER_TYPE))
-#define E_IS_TABLE_SORTER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_SORTER_TYPE))
-
-typedef struct {
-	ESorter base;
-
-	ETableModel    *source;
-	ETableHeader   *full_header;
-	ETableSortInfo *sort_info;
-
-	/* If needs_sorting is 0, then model_to_sorted and sorted_to_model are no-ops. */
-	int             needs_sorting;
-
-	int            *sorted;
-	int            *backsorted;
-
-	int             table_model_changed_id;
-	int             table_model_row_changed_id;
-	int             table_model_cell_changed_id;
-	int             sort_info_changed_id;
-} ETableSorter;
-
-typedef struct {
-	ESorterClass parent_class;
-} ETableSorterClass;
-
-GtkType       e_table_sorter_get_type                   (void);
-ETableSorter *e_table_sorter_new                        (ETableModel     *etm,
-							 ETableHeader    *full_header,
-							 ETableSortInfo  *sort_info);
-END_GNOME_DECLS
-
-#endif /* _E_TABLE_SORTER_H_ */
diff --git a/widgets/table/e-table-sorting-utils.c b/widgets/table/e-table-sorting-utils.c
deleted file mode 100644
index 4b2d581206..0000000000
--- a/widgets/table/e-table-sorting-utils.c
+++ /dev/null
@@ -1,328 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include <config.h>
-#include <string.h>
-#include <e-table-sorting-utils.h>
-#include <gal/util/e-util.h>
-
-#define d(x)
-
-/* This takes source rows. */
-static int
-etsu_compare(ETableModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, int row1, int row2)
-{
-	int j;
-	int sort_count = e_table_sort_info_sorting_get_count(sort_info);
-	int comp_val = 0;
-	int ascending = 1;
-
-	for (j = 0; j < sort_count; j++) {
-		ETableSortColumn column = e_table_sort_info_sorting_get_nth(sort_info, j);
-		ETableCol *col;
-		col = e_table_header_get_column_by_col_idx(full_header, column.column);
-		if (col == NULL)
-			col = e_table_header_get_column (full_header, e_table_header_count (full_header) - 1);
-		comp_val = (*col->compare)(e_table_model_value_at (source, col->col_idx, row1),
-					   e_table_model_value_at (source, col->col_idx, row2));
-		ascending = column.ascending;
-		if (comp_val != 0)
-			break;
-	}
-	if (comp_val == 0) {
-		if (row1 < row2)
-			comp_val = -1;
-		if (row1 > row2)
-			comp_val = 1;
-	}
-	if (!ascending)
-		comp_val = -comp_val;
-	return comp_val;
-}
-
-typedef struct {
-	int cols;
-	void **vals;
-	int *ascending;
-	GCompareFunc *compare;
-} ETableSortClosure;
-
-typedef struct {
-	ETreeModel *tree;
-	ETableSortInfo *sort_info;
-	ETableHeader *full_header;
-} ETreeSortClosure;
-
-/* FIXME: Make it not cache the second and later columns (as if anyone cares.) */
-
-static int
-e_sort_callback(const void *data1, const void *data2, gpointer user_data)
-{
-	gint row1 = *(int *)data1;
-	gint row2 = *(int *)data2;
-	ETableSortClosure *closure = user_data;
-	int j;
-	int sort_count = closure->cols;
-	int comp_val = 0;
-	int ascending = 1;
-	for (j = 0; j < sort_count; j++) {
-		comp_val = (*(closure->compare[j]))(closure->vals[closure->cols * row1 + j], closure->vals[closure->cols * row2 + j]);
-		ascending = closure->ascending[j];
-		if (comp_val != 0)
-			break;
-	}
-	if (comp_val == 0) {
-		if (row1 < row2)
-			comp_val = -1;
-		if (row1 > row2)
-			comp_val = 1;
-	}
-	if (!ascending)
-		comp_val = -comp_val;
-	return comp_val;
-}
-
-void
-e_table_sorting_utils_sort(ETableModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, int *map_table, int rows)
-{
-	int total_rows;
-	int i;
-	int j;
-	int cols;
-	ETableSortClosure closure;
-
-	g_return_if_fail(source != NULL);
-	g_return_if_fail(E_IS_TABLE_MODEL(source));
-	g_return_if_fail(sort_info != NULL);
-	g_return_if_fail(E_IS_TABLE_SORT_INFO(sort_info));
-	g_return_if_fail(full_header != NULL);
-	g_return_if_fail(E_IS_TABLE_HEADER(full_header));
-
-	total_rows = e_table_model_row_count(source);
-	cols = e_table_sort_info_sorting_get_count(sort_info);
-	closure.cols = cols;
-
-	closure.vals = g_new(void *, total_rows * cols);
-	closure.ascending = g_new(int, cols);
-	closure.compare = g_new(GCompareFunc, cols);
-
-	for (j = 0; j < cols; j++) {
-		ETableSortColumn column = e_table_sort_info_sorting_get_nth(sort_info, j);
-		ETableCol *col;
-		col = e_table_header_get_column_by_col_idx(full_header, column.column);
-		if (col == NULL)
-			col = e_table_header_get_column (full_header, e_table_header_count (full_header) - 1);
-		for (i = 0; i < rows; i++) {
-			closure.vals[map_table[i] * cols + j] = e_table_model_value_at (source, col->col_idx, map_table[i]);
-		}
-		closure.compare[j] = col->compare;
-		closure.ascending[j] = column.ascending;
-	}
-
-	e_sort(map_table, rows, sizeof(int), e_sort_callback, &closure);
-
-	g_free(closure.vals);
-	g_free(closure.ascending);
-	g_free(closure.compare);
-}
-
-gboolean
-e_table_sorting_utils_affects_sort  (ETableSortInfo *sort_info,
-				     ETableHeader   *full_header,
-				     int             col)
-{
-	int j;
-	int cols;
-
-	g_return_val_if_fail(sort_info != NULL, TRUE);
-	g_return_val_if_fail(E_IS_TABLE_SORT_INFO(sort_info), TRUE);
-	g_return_val_if_fail(full_header != NULL, TRUE);
-	g_return_val_if_fail(E_IS_TABLE_HEADER(full_header), TRUE);
-
-	cols = e_table_sort_info_sorting_get_count(sort_info);
-
-	for (j = 0; j < cols; j++) {
-		ETableSortColumn column = e_table_sort_info_sorting_get_nth(sort_info, j);
-		ETableCol *tablecol;
-		tablecol = e_table_header_get_column_by_col_idx(full_header, column.column);
-		if (tablecol == NULL)
-			tablecol = e_table_header_get_column (full_header, e_table_header_count (full_header) - 1);
-		if (col == tablecol->col_idx)
-			return TRUE;
-	}
-	return FALSE;
-}
-
-
-/* FIXME: This could be done in time log n instead of time n with a binary search. */
-int
-e_table_sorting_utils_insert(ETableModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, int *map_table, int rows, int row)
-{
-	int i;
-
-	i = 0;
-	/* handle insertions when we have a 'sort group' */
-	while (i < rows && etsu_compare(source, sort_info, full_header, map_table[i], row) < 0)
-		i++;
-
-	return i;
-}
-
-/* FIXME: This could be done in time log n instead of time n with a binary search. */
-int
-e_table_sorting_utils_check_position (ETableModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, int *map_table, int rows, int view_row)
-{
-	int i;
-	int row;
-
-	i = view_row;
-	row = map_table[i];
-
-	i = view_row;
-	if (i < rows - 1 && etsu_compare(source, sort_info, full_header, map_table[i + 1], row) < 0) {
-		i ++;
-		while (i < rows - 1 && etsu_compare(source, sort_info, full_header, map_table[i], row) < 0)
-			i ++;
-	} else if (i > 0 && etsu_compare(source, sort_info, full_header, map_table[i - 1], row) > 0) {
-		i --;
-		while (i > 0 && etsu_compare(source, sort_info, full_header, map_table[i], row) > 0)
-			i --;
-	}
-	return i;
-}
-
-
-
-
-/* This takes source rows. */
-static int
-etsu_tree_compare(ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, ETreePath path1, ETreePath path2)
-{
-	int j;
-	int sort_count = e_table_sort_info_sorting_get_count(sort_info);
-	int comp_val = 0;
-	int ascending = 1;
-
-	for (j = 0; j < sort_count; j++) {
-		ETableSortColumn column = e_table_sort_info_sorting_get_nth(sort_info, j);
-		ETableCol *col;
-		col = e_table_header_get_column_by_col_idx(full_header, column.column);
-		if (col == NULL)
-			col = e_table_header_get_column (full_header, e_table_header_count (full_header) - 1);
-		comp_val = (*col->compare)(e_tree_model_value_at (source, path1, col->col_idx),
-					   e_tree_model_value_at (source, path2, col->col_idx));
-		ascending = column.ascending;
-		if (comp_val != 0)
-			break;
-	}
-	if (!ascending)
-		comp_val = -comp_val;
-	return comp_val;
-}
-
-static int
-e_sort_tree_callback(const void *data1, const void *data2, gpointer user_data)
-{
-	ETreePath *path1 = *(ETreePath *)data1;
-	ETreePath *path2 = *(ETreePath *)data2;
-	ETreeSortClosure *closure = user_data;
-
-	return etsu_tree_compare(closure->tree, closure->sort_info, closure->full_header, path1, path2);
-}
-
-void
-e_table_sorting_utils_tree_sort(ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, ETreePath *map_table, int count)
-{
-	ETableSortClosure closure;
-	int cols;
-	int i, j;
-	int *map;
-	ETreePath *map_copy;
-	g_return_if_fail(source != NULL);
-	g_return_if_fail(E_IS_TREE_MODEL(source));
-	g_return_if_fail(sort_info != NULL);
-	g_return_if_fail(E_IS_TABLE_SORT_INFO(sort_info));
-	g_return_if_fail(full_header != NULL);
-	g_return_if_fail(E_IS_TABLE_HEADER(full_header));
-
-	cols = e_table_sort_info_sorting_get_count(sort_info);
-	closure.cols = cols;
-
-	closure.vals = g_new(void *, count * cols);
-	closure.ascending = g_new(int, cols);
-	closure.compare = g_new(GCompareFunc, cols);
-
-	for (j = 0; j < cols; j++) {
-		ETableSortColumn column = e_table_sort_info_sorting_get_nth(sort_info, j);
-		ETableCol *col;
-
-		col = e_table_header_get_column_by_col_idx(full_header, column.column);
-		if (col == NULL)
-			col = e_table_header_get_column (full_header, e_table_header_count (full_header) - 1);
-
-		for (i = 0; i < count; i++) {
-			closure.vals[i * cols + j] = e_tree_model_value_at (source, map_table[i], col->col_idx);
-		}
-		closure.ascending[j] = column.ascending;
-		closure.compare[j] = col->compare;
-	}
-
-	map = g_new(int, count);
-	for (i = 0; i < count; i++) {
-		map[i] = i;
-	}
-
-	e_sort(map, count, sizeof(int), e_sort_callback, &closure);
-
-	map_copy = g_new(ETreePath, count);
-	for (i = 0; i < count; i++) {
-		map_copy[i] = map_table[i];
-	}
-	for (i = 0; i < count; i++) {
-		map_table[i] = map_copy[map[i]];
-	}
-
-	g_free(map);
-	g_free(map_copy);
-
-	g_free(closure.vals);
-	g_free(closure.ascending);
-	g_free(closure.compare);
-}
-
-/* FIXME: This could be done in time log n instead of time n with a binary search. */
-int
-e_table_sorting_utils_tree_check_position (ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, ETreePath *map_table, int count, int old_index)
-{
-	int i;
-	ETreePath path;
-
-	i = old_index;
-	path = map_table[i];
-
-	if (i < count - 1 && etsu_tree_compare(source, sort_info, full_header, map_table[i + 1], path) < 0) {
-		i ++;
-		while (i < count - 1 && etsu_tree_compare(source, sort_info, full_header, map_table[i], path) < 0)
-			i ++;
-	} else if (i > 0 && etsu_tree_compare(source, sort_info, full_header, map_table[i - 1], path) > 0) {
-		i --;
-		while (i > 0 && etsu_tree_compare(source, sort_info, full_header, map_table[i], path) > 0)
-			i --;
-	}
-	return i;
-}
-
-/* FIXME: This does not pay attention to making sure that it's a stable insert.  This needs to be fixed. */
-int
-e_table_sorting_utils_tree_insert(ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, ETreePath *map_table, int count, ETreePath path)
-{
-	int start;
-	int end;
-	ETreeSortClosure closure;
-
-	closure.tree = source;
-	closure.sort_info = sort_info;
-	closure.full_header = full_header;
-
-	e_bsearch(&path, map_table, count, sizeof(ETreePath), e_sort_tree_callback, &closure, &start, &end);
-	return end;
-}
diff --git a/widgets/table/e-table-sorting-utils.h b/widgets/table/e-table-sorting-utils.h
deleted file mode 100644
index 559bd8e82c..0000000000
--- a/widgets/table/e-table-sorting-utils.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_SORTING_UTILS_H_
-#define _E_TABLE_SORTING_UTILS_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include <gal/e-table/e-table-model.h>
-#include <gal/e-table/e-tree-model.h>
-#include <gal/e-table/e-table-sort-info.h>
-#include <gal/e-table/e-table-header.h>
-gboolean  e_table_sorting_utils_affects_sort         (ETableSortInfo *sort_info,
-						      ETableHeader   *full_header,
-						      int             col);
-
-
-
-void      e_table_sorting_utils_sort                 (ETableModel    *source,
-						      ETableSortInfo *sort_info,
-						      ETableHeader   *full_header,
-						      int            *map_table,
-						      int             rows);
-int       e_table_sorting_utils_insert               (ETableModel    *source,
-						      ETableSortInfo *sort_info,
-						      ETableHeader   *full_header,
-						      int            *map_table,
-						      int             rows,
-						      int             row);
-int       e_table_sorting_utils_check_position       (ETableModel    *source,
-						      ETableSortInfo *sort_info,
-						      ETableHeader   *full_header,
-						      int            *map_table,
-						      int             rows,
-						      int             view_row);
-
-
-
-void      e_table_sorting_utils_tree_sort            (ETreeModel     *source,
-						      ETableSortInfo *sort_info,
-						      ETableHeader   *full_header,
-						      ETreePath      *map_table,
-						      int             count);
-int       e_table_sorting_utils_tree_check_position  (ETreeModel     *source,
-						      ETableSortInfo *sort_info,
-						      ETableHeader   *full_header,
-						      ETreePath      *map_table,
-						      int             count,
-						      int             old_index);
-int       e_table_sorting_utils_tree_insert          (ETreeModel     *source,
-						      ETableSortInfo *sort_info,
-						      ETableHeader   *full_header,
-						      ETreePath      *map_table,
-						      int             count,
-						      ETreePath       path);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TABLE_SORTING_UTILS_H_ */
diff --git a/widgets/table/e-table-specification.c b/widgets/table/e-table-specification.c
deleted file mode 100644
index 487f3113ad..0000000000
--- a/widgets/table/e-table-specification.c
+++ /dev/null
@@ -1,378 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-specification.c: Implements a savable description of the inital state of a table.
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *   Miguel de Icaza (miguel@ximian.com)
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#include <config.h>
-
-#include "e-table-specification.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <gtk/gtksignal.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-#include "gal/util/e-util.h"
-#include "gal/util/e-xml-utils.h"
-
-#define PARENT_TYPE (gtk_object_get_type ())
-
-static GtkObjectClass *etsp_parent_class;
-
-static void
-etsp_destroy (GtkObject *object)
-{
-	ETableSpecification *etsp = E_TABLE_SPECIFICATION (object);
-	int i;
-
-	if (etsp->columns) {
-		for (i = 0; etsp->columns[i]; i++) {
-			gtk_object_unref (GTK_OBJECT (etsp->columns[i]));
-		}
-		g_free (etsp->columns);
-	}
-
-	if (etsp->state)
-		gtk_object_unref (GTK_OBJECT (etsp->state));
-	g_free (etsp->click_to_add_message);
-
-	etsp->columns              = NULL;
-	etsp->state                = NULL;
-	etsp->click_to_add_message = NULL;
-
-	GTK_OBJECT_CLASS (etsp_parent_class)->destroy (object);
-}
-
-static void
-etsp_class_init (GtkObjectClass *klass)
-{
-	etsp_parent_class = gtk_type_class (PARENT_TYPE);
-	
-	klass->destroy = etsp_destroy;
-}
-
-static void
-etsp_init (ETableSpecification *etsp)
-{
-	etsp->columns               = NULL;
-	etsp->state                 = NULL;
-
-	etsp->alternating_row_colors = TRUE;
-	etsp->no_headers             = FALSE;
-	etsp->click_to_add           = FALSE;
-	etsp->horizontal_draw_grid   = FALSE;
-	etsp->vertical_draw_grid     = FALSE;
-	etsp->draw_focus             = TRUE;
-	etsp->horizontal_scrolling   = FALSE;
-
-	etsp->cursor_mode           = E_CURSOR_SIMPLE;
-	etsp->selection_mode        = GTK_SELECTION_MULTIPLE;
-
-	etsp->click_to_add_message  = NULL;
-}
-
-E_MAKE_TYPE (e_table_specification, "ETableSpecification", ETableSpecification, etsp_class_init, etsp_init, PARENT_TYPE);
-
-/**
- * e_table_specification_new:
- *
- * Creates a new %ETableSpecification object.   This object is used to hold the
- * information about the rendering information for ETable.
- * 
- * Returns: a newly created %ETableSpecification object.
- */
-ETableSpecification *
-e_table_specification_new (void)
-{
-	ETableSpecification *etsp = gtk_type_new (E_TABLE_SPECIFICATION_TYPE);
-
-	return (ETableSpecification *) etsp;
-}
-
-/**
- * e_table_specification_load_from_file:
- * @specification: An ETableSpecification that you want to modify
- * @filename: a filename that contains an ETableSpecification
- *
- * This routine modifies @specification to reflect the state described
- * by the file @filename.  
- *
- * Returns: TRUE on success, FALSE on failure.
- */
-gboolean
-e_table_specification_load_from_file (ETableSpecification *specification,
-				      const char          *filename)
-{
-	xmlDoc *doc;
-	doc = xmlParseFile (filename);
-	if (doc) {
-		xmlNode *node = xmlDocGetRootElement (doc);
-		e_table_specification_load_from_node (specification, node);
-		xmlFreeDoc (doc);
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/**
- * e_table_specification_load_from_string:
- * @specification: An ETableSpecification that you want to modify
- * @xml: a stringified representation of an ETableSpecification description.
- *
- * This routine modifies @specification to reflect the state described
- * by @xml.  @xml is typically returned by e_table_specification_save_to_string
- * or it can be embedded in your source code.
- *
- * Returns: TRUE on success, FALSE on failure.
- */
-gboolean
-e_table_specification_load_from_string (ETableSpecification *specification,
-					const char          *xml)
-{
-	xmlDoc *doc;
-	doc = xmlParseMemory ( (char *) xml, strlen (xml));
-	if (doc) {
-		xmlNode *node = xmlDocGetRootElement (doc);
-		e_table_specification_load_from_node (specification, node);
-		xmlFreeDoc (doc);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-/**
- * e_table_specification_load_from_node:
- * @specification: An ETableSpecification that you want to modify
- * @node: an xmlNode with an XML ETableSpecification description.
- *
- * This routine modifies @specification to reflect the state described
- * by @node.
- */
-void
-e_table_specification_load_from_node (ETableSpecification *specification,
-				      const xmlNode       *node)
-{
-	char *temp;
-	xmlNode *children;
-	GList *list = NULL, *list2;
-	int i;
-
-	specification->no_headers = e_xml_get_bool_prop_by_name (node, "no-headers");
-	specification->click_to_add = e_xml_get_bool_prop_by_name (node, "click-to-add");
-	specification->alternating_row_colors = e_xml_get_bool_prop_by_name_with_default (node, "alternating-row-colors", TRUE);
-	specification->horizontal_draw_grid = e_xml_get_bool_prop_by_name (node, "horizontal-draw-grid");
-	specification->vertical_draw_grid = e_xml_get_bool_prop_by_name (node, "vertical-draw-grid");
-	if (e_xml_get_bool_prop_by_name_with_default(node, "draw-grid", TRUE) ==
-	    e_xml_get_bool_prop_by_name_with_default(node, "draw-grid", FALSE)) {
-		specification->horizontal_draw_grid =
-			specification->vertical_draw_grid = e_xml_get_bool_prop_by_name (node, "draw-grid");
-	}
-	specification->draw_focus = e_xml_get_bool_prop_by_name_with_default (node, "draw-focus", TRUE);
-	specification->horizontal_scrolling = e_xml_get_bool_prop_by_name_with_default (node, "horizontal-scrolling", FALSE);
-
-	specification->selection_mode = GTK_SELECTION_MULTIPLE;
-	temp = e_xml_get_string_prop_by_name (node, "selection-mode");
-	if (temp && !g_strcasecmp (temp, "single")) {
-		specification->selection_mode = GTK_SELECTION_SINGLE;
-	} else if (temp && !g_strcasecmp (temp, "browse")) {
-		specification->selection_mode = GTK_SELECTION_BROWSE;
-	} else if (temp && !g_strcasecmp (temp, "extended")) {
-		specification->selection_mode = GTK_SELECTION_EXTENDED;
-	}
-	g_free (temp);
-
-	specification->cursor_mode = E_CURSOR_SIMPLE;
-	temp = e_xml_get_string_prop_by_name (node, "cursor-mode");
-	if (temp && !g_strcasecmp (temp, "line")) {
-		specification->cursor_mode = E_CURSOR_LINE;
-	} else 	if (temp && !g_strcasecmp (temp, "spreadsheet")) {
-		specification->cursor_mode = E_CURSOR_SPREADSHEET;
-	}
-	g_free (temp);
-	g_free (specification->click_to_add_message);
-
-	specification->click_to_add_message =
-		e_xml_get_string_prop_by_name (
-			node, "_click-to-add-message");
-
-	if (specification->state)
-		gtk_object_unref (GTK_OBJECT (specification->state));
-	specification->state = NULL;
-	if (specification->columns) {
-		for (i = 0; specification->columns[i]; i++) {
-			gtk_object_unref (GTK_OBJECT (specification->columns[i]));
-		}
-		g_free (specification->columns);
-	}
-	specification->columns = NULL;
-
-	for (children = node->xmlChildrenNode; children; children = children->next) {
-		if (!strcmp (children->name, "ETableColumn")) {
-			ETableColumnSpecification *col_spec = e_table_column_specification_new ();
-
-			e_table_column_specification_load_from_node (col_spec, children);
-			list = g_list_append (list, col_spec);
-		} else if (specification->state == NULL && !strcmp (children->name, "ETableState")) {
-			specification->state = e_table_state_new ();
-			e_table_state_load_from_node (specification->state, children);
-		}
-	}
-
-	specification->columns = g_new (ETableColumnSpecification *, g_list_length (list) + 1);
-	for (list2 = list, i = 0; list2; list2 = g_list_next (list2), i++) {
-		specification->columns[i] = list2->data;
-	}
-	specification->columns[i] = NULL;
-	g_list_free (list);
-}
-
-/**
- * e_table_specification_save_to_file:
- * @specification: An %ETableSpecification that you want to save
- * @filename: a file name to store the specification.
- *
- * This routine stores the @specification into @filename.  
- *
- * Returns: the number of bytes written or -1 on error.
- */
-int
-e_table_specification_save_to_file (ETableSpecification *specification,
-				    const char          *filename)
-{
-	xmlDoc *doc;
-
-	g_return_val_if_fail (specification != NULL, -1);
-	g_return_val_if_fail (filename != NULL, -1);
-	g_return_val_if_fail (E_IS_TABLE_SPECIFICATION (specification), -1);
-	
-	doc = xmlNewDoc ("1.0");
-	xmlDocSetRootElement (doc, e_table_specification_save_to_node (specification, doc));
-	return xmlSaveFile (filename, doc);
-}
-
-/**
- * e_table_specification_save_to_string:
- * @specification: An %ETableSpecification that you want to stringify
- *
- * Saves the state of @specification to a string.
- *
- * Returns: an g_alloc() allocated string containing the stringified 
- * representation of @specification.  This stringified representation
- * uses XML as a convenience.
- */
-char *
-e_table_specification_save_to_string (ETableSpecification *specification)
-{
-	char *ret_val;
-	xmlChar *string;
-	int length;
-	xmlDoc *doc;
-
-	g_return_val_if_fail (specification != NULL, NULL);
-	g_return_val_if_fail (E_IS_TABLE_SPECIFICATION (specification), NULL);
-	
-	doc = xmlNewDoc ("1.0");
-	xmlDocSetRootElement (doc, e_table_specification_save_to_node (specification, doc));
-	xmlDocDumpMemory (doc, &string, &length);
-
-	ret_val = g_strdup (string);
-	xmlFree (string);
-	return ret_val;
-}
-
-/**
- * e_table_specification_save_to_node:
- * @specification: An ETableSpecification that you want to store.
- * @doc: Node where the specification is saved
- *
- * This routine saves the %ETableSpecification state in the object @specification
- * into the xmlDoc represented by @doc.  
- *
- * Returns: The node that has been attached to @doc with the contents
- * of the ETableSpecification.
- */
-xmlNode *
-e_table_specification_save_to_node (ETableSpecification *specification,
-				    xmlDoc              *doc)
-{
-	xmlNode *node;
-	char *s;
-
-	g_return_val_if_fail (doc != NULL, NULL);
-	g_return_val_if_fail (specification != NULL, NULL);
-	g_return_val_if_fail (E_IS_TABLE_SPECIFICATION (specification), NULL);
-
-	node = xmlNewNode (NULL, "ETableSpecification");
-	e_xml_set_bool_prop_by_name (node, "no-headers", specification->no_headers);
-	e_xml_set_bool_prop_by_name (node, "click-to-add", specification->click_to_add);
-	e_xml_set_bool_prop_by_name (node, "alternating-row-colors", specification->alternating_row_colors);
-	e_xml_set_bool_prop_by_name (node, "horizontal-draw-grid", specification->horizontal_draw_grid);
-	e_xml_set_bool_prop_by_name (node, "vertical-draw-grid", specification->vertical_draw_grid);
-	e_xml_set_bool_prop_by_name (node, "draw-focus", specification->draw_focus);
-	e_xml_set_bool_prop_by_name (node, "horizontal-scrolling", specification->horizontal_scrolling);
-
-	switch (specification->selection_mode){
-	case GTK_SELECTION_SINGLE:
-		s = "single";
-		break;
-	case GTK_SELECTION_BROWSE:
-		s = "browse";
-		break;
-	default:
-	case GTK_SELECTION_EXTENDED:
-		s = "extended";
-	}
-	xmlSetProp (node, "selection-mode", s);
-	if (specification->cursor_mode == E_CURSOR_LINE)
-		s = "line";
-	else
-		s = "cell";
-	xmlSetProp (node, "cursor-mode", s);
-
-	xmlSetProp (node, "_click-to-add-message", specification->click_to_add_message);
-
-	if (specification->columns){
-		int i;
-		
-		for (i = 0; specification->columns [i]; i++)
-			e_table_column_specification_save_to_node (
-				specification->columns [i],
-				node);
-	}
-
-	if (specification->state)
-		e_table_state_save_to_node (specification->state, node);
-
-	return node;
-}
-
-/**
- * e_table_specification_duplicate:
- * @spec: specification to duplicate
- *
- * This creates a copy of the %ETableSpecification @spec
- *
- * Returns: The duplicated %ETableSpecification.
- */
-ETableSpecification *
-e_table_specification_duplicate (ETableSpecification *spec)
-{
-	ETableSpecification *new_spec;
-	char *spec_str;
-
-	g_return_val_if_fail (spec != NULL, NULL);
-	g_return_val_if_fail (E_IS_TABLE_SPECIFICATION (spec), NULL);
-	
-	new_spec = e_table_specification_new ();
-	spec_str = e_table_specification_save_to_string (spec);
-	e_table_specification_load_from_string (new_spec, spec_str);
-	g_free (spec_str);
-	
-	return new_spec;
-}
diff --git a/widgets/table/e-table-specification.h b/widgets/table/e-table-specification.h
deleted file mode 100644
index b2941f38d3..0000000000
--- a/widgets/table/e-table-specification.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_SPECIFICATION_H_
-#define _E_TABLE_SPECIFICATION_H_
-
-#include <gtk/gtkobject.h>
-#include <gnome-xml/tree.h>
-#include <gal/widgets/e-selection-model.h>
-#include <gal/e-table/e-table-state.h>
-#include <gal/e-table/e-table-column-specification.h>
-#include <gal/e-table/e-table-defines.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_TABLE_SPECIFICATION_TYPE        (e_table_specification_get_type ())
-#define E_TABLE_SPECIFICATION(o)          (GTK_CHECK_CAST ((o), E_TABLE_SPECIFICATION_TYPE, ETableSpecification))
-#define E_TABLE_SPECIFICATION_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_SPECIFICATION_TYPE, ETableSpecificationClass))
-#define E_IS_TABLE_SPECIFICATION(o)       (GTK_CHECK_TYPE ((o), E_TABLE_SPECIFICATION_TYPE))
-#define E_IS_TABLE_SPECIFICATION_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_SPECIFICATION_TYPE))
-
-typedef struct {
-	GtkObject base;
-
-	ETableColumnSpecification **columns;
-	ETableState *state;
-
-	guint alternating_row_colors : 1;
-	guint no_headers : 1;
-	guint click_to_add : 1;
-	guint horizontal_draw_grid : 1;
-	guint vertical_draw_grid : 1;
-	guint draw_focus : 1;
-	guint horizontal_scrolling : 1;
-	GtkSelectionMode selection_mode;
-	ECursorMode cursor_mode;
-
-	char *click_to_add_message;
-} ETableSpecification;
-
-typedef struct {
-	GtkObjectClass parent_class;
-} ETableSpecificationClass;
-
-GtkType              e_table_specification_get_type          (void);
-ETableSpecification *e_table_specification_new               (void);
-
-gboolean             e_table_specification_load_from_file    (ETableSpecification *specification,
-							      const char          *filename);
-gboolean             e_table_specification_load_from_string  (ETableSpecification *specification,
-							      const char          *xml);
-void                 e_table_specification_load_from_node    (ETableSpecification *specification,
-							      const xmlNode       *node);
-
-int                  e_table_specification_save_to_file      (ETableSpecification *specification,
-							      const char          *filename);
-char                *e_table_specification_save_to_string    (ETableSpecification *specification);
-xmlNode             *e_table_specification_save_to_node      (ETableSpecification *specification,
-							      xmlDoc              *doc);
-ETableSpecification *e_table_specification_duplicate         (ETableSpecification *spec);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TABLE_SPECIFICATION_H_ */
diff --git a/widgets/table/e-table-state.c b/widgets/table/e-table-state.c
deleted file mode 100644
index 4c6467ce8e..0000000000
--- a/widgets/table/e-table-state.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-state.c: Savable state of a table.
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *   Miguel de Icaza (miguel@ximian.com)
- *
- * (C) 2000 Ximian, Inc.
- */
-#include <config.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkobject.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-#include "gal/util/e-util.h"
-#include "gal/util/e-xml-utils.h"
-#include "e-table-state.h"
-
-
-#define PARENT_TYPE (gtk_object_get_type())
-
-#define STATE_VERSION 0.1
-
-static GtkObjectClass *etst_parent_class;
-
-static void
-etst_destroy (GtkObject *object)
-{
-	ETableState *etst = E_TABLE_STATE (object);
-
-	gtk_object_unref (GTK_OBJECT (etst->sort_info));
-	if (etst->columns) {
-		g_free (etst->columns);
-		etst->columns = NULL;
-	}
-
-	if (etst->expansions) {
-		g_free (etst->expansions);
-		etst->expansions = NULL;
-	}
-	
-	GTK_OBJECT_CLASS (etst_parent_class)->destroy (object);
-}
-
-static void
-etst_class_init (GtkObjectClass *klass)
-{
-	etst_parent_class = gtk_type_class (PARENT_TYPE);
-	
-	klass->destroy = etst_destroy;
-}
-
-static void
-etst_init (ETableState *state)
-{
-	GTK_OBJECT_UNSET_FLAGS (GTK_OBJECT (state), GTK_FLOATING);
-
-	state->columns = NULL;
-	state->expansions = NULL;
-	state->sort_info = e_table_sort_info_new();
-}
-
-E_MAKE_TYPE(e_table_state, "ETableState", ETableState, etst_class_init, etst_init, PARENT_TYPE);
-
-ETableState *
-e_table_state_new (void)
-{
-	ETableState *etst = gtk_type_new (E_TABLE_STATE_TYPE);
-
-	return (ETableState *) etst;
-}
-
-gboolean
-e_table_state_load_from_file    (ETableState *state,
-				 const char          *filename)
-{
-	xmlDoc *doc;
-	doc = xmlParseFile (filename);
-	if (doc) {
-		xmlNode *node = xmlDocGetRootElement(doc);
-		e_table_state_load_from_node(state, node);
-		xmlFreeDoc(doc);
-		return TRUE;
-	}
-	return FALSE;
-}
-
-void 
-e_table_state_load_from_string  (ETableState *state,
-				 const char          *xml)
-{
-	xmlDoc *doc;
-	doc = xmlParseMemory ((char *) xml, strlen(xml));
-	if (doc) {
-		xmlNode *node = xmlDocGetRootElement(doc);
-		e_table_state_load_from_node(state, node);
-		xmlFreeDoc(doc);
-	}
-}
-
-typedef struct {
-	int column;
-	double expansion;
-} int_and_double;
-
-void
-e_table_state_load_from_node (ETableState *state,
-			      const xmlNode *node)
-{
-	xmlNode *children;
-	GList *list = NULL, *iterator;
-	gdouble state_version;
-	int i;
-
-	state_version = e_xml_get_double_prop_by_name_with_default (
-		node, "state-version", STATE_VERSION);
-
-	if (state->sort_info)
-		gtk_object_unref (GTK_OBJECT(state->sort_info));
-
-	state->sort_info = NULL;
-	children = node->xmlChildrenNode;
-	for (; children; children = children->next) {
-		if (!strcmp (children->name, "column")) {
-			int_and_double *column_info = g_new(int_and_double, 1);
-
-			column_info->column = e_xml_get_integer_prop_by_name(
-				children, "source");
-			column_info->expansion =
-				e_xml_get_double_prop_by_name_with_default(
-					children, "expansion", 1);
-
-			list = g_list_append (list, column_info);
-		} else if (state->sort_info == NULL &&
-			   !strcmp (children->name, "grouping")) {
-			state->sort_info = e_table_sort_info_new();
-			e_table_sort_info_load_from_node(
-				state->sort_info, children, state_version);
-		}
-	}
-	g_free(state->columns);
-	g_free(state->expansions);
-	state->col_count = g_list_length(list);
-	state->columns = g_new(int, state->col_count);
-	state->expansions = g_new(double, state->col_count);
-
-	for (iterator = list, i = 0; iterator; i++) {
-		int_and_double *column_info = iterator->data;
-		
-		state->columns [i] = column_info->column;
-		state->expansions [i] = column_info->expansion;
-		g_free (column_info);
-		iterator = g_list_next (iterator);
-	}
-	g_list_free(list);
-}
-
-void
-e_table_state_save_to_file      (ETableState *state,
-				 const char          *filename)
-{
-	xmlDoc *doc;
-	doc = xmlNewDoc("1.0");
-	xmlDocSetRootElement(doc, e_table_state_save_to_node(state, NULL));
-	xmlSaveFile(filename, doc);
-	xmlFreeDoc(doc);
-}
-
-char *
-e_table_state_save_to_string    (ETableState *state)
-{
-	char *ret_val;
-	xmlChar *string;
-	int length;
-	xmlDoc *doc;
-
-	doc = xmlNewDoc("1.0");
-	xmlDocSetRootElement(doc, e_table_state_save_to_node(state, NULL));
-	xmlDocDumpMemory(doc, &string, &length);
-	xmlFreeDoc(doc);
-
-	ret_val = g_strdup(string);
-	xmlFree(string);
-	return ret_val;
-}
-
-xmlNode *
-e_table_state_save_to_node      (ETableState *state,
-				 xmlNode     *parent)
-{
-	int i;
-	xmlNode *node;
-
-	if (parent)
-		node = xmlNewChild (parent, NULL, "ETableState", NULL);
-	else
-		node = xmlNewNode (NULL, "ETableState");
-
-	e_xml_set_double_prop_by_name(node, "state-version", STATE_VERSION);
-
-	for (i = 0; i < state->col_count; i++) {
-		int column = state->columns[i];
-		double expansion = state->expansions[i];
-		xmlNode *new_node;
-
-		new_node = xmlNewChild(node, NULL, "column", NULL);
-		e_xml_set_integer_prop_by_name (new_node, "source", column);
-		if (expansion >= -1)
-			e_xml_set_double_prop_by_name(new_node, "expansion", expansion);
-	}
-
-
-	e_table_sort_info_save_to_node(state->sort_info, node);
-
-	return node;
-}
-
-/**
- * e_table_state_duplicate:
- * @state: The ETableState to duplicate
- *
- * This creates a copy of the %ETableState @state
- *
- * Returns: The duplicated %ETableState.
- */
-ETableState *
-e_table_state_duplicate (ETableState *state)
-{
-	ETableState *new_state;
-	char *copy;
-	
-	g_return_val_if_fail (state != NULL, NULL);
-	g_return_val_if_fail (E_IS_TABLE_STATE (state), NULL);
-
-	new_state = e_table_state_new ();
-	copy = e_table_state_save_to_string (state);
-	e_table_state_load_from_string (new_state, copy);
-	g_free (copy);
-
-	return new_state;
-}
diff --git a/widgets/table/e-table-state.h b/widgets/table/e-table-state.h
deleted file mode 100644
index 446d560fff..0000000000
--- a/widgets/table/e-table-state.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_STATE_H_
-#define _E_TABLE_STATE_H_
-
-#include <gtk/gtkobject.h>
-#include <gnome-xml/tree.h>
-#include <gal/e-table/e-table-sort-info.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-#define E_TABLE_STATE_TYPE        (e_table_state_get_type ())
-#define E_TABLE_STATE(o)          (GTK_CHECK_CAST ((o), E_TABLE_STATE_TYPE, ETableState))
-#define E_TABLE_STATE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_STATE_TYPE, ETableStateClass))
-#define E_IS_TABLE_STATE(o)       (GTK_CHECK_TYPE ((o), E_TABLE_STATE_TYPE))
-#define E_IS_TABLE_STATE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_STATE_TYPE))
-
-typedef struct {
-	GtkObject base;
-
-	ETableSortInfo *sort_info;
-	int             col_count;
-	int            *columns;
-	double         *expansions;
-} ETableState;
-
-typedef struct {
-	GtkObjectClass parent_class;
-} ETableStateClass;
-
-GtkType      e_table_state_get_type          (void);
-ETableState *e_table_state_new               (void);
-
-gboolean     e_table_state_load_from_file    (ETableState   *state,
-					      const char    *filename);
-void         e_table_state_load_from_string  (ETableState   *state,
-					      const char    *xml);
-void         e_table_state_load_from_node    (ETableState   *state,
-					      const xmlNode *node);
-
-void         e_table_state_save_to_file      (ETableState   *state,
-					      const char    *filename);
-char        *e_table_state_save_to_string    (ETableState   *state);
-xmlNode     *e_table_state_save_to_node      (ETableState   *state,
-					      xmlNode       *parent);
-ETableState *e_table_state_duplicate         (ETableState   *state);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TABLE_STATE_H_ */
diff --git a/widgets/table/e-table-subset-variable.c b/widgets/table/e-table-subset-variable.c
deleted file mode 100644
index 8124f9b666..0000000000
--- a/widgets/table/e-table-subset-variable.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-subset.c: Implements a table that contains a subset of another table.
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * (C) 1999 Ximian, Inc.
- */
-#include <config.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gtk/gtksignal.h>
-#include "gal/util/e-util.h"
-#include "e-table-subset-variable.h"
-
-#define ETSSV_CLASS(e) ((ETableSubsetVariableClass *)((GtkObject *)e)->klass)
-
-#define PARENT_TYPE E_TABLE_SUBSET_TYPE
-
-#define INCREMENT_AMOUNT 10
-
-static ETableSubsetClass *etssv_parent_class;
-
-static void
-etssv_add       (ETableSubsetVariable *etssv,
-		 gint                  row)
-{
-	ETableModel *etm = E_TABLE_MODEL(etssv);
-	ETableSubset *etss = E_TABLE_SUBSET(etssv);
-	
-	e_table_model_pre_change(etm);
-
-	if (etss->n_map + 1 > etssv->n_vals_allocated){
-		etssv->n_vals_allocated += INCREMENT_AMOUNT;
-		etss->map_table = g_realloc (etss->map_table, etssv->n_vals_allocated * sizeof(int));
-	}
-
-	etss->map_table[etss->n_map++] = row;
-
-	e_table_model_row_inserted (etm, etss->n_map - 1);
-}
-
-static void
-etssv_add_array (ETableSubsetVariable *etssv,
-		 const gint           *array,
-		 gint                  count)
-{
-	ETableModel *etm = E_TABLE_MODEL(etssv);
-	ETableSubset *etss = E_TABLE_SUBSET(etssv);
-	int i;
-
-	e_table_model_pre_change(etm);
-	
-	if (etss->n_map + count > etssv->n_vals_allocated){
-		etssv->n_vals_allocated += MAX(INCREMENT_AMOUNT, count);
-		etss->map_table = g_realloc (etss->map_table, etssv->n_vals_allocated * sizeof(int));
-	}
-	for (i = 0; i < count; i++)
-		etss->map_table[etss->n_map++] = array[i];
-
-	e_table_model_changed (etm);
-}
-
-static void
-etssv_add_all   (ETableSubsetVariable *etssv)
-{
-	ETableModel *etm = E_TABLE_MODEL(etssv);
-	ETableSubset *etss = E_TABLE_SUBSET(etssv);
-	int rows;
-	int i;
-
-	e_table_model_pre_change(etm);
-	
-	rows = e_table_model_row_count(etss->source);
-	if (etss->n_map + rows > etssv->n_vals_allocated){
-		etssv->n_vals_allocated += MAX(INCREMENT_AMOUNT, rows);
-		etss->map_table = g_realloc (etss->map_table, etssv->n_vals_allocated * sizeof(int));
-	}
-	for (i = 0; i < rows; i++)
-		etss->map_table[etss->n_map++] = i;
-
-	e_table_model_changed (etm);
-}
-
-static gboolean
-etssv_remove    (ETableSubsetVariable *etssv,
-		 gint                  row)
-{
-	ETableModel *etm = E_TABLE_MODEL(etssv);
-	ETableSubset *etss = E_TABLE_SUBSET(etssv);
-	int i;
-	
-	for (i = 0; i < etss->n_map; i++){
-		if (etss->map_table[i] == row) {
-			e_table_model_pre_change (etm);
-			memmove (etss->map_table + i, etss->map_table + i + 1, (etss->n_map - i - 1) * sizeof(int));
-			etss->n_map --;
-			
-			e_table_model_row_deleted (etm, i);
-			return TRUE;
-		}
-	}
-	return FALSE;
-}
-
-static void
-etssv_class_init (GtkObjectClass *object_class)
-{
-	ETableSubsetVariableClass *klass = E_TABLE_SUBSET_VARIABLE_CLASS(object_class);
-	etssv_parent_class = gtk_type_class (PARENT_TYPE);
-
-	klass->add     = etssv_add;
-	klass->add_array = etssv_add_array;
-	klass->add_all = etssv_add_all;
-	klass->remove  = etssv_remove;
-}
-
-E_MAKE_TYPE(e_table_subset_variable, "ETableSubsetVariable", ETableSubsetVariable, etssv_class_init, NULL, PARENT_TYPE);
-
-ETableModel *
-e_table_subset_variable_construct (ETableSubsetVariable *etssv,
-				   ETableModel          *source)
-{
-	if (e_table_subset_construct (E_TABLE_SUBSET(etssv), source, 1) == NULL)
-		return NULL;
-	E_TABLE_SUBSET(etssv)->n_map = 0;
-
-	return E_TABLE_MODEL (etssv);
-}
-
-ETableModel *
-e_table_subset_variable_new (ETableModel *source)
-{
-	ETableSubsetVariable *etssv = gtk_type_new (E_TABLE_SUBSET_VARIABLE_TYPE);
-
-	if (e_table_subset_variable_construct (etssv, source) == NULL){
-		gtk_object_unref (GTK_OBJECT (etssv));
-		return NULL;
-	}
-
-	return (ETableModel *) etssv;
-}
-
-void
-e_table_subset_variable_add       (ETableSubsetVariable *etssv,
-				   gint                  row)
-{
-	g_return_if_fail (etssv != NULL);
-	g_return_if_fail (E_IS_TABLE_SUBSET_VARIABLE(etssv));
-
-	if (ETSSV_CLASS(etssv)->add)
-		ETSSV_CLASS (etssv)->add (etssv, row);
-}
-
-void
-e_table_subset_variable_add_array   (ETableSubsetVariable *etssv,
-				     const gint           *array,
-				     gint                  count)
-{
-	g_return_if_fail (etssv != NULL);
-	g_return_if_fail (E_IS_TABLE_SUBSET_VARIABLE(etssv));
-
-	if (ETSSV_CLASS(etssv)->add_array)
-		ETSSV_CLASS (etssv)->add_array (etssv, array, count);
-}
-
-void
-e_table_subset_variable_add_all   (ETableSubsetVariable *etssv)
-{
-	g_return_if_fail (etssv != NULL);
-	g_return_if_fail (E_IS_TABLE_SUBSET_VARIABLE(etssv));
-
-	if (ETSSV_CLASS(etssv)->add_all)
-		ETSSV_CLASS (etssv)->add_all (etssv);
-}
-
-gboolean
-e_table_subset_variable_remove    (ETableSubsetVariable *etssv,
-				   gint                  row)
-{
-	g_return_val_if_fail (etssv != NULL, FALSE);
-	g_return_val_if_fail (E_IS_TABLE_SUBSET_VARIABLE(etssv), FALSE);
-
-	if (ETSSV_CLASS(etssv)->remove)
-		return ETSSV_CLASS (etssv)->remove (etssv, row);
-	else
-		return FALSE;
-}
-
-void
-e_table_subset_variable_increment (ETableSubsetVariable *etssv,
-				   gint                  position,
-				   gint                  amount)
-{
-	int i;
-	ETableSubset *etss = E_TABLE_SUBSET(etssv);
-	for (i = 0; i < etss->n_map; i++) {
-		if (etss->map_table[i] >= position)
-			etss->map_table[i] += amount;
-	}
-}
-
-void
-e_table_subset_variable_decrement (ETableSubsetVariable *etssv,
-				   gint                  position,
-				   gint                  amount)
-{
-	int i;
-	ETableSubset *etss = E_TABLE_SUBSET(etssv);
-	for (i = 0; i < etss->n_map; i++) {
-		if (etss->map_table[i] >= position)
-			etss->map_table[i] -= amount;
-	}
-}
-
-void
-e_table_subset_variable_set_allocation (ETableSubsetVariable *etssv,
-					gint total)
-{
-	ETableSubset *etss = E_TABLE_SUBSET(etssv);
-	if (total <= 0)
-		total = 1;
-	if (total > etss->n_map){
-		etss->map_table = g_realloc (etss->map_table, total * sizeof(int));
-	}
-}
diff --git a/widgets/table/e-table-subset-variable.h b/widgets/table/e-table-subset-variable.h
deleted file mode 100644
index f09c612f13..0000000000
--- a/widgets/table/e-table-subset-variable.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_SUBSET_VARIABLE_H_
-#define _E_TABLE_SUBSET_VARIABLE_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/e-table/e-table-subset.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_TABLE_SUBSET_VARIABLE_TYPE        (e_table_subset_variable_get_type ())
-#define E_TABLE_SUBSET_VARIABLE(o)          (GTK_CHECK_CAST ((o), E_TABLE_SUBSET_VARIABLE_TYPE, ETableSubsetVariable))
-#define E_TABLE_SUBSET_VARIABLE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_SUBSET_VARIABLE_TYPE, ETableSubsetVariableClass))
-#define E_IS_TABLE_SUBSET_VARIABLE(o)       (GTK_CHECK_TYPE ((o), E_TABLE_SUBSET_VARIABLE_TYPE))
-#define E_IS_TABLE_SUBSET_VARIABLE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_SUBSET_VARIABLE_TYPE))
-
-typedef struct {
-	ETableSubset base;
-
-	int n_vals_allocated;
-} ETableSubsetVariable;
-
-typedef struct {
-	ETableSubsetClass parent_class;
-	
-	void     (*add)       (ETableSubsetVariable *ets,
-			       gint                  row);
-	void     (*add_array) (ETableSubsetVariable *ets,
-			       const gint           *array,
-			       gint                  count);
-	void     (*add_all)   (ETableSubsetVariable *ets);
-	gboolean (*remove)    (ETableSubsetVariable *ets,
-			       gint                  row);
-} ETableSubsetVariableClass;
-
-GtkType      e_table_subset_variable_get_type  (void);
-ETableModel *e_table_subset_variable_new       (ETableModel          *etm);
-ETableModel *e_table_subset_variable_construct (ETableSubsetVariable *etssv,
-						ETableModel          *source);
-void         e_table_subset_variable_add       (ETableSubsetVariable *ets,
-						gint                  row);
-void         e_table_subset_variable_add_array (ETableSubsetVariable *ets,
-						const gint           *array,
-						gint                  count);
-void         e_table_subset_variable_add_all   (ETableSubsetVariable *ets);
-gboolean     e_table_subset_variable_remove    (ETableSubsetVariable *ets,
-						gint                  row);
-void         e_table_subset_variable_increment (ETableSubsetVariable *ets,
-						gint                  position,
-						gint                  amount);
-void         e_table_subset_variable_decrement (ETableSubsetVariable *ets,
-						gint                  position,
-						gint                  amount);
-void         e_table_subset_variable_set_allocation (ETableSubsetVariable *ets,
-						     gint                  total);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* _E_TABLE_SUBSET_VARIABLE_H_ */
-
diff --git a/widgets/table/e-table-subset.c b/widgets/table/e-table-subset.c
deleted file mode 100644
index 4edb093d26..0000000000
--- a/widgets/table/e-table-subset.c
+++ /dev/null
@@ -1,390 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-subset.c: Implements a table that contains a subset of another table.
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * (C) 1999 Ximian, Inc.
- */
-#include <config.h>
-#include <stdlib.h>
-#include <gtk/gtksignal.h>
-#include "gal/util/e-util.h"
-#include "e-table-subset.h"
-
-static void etss_proxy_model_pre_change_real (ETableSubset *etss, ETableModel *etm);
-static void etss_proxy_model_changed_real (ETableSubset *etss, ETableModel *etm);
-static void etss_proxy_model_row_changed_real (ETableSubset *etss, ETableModel *etm, int row);
-static void etss_proxy_model_cell_changed_real (ETableSubset *etss, ETableModel *etm, int col, int row);
-
-#define PARENT_TYPE E_TABLE_MODEL_TYPE
-#define d(x)
-
-static ETableModelClass *etss_parent_class;
-
-#define ETSS_CLASS(object) (E_TABLE_SUBSET_CLASS(GTK_OBJECT(object)->klass))
-
-static void
-etss_destroy (GtkObject *object)
-{
-	ETableSubset *etss = E_TABLE_SUBSET (object);
-
-	if (etss->source) {
-		gtk_signal_disconnect (GTK_OBJECT (etss->source),
-				       etss->table_model_pre_change_id);
-		gtk_signal_disconnect (GTK_OBJECT (etss->source),
-				       etss->table_model_changed_id);
-		gtk_signal_disconnect (GTK_OBJECT (etss->source),
-				       etss->table_model_row_changed_id);
-		gtk_signal_disconnect (GTK_OBJECT (etss->source),
-				       etss->table_model_cell_changed_id);
-		gtk_signal_disconnect (GTK_OBJECT (etss->source),
-				       etss->table_model_rows_inserted_id);
-		gtk_signal_disconnect (GTK_OBJECT (etss->source),
-				       etss->table_model_rows_deleted_id);
-
-		gtk_object_unref (GTK_OBJECT (etss->source));
-		etss->source = NULL;
-
-		etss->table_model_changed_id = 0;
-		etss->table_model_row_changed_id = 0;
-		etss->table_model_cell_changed_id = 0;
-		etss->table_model_rows_inserted_id = 0;
-		etss->table_model_rows_deleted_id = 0;
-	}
-
-	g_free (etss->map_table);
-
-	GTK_OBJECT_CLASS (etss_parent_class)->destroy (object);
-}
-
-static int
-etss_column_count (ETableModel *etm)
-{
-	ETableSubset *etss = (ETableSubset *)etm;
-
-	return e_table_model_column_count (etss->source);
-}
-
-static int
-etss_row_count (ETableModel *etm)
-{
-	ETableSubset *etss = (ETableSubset *)etm;
-
-	return etss->n_map;
-}
-
-static void *
-etss_value_at (ETableModel *etm, int col, int row)
-{
-	ETableSubset *etss = (ETableSubset *)etm;
-
-	etss->last_access = row;
-	d(g_print("g) Setting last_access to %d\n", row));
-	return e_table_model_value_at (etss->source, col, etss->map_table [row]);
-}
-
-static void
-etss_set_value_at (ETableModel *etm, int col, int row, const void *val)
-{
-	ETableSubset *etss = (ETableSubset *)etm;
-
-	etss->last_access = row;
-	d(g_print("h) Setting last_access to %d\n", row));
-	e_table_model_set_value_at (etss->source, col, etss->map_table [row], val);
-}
-
-static gboolean
-etss_is_cell_editable (ETableModel *etm, int col, int row)
-{
-	ETableSubset *etss = (ETableSubset *)etm;
-
-	return e_table_model_is_cell_editable (etss->source, col, etss->map_table [row]);
-}
-
-static void
-etss_append_row (ETableModel *etm, ETableModel *source, int row)
-{
-	ETableSubset *etss = (ETableSubset *)etm;
-	e_table_model_append_row (etss->source, source, row);
-}
-
-static void *
-etss_duplicate_value (ETableModel *etm, int col, const void *value)
-{
-	ETableSubset *etss = (ETableSubset *)etm;
-
-	return e_table_model_duplicate_value (etss->source, col, value);
-}
-
-static void
-etss_free_value (ETableModel *etm, int col, void *value)
-{
-	ETableSubset *etss = (ETableSubset *)etm;
-
-	e_table_model_free_value (etss->source, col, value);
-}
-
-static void *
-etss_initialize_value (ETableModel *etm, int col)
-{
-	ETableSubset *etss = (ETableSubset *)etm;
-
-	return e_table_model_initialize_value (etss->source, col);
-}
-
-static gboolean
-etss_value_is_empty (ETableModel *etm, int col, const void *value)
-{
-	ETableSubset *etss = (ETableSubset *)etm;
-
-	return e_table_model_value_is_empty (etss->source, col, value);
-}
-
-static char *
-etss_value_to_string (ETableModel *etm, int col, const void *value)
-{
-	ETableSubset *etss = (ETableSubset *)etm;
-
-	return e_table_model_value_to_string (etss->source, col, value);
-}
-
-static void
-etss_class_init (GtkObjectClass *object_class)
-{
-	ETableSubsetClass *klass        = (ETableSubsetClass *) object_class;
-	ETableModelClass *table_class   = (ETableModelClass *) object_class;
-
-	etss_parent_class               = gtk_type_class (PARENT_TYPE);
-	
-	object_class->destroy           = etss_destroy;
-
-	table_class->column_count       = etss_column_count;
-	table_class->row_count          = etss_row_count;
-	table_class->value_at           = etss_value_at;
-	table_class->set_value_at       = etss_set_value_at;
-	table_class->is_cell_editable   = etss_is_cell_editable;
-	table_class->append_row         = etss_append_row;
-	table_class->duplicate_value    = etss_duplicate_value;
-	table_class->free_value         = etss_free_value;
-	table_class->initialize_value   = etss_initialize_value;
-	table_class->value_is_empty     = etss_value_is_empty;
-	table_class->value_to_string    = etss_value_to_string;
-
-	klass->proxy_model_pre_change   = etss_proxy_model_pre_change_real;
-	klass->proxy_model_changed      = etss_proxy_model_changed_real;
-	klass->proxy_model_row_changed  = etss_proxy_model_row_changed_real;
-	klass->proxy_model_cell_changed = etss_proxy_model_cell_changed_real;
-	klass->proxy_model_rows_inserted = NULL;
-	klass->proxy_model_rows_deleted  = NULL;
-}
-
-static void
-etss_init (ETableSubset *etss)
-{
-	etss->last_access = 0;
-}
-
-E_MAKE_TYPE(e_table_subset, "ETableSubset", ETableSubset, etss_class_init, etss_init, PARENT_TYPE);
-
-static void
-etss_proxy_model_pre_change_real (ETableSubset *etss, ETableModel *etm)
-{
-	e_table_model_pre_change (E_TABLE_MODEL (etss));
-}
-
-static void
-etss_proxy_model_changed_real (ETableSubset *etss, ETableModel *etm)
-{
-	e_table_model_changed (E_TABLE_MODEL (etss));
-}
-
-static void
-etss_proxy_model_row_changed_real (ETableSubset *etss, ETableModel *etm, int row)
-{
-	int limit;
-	const int n = etss->n_map;
-	const int * const map_table = etss->map_table;
-	int i;
-
-	limit = MIN(n, etss->last_access + 10);
-	for (i = etss->last_access; i < limit; i++) {
-		if (map_table [i] == row){
-			e_table_model_row_changed (E_TABLE_MODEL (etss), i);
-			d(g_print("a) Found %d from %d\n", i, etss->last_access));
-			etss->last_access = i;
-			return;
-		}
-	}
-
-	limit = MAX(0, etss->last_access - 10);
-	for (i = etss->last_access - 1; i >= limit; i--) {
-		if (map_table [i] == row){
-			e_table_model_row_changed (E_TABLE_MODEL (etss), i);
-			d(g_print("b) Found %d from %d\n", i, etss->last_access));
-			etss->last_access = i;
-			return;
-		}
-	}
-
-	for (i = 0; i < n; i++){
-		if (map_table [i] == row){
-			e_table_model_row_changed (E_TABLE_MODEL (etss), i);
-			d(g_print("c) Found %d from %d\n", i, etss->last_access));
-			etss->last_access = i;
-			return;
-		}
-	}
-}
-
-static void
-etss_proxy_model_cell_changed_real (ETableSubset *etss, ETableModel *etm, int col, int row)
-{
-	int limit;
-	const int n = etss->n_map;
-	const int * const map_table = etss->map_table;
-	int i;
-
-	limit = MIN(n, etss->last_access + 10);
-	for (i = etss->last_access; i < limit; i++) {
-		if (map_table [i] == row){
-			e_table_model_cell_changed (E_TABLE_MODEL (etss), col, i);
-			d(g_print("d) Found %d from %d\n", i, etss->last_access));
-			etss->last_access = i;
-			return;
-		}
-	}
-
-	limit = MAX(0, etss->last_access - 10);
-	for (i = etss->last_access - 1; i >= limit; i--) {
-		if (map_table [i] == row){
-			e_table_model_cell_changed (E_TABLE_MODEL (etss), col, i);
-			d(g_print("e) Found %d from %d\n", i, etss->last_access));
-			etss->last_access = i;
-			return;
-		}
-	}
-		
-	for (i = 0; i < n; i++){
-		if (map_table [i] == row){
-			e_table_model_cell_changed (E_TABLE_MODEL (etss), col, i);
-			d(g_print("f) Found %d from %d\n", i, etss->last_access));
-			etss->last_access = i;
-			return;
-		}
-	}
-}
-
-static void
-etss_proxy_model_pre_change (ETableModel *etm, ETableSubset *etss)
-{
-	if (ETSS_CLASS(etss)->proxy_model_pre_change)
-		(ETSS_CLASS(etss)->proxy_model_pre_change) (etss, etm);
-}
-
-static void
-etss_proxy_model_changed (ETableModel *etm, ETableSubset *etss)
-{
-	if (ETSS_CLASS(etss)->proxy_model_changed)
-		(ETSS_CLASS(etss)->proxy_model_changed) (etss, etm);
-}
-
-static void
-etss_proxy_model_row_changed (ETableModel *etm, int row, ETableSubset *etss)
-{
-	if (ETSS_CLASS(etss)->proxy_model_row_changed)
-		(ETSS_CLASS(etss)->proxy_model_row_changed) (etss, etm, row);
-}
-
-static void
-etss_proxy_model_cell_changed (ETableModel *etm, int row, int col, ETableSubset *etss)
-{
-	if (ETSS_CLASS(etss)->proxy_model_cell_changed)
-		(ETSS_CLASS(etss)->proxy_model_cell_changed) (etss, etm, col, row);
-}
-
-static void
-etss_proxy_model_rows_inserted (ETableModel *etm, int row, int col, ETableSubset *etss)
-{
-	if (ETSS_CLASS(etss)->proxy_model_rows_inserted)
-		(ETSS_CLASS(etss)->proxy_model_rows_inserted) (etss, etm, row, col);
-}
-
-static void
-etss_proxy_model_rows_deleted (ETableModel *etm, int row, int col, ETableSubset *etss)
-{
-	if (ETSS_CLASS(etss)->proxy_model_rows_deleted)
-		(ETSS_CLASS(etss)->proxy_model_rows_deleted) (etss, etm, row, col);
-}
-
-ETableModel *
-e_table_subset_construct (ETableSubset *etss, ETableModel *source, int nvals)
-{
-	unsigned int *buffer;
-	int i;
-
-	if (nvals) {
-		buffer = (unsigned int *) g_malloc (sizeof (unsigned int) * nvals);
-		if (buffer == NULL)
-			return NULL;
-	} else
-		buffer = NULL;
-	etss->map_table = buffer;
-	etss->n_map = nvals;
-	etss->source = source;
-	gtk_object_ref (GTK_OBJECT (source));
-	
-	/* Init */
-	for (i = 0; i < nvals; i++)
-		etss->map_table [i] = i;
-
-	etss->table_model_pre_change_id = gtk_signal_connect (GTK_OBJECT (source), "model_pre_change",
-							      GTK_SIGNAL_FUNC (etss_proxy_model_pre_change), etss);
-	etss->table_model_changed_id = gtk_signal_connect (GTK_OBJECT (source), "model_changed",
-						     GTK_SIGNAL_FUNC (etss_proxy_model_changed), etss);
-	etss->table_model_row_changed_id = gtk_signal_connect (GTK_OBJECT (source), "model_row_changed",
-							 GTK_SIGNAL_FUNC (etss_proxy_model_row_changed), etss);
-	etss->table_model_cell_changed_id = gtk_signal_connect (GTK_OBJECT (source), "model_cell_changed",
-							  GTK_SIGNAL_FUNC (etss_proxy_model_cell_changed), etss);
-	etss->table_model_rows_inserted_id = gtk_signal_connect (GTK_OBJECT (source), "model_rows_inserted",
-								GTK_SIGNAL_FUNC (etss_proxy_model_rows_inserted), etss);
-	etss->table_model_rows_deleted_id = gtk_signal_connect (GTK_OBJECT (source), "model_rows_deleted",
-							       GTK_SIGNAL_FUNC (etss_proxy_model_rows_deleted), etss);
-	
-	return E_TABLE_MODEL (etss);
-}
-
-ETableModel *
-e_table_subset_new (ETableModel *source, const int nvals)
-{
-	ETableSubset *etss = gtk_type_new (E_TABLE_SUBSET_TYPE);
-
-	if (e_table_subset_construct (etss, source, nvals) == NULL){
-		gtk_object_unref (GTK_OBJECT (etss));
-		return NULL;
-	}
-
-	return (ETableModel *) etss;
-}
-
-ETableModel *
-e_table_subset_get_toplevel (ETableSubset *table)
-{
-	g_return_val_if_fail (table != NULL, NULL);
-	g_return_val_if_fail (E_IS_TABLE_SUBSET (table), NULL);
-
-	if (E_IS_TABLE_SUBSET (table->source))
-		return e_table_subset_get_toplevel (E_TABLE_SUBSET (table->source));
-	else
-		return table->source;
-}
-
-void
-e_table_subset_print_debugging  (ETableSubset *table_model)
-{
-	int i;
-	for (i = 0; i < table_model->n_map; i++) {
-		g_print("%8d\n", table_model->map_table[i]);
-	}
-}
diff --git a/widgets/table/e-table-subset.h b/widgets/table/e-table-subset.h
deleted file mode 100644
index cd26fbb203..0000000000
--- a/widgets/table/e-table-subset.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_SUBSET_H_
-#define _E_TABLE_SUBSET_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/e-table/e-table-model.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_TABLE_SUBSET_TYPE        (e_table_subset_get_type ())
-#define E_TABLE_SUBSET(o)          (GTK_CHECK_CAST ((o), E_TABLE_SUBSET_TYPE, ETableSubset))
-#define E_TABLE_SUBSET_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_SUBSET_TYPE, ETableSubsetClass))
-#define E_IS_TABLE_SUBSET(o)       (GTK_CHECK_TYPE ((o), E_TABLE_SUBSET_TYPE))
-#define E_IS_TABLE_SUBSET_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_SUBSET_TYPE))
-
-typedef struct {
-	ETableModel base;
-
-	ETableModel  *source;
-	int  n_map;
-	int *map_table;
-
-	int last_access;
-
-	int              table_model_pre_change_id;
-	int              table_model_changed_id;
-	int              table_model_row_changed_id;
-	int              table_model_cell_changed_id;
-	int              table_model_rows_inserted_id;
-	int              table_model_rows_deleted_id;
-} ETableSubset;
-
-typedef struct {
-	ETableModelClass parent_class;
-
-	void (*proxy_model_pre_change)   (ETableSubset *etss, ETableModel *etm);
-	void (*proxy_model_changed)      (ETableSubset *etss, ETableModel *etm);
-	void (*proxy_model_row_changed)  (ETableSubset *etss, ETableModel *etm, int row);
-	void (*proxy_model_cell_changed) (ETableSubset *etss, ETableModel *etm, int col, int row);
-	void (*proxy_model_rows_inserted) (ETableSubset *etss, ETableModel *etm, int row, int count);
-	void (*proxy_model_rows_deleted)  (ETableSubset *etss, ETableModel *etm, int row, int count);
-} ETableSubsetClass;
-
-GtkType      e_table_subset_get_type         (void);
-ETableModel *e_table_subset_new              (ETableModel  *etm,
-					      int           n_vals);
-ETableModel *e_table_subset_construct        (ETableSubset *ets,
-					      ETableModel  *source,
-					      int           nvals);
-
-ETableModel *e_table_subset_get_toplevel     (ETableSubset *table_model);
-
-void         e_table_subset_print_debugging  (ETableSubset *table_model);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TABLE_SUBSET_H_ */
-
diff --git a/widgets/table/e-table-tooltip.h b/widgets/table/e-table-tooltip.h
deleted file mode 100644
index 259d6398db..0000000000
--- a/widgets/table/e-table-tooltip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_TOOLTIP_H_
-#define _E_TABLE_TOOLTIP_H_
-
-#include <libgnomeui/gnome-canvas.h>
-
-BEGIN_GNOME_DECLS
-
-typedef struct {
-	gint timer;
-	int col, row;
-	int row_height;
-	int x, y;
-	int cx, cy;
-	GdkColor *foreground;
-	GdkColor *background;
-	GnomeCanvasItem *eti;
-} ETableTooltip;
-
-END_GNOME_DECLS
-
-#endif
diff --git a/widgets/table/e-table-tree.h b/widgets/table/e-table-tree.h
deleted file mode 100644
index ab0378473a..0000000000
--- a/widgets/table/e-table-tree.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _E_TABLE_TREE_H_
-#define _E_TABLE_TREE_H_
-
-BEGIN_GNOME_DECLS
-
-typedef struct {
-	char *title;
-
-	union {
-		ETableModel *table;
-		GList *children;
-	} u;
-
-	guint expanded :1;
-	guint is_leaf  :1;
-} ETableGroup;
-
-ETableGroup *e_table_group_new      (const char *title, ETableModel *table);
-ETableGroup *e_table_group_new_leaf (const char *title);
-
-END_GNOME_DECLS
-
-#endif /* _E_TABLE_TREE_H_ */
diff --git a/widgets/table/e-table-utils.c b/widgets/table/e-table-utils.c
deleted file mode 100644
index 9c9aea6911..0000000000
--- a/widgets/table/e-table-utils.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-table.utils.c: Utilities for ETable.
- *
- * Author:
- *   Chris Lahey <clahey@ximian.com>
- *
- * Copyright 2001, Ximian, Inc
- */
-
-#include <config.h>
-#include "gal/util/e-i18n.h"
-#include "e-table-utils.h"
-#include "e-table-header-utils.h"
-
-ETableHeader *
-e_table_state_to_header (GtkWidget *widget, ETableHeader *full_header, ETableState *state)
-{
-	ETableHeader *nh;
-	const int max_cols = e_table_header_count (full_header);
-	int column;
-
-	g_return_val_if_fail (widget, NULL);
-	g_return_val_if_fail (full_header, NULL);
-	g_return_val_if_fail (state, NULL);
-
-	nh = e_table_header_new ();
-
-	gtk_object_set(GTK_OBJECT(nh),
-		       "width_extras", e_table_header_width_extras(widget->style),
-		       NULL);
-
-	for (column = 0; column < state->col_count; column++) {
-		int col;
-		double expansion;
-		ETableCol *table_col;
-
-		col = state->columns[column];
-		expansion = state->expansions[column];
-
-		if (col >= max_cols)
-			continue;
-
-		table_col = e_table_header_get_column (full_header, col);
-
-		if (expansion >= -1)
-			table_col->expansion = expansion;
-
-		e_table_header_add_column (nh, table_col, -1);
-	}
-
-	return nh;
-}
-
-static ETableCol *
-et_col_spec_to_col (ETableColumnSpecification *col_spec,
-		    ETableExtras              *ete)
-{
-	ETableCol *col = NULL;
-	ECell *cell;
-	GCompareFunc compare;
-
-	cell = e_table_extras_get_cell(ete, col_spec->cell);
-	compare = e_table_extras_get_compare(ete, col_spec->compare);
-
-	if (cell && compare) {
-		if (col_spec->pixbuf && *col_spec->pixbuf) {
-			GdkPixbuf *pixbuf;
-
-			pixbuf = e_table_extras_get_pixbuf(
-				ete, col_spec->pixbuf);
-			if (pixbuf) {
-				col = e_table_col_new_with_pixbuf (
-					col_spec->model_col, gettext (col_spec->title),
-					pixbuf, col_spec->expansion,
-					col_spec->minimum_width,
-					cell, compare, col_spec->resizable);
-			}
-		}
-		if (col == NULL && col_spec->title && *col_spec->title) {
-			col = e_table_col_new (
-				col_spec->model_col, gettext (col_spec->title),
-				col_spec->expansion, col_spec->minimum_width,
-				cell, compare, col_spec->resizable);
-		}
-	}
-	return col;
-}
-
-ETableHeader *
-e_table_spec_to_full_header (ETableSpecification *spec,
-			     ETableExtras        *ete)
-{
-	ETableHeader *nh;
-	int column;
-
-	g_return_val_if_fail (spec, NULL);
-	g_return_val_if_fail (ete, NULL);
-
-	nh = e_table_header_new ();
-
-	for (column = 0; spec->columns[column]; column++) {
-		ETableCol *col = et_col_spec_to_col (
-			spec->columns[column], ete);
-
-		if (col)
-			e_table_header_add_column (nh, col, -1);
-	}
-
-	return nh;
-}
diff --git a/widgets/table/e-table-utils.h b/widgets/table/e-table-utils.h
deleted file mode 100644
index d78f1a5da2..0000000000
--- a/widgets/table/e-table-utils.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_UTILS_H_
-#define _E_TABLE_UTILS_H_
-
-#include <gal/e-table/e-table-header.h>
-#include <gal/e-table/e-table-state.h>
-#include <gal/e-table/e-table-specification.h>
-#include <gal/e-table/e-table-extras.h>
-
-BEGIN_GNOME_DECLS
-
-ETableHeader *
-e_table_state_to_header (GtkWidget *widget, ETableHeader *full_header, ETableState *state);
-
-ETableHeader *
-e_table_spec_to_full_header (ETableSpecification *spec,
-			     ETableExtras        *ete);
-
-END_GNOME_DECLS
-
-#endif /* _E_TABLE_UTILS_H_ */
-
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
deleted file mode 100644
index 83296059c8..0000000000
--- a/widgets/table/e-table.c
+++ /dev/null
@@ -1,2284 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table.c: A graphical view of a Table.
- *
- * Author:
- *   Miguel de Icaza (miguel@ximian.com)
- *   Chris Lahey <clahey@ximian.com>
- *
- * Copyright 1999, 2000, 2001, Ximian, Inc
- */
-#include <config.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdio.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtksignal.h>
-#include <libgnomeui/gnome-canvas.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-
-#include "gal/util/e-i18n.h"
-#include "gal/util/e-util.h"
-#include "gal/widgets/e-canvas.h"
-#include "gal/widgets/e-canvas-vbox.h"
-#include "gal/widgets/e-unicode.h"
-#include "e-table.h"
-#include "e-table-header-item.h"
-#include "e-table-header-utils.h"
-#include "e-table-subset.h"
-#include "e-table-item.h"
-#include "e-table-group.h"
-#include "e-table-group-leaf.h"
-#include "e-table-click-to-add.h"
-#include "e-table-specification.h"
-#include "e-table-state.h"
-#include "e-table-column-specification.h"
-
-#include "e-table-utils.h"
-
-#define COLUMN_HEADER_HEIGHT 16
-
-#define PARENT_TYPE gtk_table_get_type ()
-
-static GtkObjectClass *e_table_parent_class;
-
-enum {
-	CURSOR_CHANGE,
-	CURSOR_ACTIVATED,
-	SELECTION_CHANGE,
-	DOUBLE_CLICK,
-	RIGHT_CLICK,
-	CLICK,
-	KEY_PRESS,
-
-	TABLE_DRAG_BEGIN,
-	TABLE_DRAG_END,
-	TABLE_DRAG_DATA_GET,
-	TABLE_DRAG_DATA_DELETE,
-
-	TABLE_DRAG_LEAVE,
-	TABLE_DRAG_MOTION,
-	TABLE_DRAG_DROP,
-	TABLE_DRAG_DATA_RECEIVED,
-
-	LAST_SIGNAL
-};
-
-enum {
-	ARG_0,
-	ARG_LENGTH_THRESHOLD,
-	ARG_MODEL,
-};
-
-static gint et_signals [LAST_SIGNAL] = { 0, };
-
-static void e_table_fill_table (ETable *e_table, ETableModel *model);
-static gboolean changed_idle (gpointer data);
-
-static void et_grab_focus (GtkWidget *widget);
-
-static void et_drag_begin (GtkWidget *widget,
-			   GdkDragContext *context,
-			   ETable *et);
-static void et_drag_end (GtkWidget *widget,
-			 GdkDragContext *context,
-			 ETable *et);
-static void et_drag_data_get(GtkWidget *widget,
-			     GdkDragContext *context,
-			     GtkSelectionData *selection_data,
-			     guint info,
-			     guint time,
-			     ETable *et);
-static void et_drag_data_delete(GtkWidget *widget,
-				GdkDragContext *context,
-				ETable *et);
-
-static void et_drag_leave(GtkWidget *widget,
-			  GdkDragContext *context,
-			  guint time,
-			  ETable *et);
-static gboolean et_drag_motion(GtkWidget *widget,
-			       GdkDragContext *context,
-			       gint x,
-			       gint y,
-			       guint time,
-			       ETable *et);
-static gboolean et_drag_drop(GtkWidget *widget,
-			     GdkDragContext *context,
-			     gint x,
-			     gint y,
-			     guint time,
-			     ETable *et);
-static void et_drag_data_received(GtkWidget *widget,
-				  GdkDragContext *context,
-				  gint x,
-				  gint y,
-				  GtkSelectionData *selection_data,
-				  guint info,
-				  guint time,
-				  ETable *et);
-static gint e_table_drag_source_event_cb (GtkWidget      *widget,
-					  GdkEvent       *event,
-					  ETable         *table);
-
-static gint et_focus (GtkContainer *container, GtkDirectionType direction);
-
-static void
-et_disconnect_model (ETable *et)
-{
-	if (et->model == NULL)
-		return;
-
-	if (et->table_model_change_id != 0)
-		gtk_signal_disconnect (GTK_OBJECT (et->model),
-				       et->table_model_change_id);
-	if (et->table_row_change_id != 0)
-		gtk_signal_disconnect (GTK_OBJECT (et->model),
-				       et->table_row_change_id);
-	if (et->table_cell_change_id != 0)
-		gtk_signal_disconnect (GTK_OBJECT (et->model),
-				       et->table_cell_change_id);
-	if (et->table_rows_inserted_id != 0)
-		gtk_signal_disconnect (GTK_OBJECT (et->model),
-				       et->table_rows_inserted_id);
-	if (et->table_rows_deleted_id != 0)
-		gtk_signal_disconnect (GTK_OBJECT (et->model),
-				       et->table_rows_deleted_id);
-
-	et->table_model_change_id = 0;
-	et->table_row_change_id = 0;
-	et->table_cell_change_id = 0;
-	et->table_rows_inserted_id = 0;
-	et->table_rows_deleted_id = 0;
-}
-
-static void
-et_destroy (GtkObject *object)
-{
-	ETable *et = E_TABLE (object);
-
-	et_disconnect_model (et);
-
-	if (et->group_info_change_id)
-		gtk_signal_disconnect (GTK_OBJECT (et->sort_info),
-				       et->group_info_change_id);
-	
-	if (et->reflow_idle_id)
-		g_source_remove(et->reflow_idle_id);
-	et->reflow_idle_id = 0;
-
-	gtk_object_unref (GTK_OBJECT (et->model));
-	gtk_object_unref (GTK_OBJECT (et->full_header));
-	gtk_object_unref (GTK_OBJECT (et->header));
-	gtk_object_unref (GTK_OBJECT (et->sort_info));
-	gtk_object_unref (GTK_OBJECT (et->sorter));
-	gtk_object_unref (GTK_OBJECT (et->selection));
-	if (et->spec)
-		gtk_object_unref (GTK_OBJECT (et->spec));
-
-	if (et->header_canvas != NULL)
-		gtk_widget_destroy (GTK_WIDGET (et->header_canvas));
-
-	if (et->site != NULL)
-		e_table_drag_source_unset (et);
-
-	gtk_widget_destroy (GTK_WIDGET (et->table_canvas));
-
-	if (et->rebuild_idle_id) {
-		g_source_remove (et->rebuild_idle_id);
-		et->rebuild_idle_id = 0;
-	}
-
-	g_free(et->click_to_add_message);
-
-	(*e_table_parent_class->destroy)(object);
-}
-
-static void
-e_table_init (GtkObject *object)
-{
-	ETable *e_table = E_TABLE (object);
-	GtkTable *gtk_table = GTK_TABLE (object);
-
-	GTK_WIDGET_SET_FLAGS (e_table, GTK_CAN_FOCUS);
-
-	gtk_table->homogeneous = FALSE;
-
-	e_table->sort_info = NULL;
-	e_table->group_info_change_id = 0;
-	e_table->reflow_idle_id = 0;
-
-	e_table->alternating_row_colors = 1;
-	e_table->horizontal_draw_grid = 1;
-	e_table->vertical_draw_grid = 1;
-	e_table->draw_focus = 1;
-	e_table->cursor_mode = E_CURSOR_SIMPLE;
-	e_table->length_threshold = 200;
-
-	e_table->need_rebuild = 0;
-	e_table->rebuild_idle_id = 0;
-
-	e_table->horizontal_scrolling = FALSE;
-
-	e_table->click_to_add_message = NULL;
-
-	e_table->drag_get_data_row = -1;
-	e_table->drag_get_data_col = -1;
-	e_table->drop_row = -1;
-	e_table->drop_col = -1;
-	e_table->site = NULL;
-	e_table->drag_source_button_press_event_id = 0;
-	e_table->drag_source_motion_notify_event_id = 0;
-
-	e_table->sorter = NULL;
-	e_table->selection = e_table_selection_model_new();
-	e_table->cursor_loc = E_TABLE_CURSOR_LOC_NONE;
-	e_table->spec = NULL;
-}
-
-/* Grab_focus handler for the ETable */
-static void
-et_grab_focus (GtkWidget *widget)
-{
-	ETable *e_table;
-
-	e_table = E_TABLE (widget);
-
-	gtk_widget_grab_focus (GTK_WIDGET (e_table->table_canvas));
-}
-
-/* Focus handler for the ETable */
-static gint
-et_focus (GtkContainer *container, GtkDirectionType direction)
-{
-	ETable *e_table;
-
-	e_table = E_TABLE (container);
-
-	if (container->focus_child) {
-		gtk_container_set_focus_child (container, NULL);
-		return FALSE;
-	}
-
-	return gtk_container_focus (GTK_CONTAINER (e_table->table_canvas), direction);
-}
-
-static void
-set_header_canvas_width (ETable *e_table)
-{
-	double oldwidth, oldheight, width;
-
-	if (!(e_table->header_item && e_table->header_canvas && e_table->table_canvas))
-		return;
-
-	gnome_canvas_get_scroll_region (GNOME_CANVAS (e_table->table_canvas),
-					NULL, NULL, &width, NULL);
-	gnome_canvas_get_scroll_region (GNOME_CANVAS (e_table->header_canvas),
-					NULL, NULL, &oldwidth, &oldheight);
-
-	if (oldwidth != width ||
-	    oldheight != E_TABLE_HEADER_ITEM (e_table->header_item)->height - 1)
-		gnome_canvas_set_scroll_region (
-						GNOME_CANVAS (e_table->header_canvas),
-						0, 0, width, /*  COLUMN_HEADER_HEIGHT - 1 */
-						E_TABLE_HEADER_ITEM (e_table->header_item)->height - 1);
-
-}
-
-static void
-header_canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc, ETable *e_table)
-{
-	set_header_canvas_width (e_table);
-
-	/* When the header item is created ->height == 0,
-	   as the font is only created when everything is realized.
-	   So we set the usize here as well, so that the size of the
-	   header is correct */
-	if (GTK_WIDGET (e_table->header_canvas)->allocation.height !=
-	    E_TABLE_HEADER_ITEM (e_table->header_item)->height)
-		gtk_widget_set_usize (GTK_WIDGET (e_table->header_canvas), -1,
-				      E_TABLE_HEADER_ITEM (e_table->header_item)->height);
-}
-
-static void
-sort_info_changed (ETableSortInfo *info, ETable *et)
-{
-	gboolean will_be_grouped = e_table_sort_info_grouping_get_count(info) > 0;
-	if (et->is_grouped || will_be_grouped) {
-		et->need_rebuild = TRUE;
-		if (!et->rebuild_idle_id) {
-			gtk_object_destroy (GTK_OBJECT (et->group));
-			et->group = NULL;
-			et->rebuild_idle_id = g_idle_add_full (20, changed_idle, et, NULL);
-		}
-	}
-}
-
-static void
-e_table_setup_header (ETable *e_table)
-{
-	char *pointer;
-	e_table->header_canvas = GNOME_CANVAS (e_canvas_new ());
-	GTK_WIDGET_UNSET_FLAGS (e_table->header_canvas, GTK_CAN_FOCUS);
-
-	gtk_widget_show (GTK_WIDGET (e_table->header_canvas));
-
-	pointer = g_strdup_printf("%p", e_table);
-
-	e_table->header_item = gnome_canvas_item_new (
-		gnome_canvas_root (e_table->header_canvas),
-		e_table_header_item_get_type (),
-		"ETableHeader", e_table->header,
-		"full_header", e_table->full_header,
-		"sort_info", e_table->sort_info,
-		"dnd_code", pointer,
-		"table", e_table,
-		NULL);
-
-	g_free(pointer);
-
-	gtk_signal_connect (
-		GTK_OBJECT (e_table->header_canvas), "size_allocate",
-		GTK_SIGNAL_FUNC (header_canvas_size_allocate), e_table);
-
-	gtk_widget_set_usize (GTK_WIDGET (e_table->header_canvas), -1,
-			      E_TABLE_HEADER_ITEM (e_table->header_item)->height);
-}
-
-static gboolean
-table_canvas_reflow_idle (ETable *e_table)
-{
-	gdouble height, width;
-	gdouble item_height;
-	gdouble oldheight, oldwidth;
-	GtkAllocation *alloc = &(GTK_WIDGET (e_table->table_canvas)->allocation);
-
-	gtk_object_get (GTK_OBJECT (e_table->canvas_vbox),
-			"height", &height,
-			"width", &width,
-			NULL);
-	item_height = height;
-	height = MAX ((int)height, alloc->height);
-	width = MAX((int)width, alloc->width);
-	/* I have no idea why this needs to be -1, but it works. */
-	gnome_canvas_get_scroll_region (GNOME_CANVAS (e_table->table_canvas),
-					NULL, NULL, &oldwidth, &oldheight);
-
-	if (oldwidth != width - 1 ||
-	    oldheight != height - 1) {
-		gnome_canvas_set_scroll_region (GNOME_CANVAS (e_table->table_canvas),
-						0, 0, width - 1, height - 1);
-		set_header_canvas_width (e_table);
-	}
-	gtk_object_set (GTK_OBJECT (e_table->white_item),
-			"y1", item_height,
-			"x2", width,
-			"y2", height,
-			NULL);
-	e_table->reflow_idle_id = 0;
-	return FALSE;
-}
-
-static void
-table_canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc,
-			    ETable *e_table)
-{
-	gdouble width;
-	gdouble height;
-	gdouble item_height;
-
-	width = alloc->width;
-	gtk_object_get (GTK_OBJECT (e_table->canvas_vbox),
-			"height", &height,
-			NULL);
-	item_height = height;
-	height = MAX ((int)height, alloc->height);
-
-	gtk_object_set (GTK_OBJECT (e_table->canvas_vbox),
-			"width", width,
-			NULL);
-	gtk_object_set (GTK_OBJECT (e_table->header),
-			"width", width,
-			NULL);
-	gtk_object_set (GTK_OBJECT (e_table->white_item),
-			"y1", item_height + 1,
-			"x2", width,
-			"y2", height,
-			NULL);
-	if (e_table->reflow_idle_id)
-		g_source_remove(e_table->reflow_idle_id);
-	table_canvas_reflow_idle(e_table);
-}
-
-static void
-table_canvas_reflow (GnomeCanvas *canvas, ETable *e_table)
-{
-	if (!e_table->reflow_idle_id)
-		e_table->reflow_idle_id = g_idle_add_full (400, (GSourceFunc) table_canvas_reflow_idle, e_table, NULL);
-}
-
-static void
-click_to_add_cursor_change (ETableClickToAdd *etcta, int row, int col, ETable *et)
-{
-	if (et->cursor_loc == E_TABLE_CURSOR_LOC_TABLE) {
-		e_selection_model_clear(E_SELECTION_MODEL (et->selection));
-	}
-	et->cursor_loc = E_TABLE_CURSOR_LOC_ETCTA;
-}
-
-static void
-group_cursor_change (ETableGroup *etg, int row, ETable *et)
-{
-	ETableCursorLoc old_cursor_loc;
-
-	old_cursor_loc = et->cursor_loc;
-
-	et->cursor_loc = E_TABLE_CURSOR_LOC_TABLE;
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [CURSOR_CHANGE],
-			 row);
-
-	if (old_cursor_loc == E_TABLE_CURSOR_LOC_ETCTA && et->click_to_add)
-		e_table_click_to_add_commit(E_TABLE_CLICK_TO_ADD(et->click_to_add));
-}
-
-static void
-group_cursor_activated (ETableGroup *etg, int row, ETable *et)
-{
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [CURSOR_ACTIVATED],
-			 row);
-}
-
-static void
-group_double_click (ETableGroup *etg, int row, int col, GdkEvent *event, ETable *et)
-{
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [DOUBLE_CLICK],
-			 row, col, event);
-}
-
-static gint
-group_right_click (ETableGroup *etg, int row, int col, GdkEvent *event, ETable *et)
-{
-	int return_val = 0;
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [RIGHT_CLICK],
-			 row, col, event, &return_val);
-	return return_val;
-}
-
-static gint
-group_click (ETableGroup *etg, int row, int col, GdkEvent *event, ETable *et)
-{
-	int return_val = 0;
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [CLICK],
-			 row, col, event, &return_val);
-	return return_val;
-}
-
-static gint
-group_key_press (ETableGroup *etg, int row, int col, GdkEvent *event, ETable *et)
-{
-	int return_val = 0;
-	GdkEventKey *key = (GdkEventKey *) event;
-	int y, row_local, col_local;
-	GtkAdjustment *vadj;
-
-	switch (key->keyval) {
-	case GDK_Page_Down:
-		vadj = gtk_layout_get_vadjustment (GTK_LAYOUT (et->table_canvas));
-		y = CLAMP(vadj->value + (2 * vadj->page_size - 50), 0, vadj->upper);
-		y -= vadj->value;
-		e_table_get_cell_at (et, 30, y, &row_local, &col_local);
-		row_local = e_table_view_to_model_row (et, row_local);
-		col_local = e_selection_model_cursor_col (E_SELECTION_MODEL (et->selection));
-		e_selection_model_select_as_key_press (E_SELECTION_MODEL (et->selection), row_local, col_local, key->state);
-		return_val = 1;
-		break;
-	case GDK_Page_Up:
-		vadj = gtk_layout_get_vadjustment (GTK_LAYOUT (et->table_canvas));
-		y = CLAMP(vadj->value - (vadj->page_size - 50), 0, vadj->upper);
-		y -= vadj->value;
-		e_table_get_cell_at (et, 30, y, &row_local, &col_local);
-		row_local = e_table_view_to_model_row (et, row_local);
-		col_local = e_selection_model_cursor_col (E_SELECTION_MODEL (et->selection));
-		e_selection_model_select_as_key_press (E_SELECTION_MODEL (et->selection), row_local, col_local, key->state);
-		return_val = 1;
-		break;
-	default:
-		gtk_signal_emit (GTK_OBJECT (et),
-				 et_signals [KEY_PRESS],
-				 row, col, event, &return_val);
-		break;
-	}
-	return return_val;
-}
-
-static void
-et_table_model_changed (ETableModel *model, ETable *et)
-{
-	et->need_rebuild = TRUE;
-	if (!et->rebuild_idle_id) {
-		gtk_object_destroy (GTK_OBJECT (et->group));
-		et->group = NULL;
-		et->rebuild_idle_id = g_idle_add_full (20, changed_idle, et, NULL);
-	}
-}
-
-static void
-et_table_row_changed (ETableModel *table_model, int row, ETable *et)
-{
-	if (!et->need_rebuild) {
-		if (e_table_group_remove (et->group, row))
-			e_table_group_add (et->group, row);
-		if (et->horizontal_scrolling)
-			e_table_header_update_horizontal(et->header);
-	}
-}
-
-static void
-et_table_cell_changed (ETableModel *table_model, int view_col, int row, ETable *et)
-{
-	et_table_row_changed (table_model, row, et);
-}
-
-static void
-et_table_rows_inserted (ETableModel *table_model, int row, int count, ETable *et)
-{
-	/* This number has already been decremented. */
-	int row_count = e_table_model_row_count(table_model);
-	if (!et->need_rebuild) {
-		int i;
-		if (row != row_count - count)
-			e_table_group_increment(et->group, row, count);
-		for (i = 0; i < count; i++)
-			e_table_group_add (et->group, row + i);
-		if (et->horizontal_scrolling)
-			e_table_header_update_horizontal(et->header);
-	}
-}
-
-static void
-et_table_rows_deleted (ETableModel *table_model, int row, int count, ETable *et)
-{
-	int row_count = e_table_model_row_count(table_model);
-	if (!et->need_rebuild) {
-		int i;
-		for (i = 0; i < count; i++)
-			e_table_group_remove (et->group, row + i);
-		if (row != row_count)
-			e_table_group_decrement(et->group, row, count);
-		if (et->horizontal_scrolling)
-			e_table_header_update_horizontal(et->header);
-	}
-}
-
-static void
-et_build_groups (ETable *et)
-{
-	gboolean was_grouped = et->is_grouped;
-
-	et->is_grouped = e_table_sort_info_grouping_get_count(et->sort_info) > 0;
-
-	et->group = e_table_group_new (GNOME_CANVAS_GROUP (et->canvas_vbox),
-				       et->full_header,
-				       et->header,
-				       et->model,
-				       et->sort_info,
-				       0);
-	e_canvas_vbox_add_item(E_CANVAS_VBOX(et->canvas_vbox), GNOME_CANVAS_ITEM(et->group));
-	gnome_canvas_item_set(GNOME_CANVAS_ITEM(et->group),
-			      "alternating_row_colors", et->alternating_row_colors,
-			      "horizontal_draw_grid", et->horizontal_draw_grid,
-			      "vertical_draw_grid", et->vertical_draw_grid,
-			      "drawfocus", et->draw_focus,
-			      "cursor_mode", et->cursor_mode,
-			      "length_threshold", et->length_threshold,
-			      "selection_model", et->selection,
-			      NULL);
-
-	gtk_signal_connect (GTK_OBJECT (et->group), "cursor_change",
-			    GTK_SIGNAL_FUNC (group_cursor_change), et);
-	gtk_signal_connect (GTK_OBJECT (et->group), "cursor_activated",
-			    GTK_SIGNAL_FUNC (group_cursor_activated), et);
-	gtk_signal_connect (GTK_OBJECT (et->group), "double_click",
-			    GTK_SIGNAL_FUNC (group_double_click), et);
-	gtk_signal_connect (GTK_OBJECT (et->group), "right_click",
-			    GTK_SIGNAL_FUNC (group_right_click), et);
-	gtk_signal_connect (GTK_OBJECT (et->group), "click",
-			    GTK_SIGNAL_FUNC (group_click), et);
-	gtk_signal_connect (GTK_OBJECT (et->group), "key_press",
-			    GTK_SIGNAL_FUNC (group_key_press), et);
-
-
-	if (!(et->is_grouped) && was_grouped)
-		et_disconnect_model (et);
-
-	if (et->is_grouped && (!was_grouped)) {
-		et->table_model_change_id = gtk_signal_connect (GTK_OBJECT (et->model), "model_changed",
-								GTK_SIGNAL_FUNC (et_table_model_changed), et);
-
-		et->table_row_change_id = gtk_signal_connect (GTK_OBJECT (et->model), "model_row_changed",
-							      GTK_SIGNAL_FUNC (et_table_row_changed), et);
-
-		et->table_cell_change_id = gtk_signal_connect (GTK_OBJECT (et->model), "model_cell_changed",
-							       GTK_SIGNAL_FUNC (et_table_cell_changed), et);
-
-		et->table_rows_inserted_id = gtk_signal_connect (GTK_OBJECT (et->model), "model_rows_inserted",
-								GTK_SIGNAL_FUNC (et_table_rows_inserted), et);
-
-		et->table_rows_deleted_id = gtk_signal_connect (GTK_OBJECT (et->model), "model_rows_deleted",
-							       GTK_SIGNAL_FUNC (et_table_rows_deleted), et);
-
-	}
-
-	if (et->is_grouped)
-		e_table_fill_table (et, et->model);
-}
-
-static gboolean
-changed_idle (gpointer data)
-{
-	ETable *et = E_TABLE (data);
-
-	if (et->need_rebuild) {
-		if (et->group)
-			gtk_object_destroy (GTK_OBJECT (et->group));
-		et_build_groups(et);
-		gtk_object_set (GTK_OBJECT (et->canvas_vbox),
-				"width", (double) GTK_WIDGET (et->table_canvas)->allocation.width,
-				NULL);
-
-		if (GTK_WIDGET_REALIZED(et->table_canvas))
-			table_canvas_size_allocate (GTK_WIDGET(et->table_canvas), &GTK_WIDGET(et->table_canvas)->allocation, et);
-	}
-
-	et->need_rebuild = 0;
-	et->rebuild_idle_id = 0;
-
-	if (et->horizontal_scrolling)
-		e_table_header_update_horizontal(et->header);
-
-	return FALSE;
-}
-
-static void
-et_canvas_realize (GtkWidget *canvas, ETable *e_table)
-{
-	gnome_canvas_item_set(
-		e_table->white_item,
-		"fill_color_gdk", &GTK_WIDGET(e_table->table_canvas)->style->base[GTK_STATE_NORMAL],
-		NULL);
-}
-
-static void
-et_canvas_button_press (GtkWidget *canvas, GdkEvent *event, ETable *e_table)
-{
-	if (GTK_WIDGET_HAS_FOCUS(canvas)) {
-		GnomeCanvasItem *item = GNOME_CANVAS(canvas)->focused_item;
-
-		if (E_IS_TABLE_ITEM(item)) {
-			e_table_item_leave_edit(E_TABLE_ITEM(item));
-		}
-	}
-}
-
-static void
-e_table_setup_table (ETable *e_table, ETableHeader *full_header, ETableHeader *header,
-		     ETableModel *model)
-{
-	e_table->table_canvas = GNOME_CANVAS (e_canvas_new ());
-	gtk_signal_connect (
-		GTK_OBJECT (e_table->table_canvas), "size_allocate",
-		GTK_SIGNAL_FUNC (table_canvas_size_allocate), e_table);
-	gtk_signal_connect (
-		GTK_OBJECT (e_table->table_canvas), "focus_in_event",
-		GTK_SIGNAL_FUNC (gtk_widget_queue_draw), e_table);
-	gtk_signal_connect (
-		GTK_OBJECT (e_table->table_canvas), "focus_out_event",
-		GTK_SIGNAL_FUNC (gtk_widget_queue_draw), e_table);
-
-	gtk_signal_connect (
-		GTK_OBJECT (e_table), "drag_begin",
-		GTK_SIGNAL_FUNC (et_drag_begin), e_table);
-	gtk_signal_connect (
-		GTK_OBJECT (e_table), "drag_end",
-		GTK_SIGNAL_FUNC (et_drag_end), e_table);
-	gtk_signal_connect (
-		GTK_OBJECT (e_table), "drag_data_get",
-		GTK_SIGNAL_FUNC (et_drag_data_get), e_table);
-	gtk_signal_connect (
-		GTK_OBJECT (e_table), "drag_data_delete",
-		GTK_SIGNAL_FUNC (et_drag_data_delete), e_table);
-	gtk_signal_connect (
-		GTK_OBJECT (e_table), "drag_motion",
-		GTK_SIGNAL_FUNC (et_drag_motion), e_table);
-	gtk_signal_connect (
-		GTK_OBJECT (e_table), "drag_leave",
-		GTK_SIGNAL_FUNC (et_drag_leave), e_table);
-	gtk_signal_connect (
-		GTK_OBJECT (e_table), "drag_drop",
-		GTK_SIGNAL_FUNC (et_drag_drop), e_table);
-	gtk_signal_connect (
-		GTK_OBJECT (e_table), "drag_data_received",
-		GTK_SIGNAL_FUNC (et_drag_data_received), e_table);
-
-	gtk_signal_connect (GTK_OBJECT(e_table->table_canvas), "reflow",
-			    GTK_SIGNAL_FUNC (table_canvas_reflow), e_table);
-
-	gtk_widget_show (GTK_WIDGET (e_table->table_canvas));
-
-
-	e_table->white_item = gnome_canvas_item_new(
-		gnome_canvas_root(e_table->table_canvas),
-		gnome_canvas_rect_get_type(),
-		"x1", (double) 0,
-		"y1", (double) 0,
-		"x2", (double) 100,
-		"y2", (double) 100,
-		"fill_color_gdk", &GTK_WIDGET(e_table->table_canvas)->style->base[GTK_STATE_NORMAL],
-		NULL);
-
-	gtk_signal_connect (
-		GTK_OBJECT(e_table->table_canvas), "realize",
-		GTK_SIGNAL_FUNC(et_canvas_realize), e_table);
-	gtk_signal_connect (
-		GTK_OBJECT(e_table->table_canvas), "button_press_event",
-		GTK_SIGNAL_FUNC(et_canvas_button_press), e_table);
-	e_table->canvas_vbox = gnome_canvas_item_new(
-		gnome_canvas_root(e_table->table_canvas),
-		e_canvas_vbox_get_type(),
-		"spacing", 10.0,
-		NULL);
-
-	if (e_table->use_click_to_add) {
-		e_table->click_to_add = gnome_canvas_item_new (
-			GNOME_CANVAS_GROUP(e_table->canvas_vbox),
-			e_table_click_to_add_get_type (),
-			"header", e_table->header,
-			"model", e_table->model,
-			"message", e_table->click_to_add_message,
-			NULL);
-
-		e_canvas_vbox_add_item (
-			E_CANVAS_VBOX(e_table->canvas_vbox),
-			e_table->click_to_add);
-		gtk_signal_connect (
-			GTK_OBJECT (e_table->click_to_add), "cursor_change",
-			GTK_SIGNAL_FUNC(click_to_add_cursor_change), e_table);
-	}
-
-	et_build_groups(e_table);
-}
-
-static void
-e_table_fill_table (ETable *e_table, ETableModel *model)
-{
-	e_table_group_add_all (e_table->group);
-}
-
-void
-e_table_set_state_object(ETable *e_table, ETableState *state)
-{
-	if (e_table->header)
-		gtk_object_unref(GTK_OBJECT(e_table->header));
-	e_table->header = e_table_state_to_header (GTK_WIDGET(e_table), e_table->full_header, state);
-
-	gtk_object_set (GTK_OBJECT (e_table->header),
-			"width", (double) (GTK_WIDGET(e_table->table_canvas)->allocation.width),
-			NULL);
-
-	if (e_table->sort_info) {
-		if (e_table->group_info_change_id)
-			gtk_signal_disconnect (GTK_OBJECT (e_table->sort_info),
-					       e_table->group_info_change_id);
-		gtk_object_unref(GTK_OBJECT(e_table->sort_info));
-	}
-	if (state->sort_info) {
-		e_table->sort_info = e_table_sort_info_duplicate(state->sort_info);
-		e_table->group_info_change_id =
-			gtk_signal_connect (GTK_OBJECT (e_table->sort_info),
-					    "group_info_changed",
-					    GTK_SIGNAL_FUNC (sort_info_changed),
-					    e_table);
-	}
-	else
-		e_table->sort_info = NULL;
-
-	if (e_table->sorter)
-		gtk_object_set(GTK_OBJECT(e_table->sorter),
-			       "sort_info", e_table->sort_info,
-			       NULL);
-	if (e_table->header_item)
-		gtk_object_set(GTK_OBJECT(e_table->header_item),
-			       "ETableHeader", e_table->header,
-			       "sort_info", e_table->sort_info,
-			       NULL);
-	if (e_table->click_to_add)
-		gtk_object_set(GTK_OBJECT(e_table->click_to_add),
-			       "header", e_table->header,
-			       NULL);
-
-	e_table->need_rebuild = TRUE;
-	if (!e_table->rebuild_idle_id)
-		e_table->rebuild_idle_id = g_idle_add_full (20, changed_idle, e_table, NULL);
-}
-
-/**
- * e_table_set_state:
- * @e_table: %ETable object that will be modified
- * @state_str: a string with the XML representation of the ETableState.
- *
- * This routine sets the state (as described by %ETableState) of the
- * %ETable object.
- */
-void
-e_table_set_state (ETable      *e_table,
-		   const gchar *state_str)
-{
-	ETableState *state;
-
-	g_return_if_fail(e_table != NULL);
-	g_return_if_fail(E_IS_TABLE(e_table));
-	g_return_if_fail(state_str != NULL);
-
-	state = e_table_state_new();
-	e_table_state_load_from_string(state, state_str);
-
-	if (state->col_count > 0)
-		e_table_set_state_object(e_table, state);
-
-	gtk_object_unref(GTK_OBJECT(state));
-}
-
-/**
- * e_table_load_state:
- * @e_table: %ETable object that will be modified
- * @filename: name of the file containing the state to be loaded into the %ETable
- *
- * An %ETableState will be loaded form the file pointed by @filename into the
- * @e_table object.
- */
-void
-e_table_load_state (ETable      *e_table,
-		    const gchar *filename)
-{
-	ETableState *state;
-
-	g_return_if_fail(e_table != NULL);
-	g_return_if_fail(E_IS_TABLE(e_table));
-	g_return_if_fail(filename != NULL);
-
-	state = e_table_state_new();
-	e_table_state_load_from_file(state, filename);
-
-	if (state->col_count > 0)
-		e_table_set_state_object(e_table, state);
-
-	gtk_object_unref(GTK_OBJECT(state));
-}
-
-/**
- * e_table_get_state_object:
- * @e_table: %ETable object that will be modified
- *
- * Returns: the %ETableState object that encapsulates the current
- * state of the @e_table object
- */
-ETableState *
-e_table_get_state_object (ETable *e_table)
-{
-	ETableState *state;
-	int full_col_count;
-	int i, j;
-
-	state = e_table_state_new();
-	state->sort_info = e_table->sort_info;
-	gtk_object_ref(GTK_OBJECT(state->sort_info));
-
-
-	state->col_count = e_table_header_count (e_table->header);
-	full_col_count = e_table_header_count (e_table->full_header);
-	state->columns = g_new(int, state->col_count);
-	state->expansions = g_new(double, state->col_count);
-	for (i = 0; i < state->col_count; i++) {
-		ETableCol *col = e_table_header_get_column(e_table->header, i);
-		state->columns[i] = -1;
-		for (j = 0; j < full_col_count; j++) {
-			if (col->col_idx == e_table_header_index(e_table->full_header, j)) {
-				state->columns[i] = j;
-				break;
-			}
-		}
-		state->expansions[i] = col->expansion;
-	}
-
-	return state;
-}
-
-gchar          *e_table_get_state                 (ETable               *e_table)
-{
-	ETableState *state;
-	gchar *string;
-
-	state = e_table_get_state_object(e_table);
-	string = e_table_state_save_to_string(state);
-	gtk_object_unref(GTK_OBJECT(state));
-	return string;
-}
-
-/**
- * e_table_save_state:
- * @e_table: %ETable object that will be modified
- * @filename: name of the file containing the state to be loaded into the %ETable
- *
- * This routine saves the state of the @e_table object into the file pointed
- * by @filename
- */
-void
-e_table_save_state (ETable      *e_table,
-		    const gchar *filename)
-{
-	ETableState *state;
-
-	state = e_table_get_state_object(e_table);
-	e_table_state_save_to_file(state, filename);
-	gtk_object_unref(GTK_OBJECT(state));
-}
-
-static void
-et_selection_model_selection_change (ETableGroup *etg, ETable *et)
-{
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [SELECTION_CHANGE]);
-}
-
-static ETable *
-et_real_construct (ETable *e_table, ETableModel *etm, ETableExtras *ete,
-		   ETableSpecification *specification, ETableState *state)
-{
-	int row = 0;
-
-	if (ete)
-		gtk_object_ref(GTK_OBJECT(ete));
-	else
-		ete = e_table_extras_new();
-
-	e_table->use_click_to_add = specification->click_to_add;
-	e_table->click_to_add_message = e_utf8_from_locale_string (gettext (specification->click_to_add_message));
-	e_table->alternating_row_colors = specification->alternating_row_colors;
-	e_table->horizontal_draw_grid = specification->horizontal_draw_grid;
-	e_table->vertical_draw_grid = specification->vertical_draw_grid;
-	e_table->draw_focus = specification->draw_focus;
-	e_table->cursor_mode = specification->cursor_mode;
-	e_table->full_header = e_table_spec_to_full_header(specification, ete);
-
-	gtk_object_set(GTK_OBJECT(e_table->selection),
-		       "selection_mode", specification->selection_mode,
-		       "cursor_mode", specification->cursor_mode,
-		       NULL);
-
-	e_table->model = etm;
-	gtk_object_ref (GTK_OBJECT (etm));
-
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-
-	e_table->header = e_table_state_to_header (GTK_WIDGET(e_table), e_table->full_header, state);
-	e_table->horizontal_scrolling = specification->horizontal_scrolling;
-
-	e_table->sort_info = state->sort_info;
-	gtk_object_ref (GTK_OBJECT (state->sort_info));
-
-	e_table->group_info_change_id =
-		gtk_signal_connect (GTK_OBJECT (e_table->sort_info), "group_info_changed",
-				    GTK_SIGNAL_FUNC (sort_info_changed), e_table);
-
-
-	gtk_object_set(GTK_OBJECT(e_table->header),
-		       "sort_info", e_table->sort_info,
-		       NULL);
-
-	e_table->sorter = e_table_sorter_new(etm, e_table->full_header, e_table->sort_info);
-
-	gtk_object_set (GTK_OBJECT (e_table->selection),
-			"model", etm,
-			"sorter", e_table->sorter,
-			NULL);
-
-	gtk_signal_connect(GTK_OBJECT(e_table->selection), "selection_changed",
-			   GTK_SIGNAL_FUNC(et_selection_model_selection_change), e_table);
-
-	if (!specification->no_headers) {
-		e_table_setup_header (e_table);
-	}
-	e_table_setup_table (e_table, e_table->full_header, e_table->header, etm);
-	e_table_fill_table (e_table, etm);
-
-	gtk_layout_get_vadjustment (GTK_LAYOUT (e_table->table_canvas))->step_increment = 20;
-	gtk_adjustment_changed(gtk_layout_get_vadjustment (GTK_LAYOUT (e_table->table_canvas)));
-
-	if (!specification->no_headers) {
-		/*
-		 * The header
-		 */
-		gtk_table_attach (GTK_TABLE (e_table), GTK_WIDGET (e_table->header_canvas),
-				  0, 1, 0 + row, 1 + row,
-				  GTK_FILL | GTK_EXPAND,
-				  GTK_FILL, 0, 0);
-		row ++;
-	}
-	gtk_table_attach (GTK_TABLE (e_table), GTK_WIDGET (e_table->table_canvas),
-			  0, 1, 0 + row, 1 + row,
-			  GTK_FILL | GTK_EXPAND,
-			  GTK_FILL | GTK_EXPAND,
-			  0, 0);
-
-	gtk_widget_pop_colormap ();
-	gtk_widget_pop_visual ();
-
-	gtk_object_unref(GTK_OBJECT(ete));
-
-	return e_table;
-}
-
-ETable *
-e_table_construct (ETable *e_table, ETableModel *etm, ETableExtras *ete,
-		   const char *spec_str, const char *state_str)
-{
-	ETableSpecification *specification;
-	ETableState *state;
-
-	g_return_val_if_fail(e_table != NULL, NULL);
-	g_return_val_if_fail(E_IS_TABLE(e_table), NULL);
-	g_return_val_if_fail(etm != NULL, NULL);
-	g_return_val_if_fail(E_IS_TABLE_MODEL(etm), NULL);
-	g_return_val_if_fail(ete == NULL || E_IS_TABLE_EXTRAS(ete), NULL);
-	g_return_val_if_fail(spec_str != NULL, NULL);
-
-	specification = e_table_specification_new();
-	e_table_specification_load_from_string(specification, spec_str);
-	if (state_str) {
-		state = e_table_state_new();
-		e_table_state_load_from_string(state, state_str);
-		if (state->col_count <= 0) {
-			gtk_object_unref(GTK_OBJECT(state));
-			state = specification->state;
-			gtk_object_ref(GTK_OBJECT(state));
-		}
-	} else {
-		state = specification->state;
-		gtk_object_ref(GTK_OBJECT(state));
-	}
-
-	e_table = et_real_construct (e_table, etm, ete, specification, state);
-
-	e_table->spec = specification;
-	gtk_object_unref(GTK_OBJECT(state));
-
-	return e_table;
-}
-
-ETable *
-e_table_construct_from_spec_file (ETable *e_table, ETableModel *etm, ETableExtras *ete,
-				  const char *spec_fn, const char *state_fn)
-{
-	ETableSpecification *specification;
-	ETableState *state;
-
-	g_return_val_if_fail(e_table != NULL, NULL);
-	g_return_val_if_fail(E_IS_TABLE(e_table), NULL);
-	g_return_val_if_fail(etm != NULL, NULL);
-	g_return_val_if_fail(E_IS_TABLE_MODEL(etm), NULL);
-	g_return_val_if_fail(ete == NULL || E_IS_TABLE_EXTRAS(ete), NULL);
-	g_return_val_if_fail(spec_fn != NULL, NULL);
-
-	specification = e_table_specification_new();
-	if (!e_table_specification_load_from_file(specification, spec_fn)) {
-		gtk_object_unref(GTK_OBJECT(specification));
-		return NULL;
-	}
-
-	if (state_fn) {
-		state = e_table_state_new();
-		if (!e_table_state_load_from_file(state, state_fn)) {
-			gtk_object_unref(GTK_OBJECT(state));
-			state = specification->state;
-			gtk_object_ref(GTK_OBJECT(state));
-		}
-		if (state->col_count <= 0) {
-			gtk_object_unref(GTK_OBJECT(state));
-			state = specification->state;
-			gtk_object_ref(GTK_OBJECT(state));
-		}
-	} else {
-		state = specification->state;
-		gtk_object_ref(GTK_OBJECT(state));
-	}
-
-	e_table = et_real_construct (e_table, etm, ete, specification, state);
-
-	e_table->spec = specification;
-	gtk_object_unref(GTK_OBJECT(state));
-
-	return e_table;
-}
-
-GtkWidget *
-e_table_new (ETableModel *etm, ETableExtras *ete, const char *spec, const char *state)
-{
-	ETable *e_table;
-
-	g_return_val_if_fail(etm != NULL, NULL);
-	g_return_val_if_fail(E_IS_TABLE_MODEL(etm), NULL);
-	g_return_val_if_fail(ete == NULL || E_IS_TABLE_EXTRAS(ete), NULL);
-	g_return_val_if_fail(spec != NULL, NULL);
-
-	e_table = gtk_type_new (e_table_get_type ());
-
-	e_table = e_table_construct (e_table, etm, ete, spec, state);
-
-	return GTK_WIDGET (e_table);
-}
-
-GtkWidget *
-e_table_new_from_spec_file (ETableModel *etm, ETableExtras *ete, const char *spec_fn, const char *state_fn)
-{
-	ETable *e_table;
-
-	g_return_val_if_fail(etm != NULL, NULL);
-	g_return_val_if_fail(E_IS_TABLE_MODEL(etm), NULL);
-	g_return_val_if_fail(ete == NULL || E_IS_TABLE_EXTRAS(ete), NULL);
-	g_return_val_if_fail(spec_fn != NULL, NULL);
-
-	e_table = gtk_type_new (e_table_get_type ());
-
-	e_table = e_table_construct_from_spec_file (e_table, etm, ete, spec_fn, state_fn);
-
-	return GTK_WIDGET (e_table);
-}
-
-#if 0
-static xmlNode *
-et_build_column_spec (ETable *e_table)
-{
-	xmlNode *columns_shown;
-	gint i;
-	gint col_count;
-
-	columns_shown = xmlNewNode (NULL, "columns-shown");
-
-	col_count = e_table_header_count (e_table->header);
-	for (i = 0; i < col_count; i++){
-		gchar *text = g_strdup_printf ("%d", e_table_header_index(e_table->header, i));
-		xmlNewChild (columns_shown, NULL, "column", text);
-		g_free (text);
-	}
-
-	return columns_shown;
-}
-
-static xmlNode *
-et_build_grouping_spec (ETable *e_table)
-{
-	xmlNode *node;
-	xmlNode *grouping;
-	int i;
-	const int sort_count = e_table_sort_info_sorting_get_count (e_table->sort_info);
-	const int group_count = e_table_sort_info_grouping_get_count (e_table->sort_info);
-
-	grouping = xmlNewNode (NULL, "grouping");
-	node = grouping;
-
-	for (i = 0; i < group_count; i++) {
-		ETableSortColumn column = e_table_sort_info_grouping_get_nth(e_table->sort_info, i);
-		xmlNode *new_node = xmlNewChild(node, NULL, "group", NULL);
-
-		e_xml_set_integer_prop_by_name (new_node, "column", column.column);
-		e_xml_set_integer_prop_by_name (new_node, "ascending", column.ascending);
-		node = new_node;
-	}
-
-	for (i = 0; i < sort_count; i++) {
-		ETableSortColumn column = e_table_sort_info_sorting_get_nth(e_table->sort_info, i);
-		xmlNode *new_node = xmlNewChild(node, NULL, "leaf", NULL);
-
-		e_xml_set_integer_prop_by_name (new_node, "column", column.column);
-		e_xml_set_integer_prop_by_name (new_node, "ascending", column.ascending);
-		node = new_node;
-	}
-
-	return grouping;
-}
-
-static xmlDoc *
-et_build_tree (ETable *e_table)
-{
-	xmlDoc *doc;
-	xmlNode *root;
-
-	doc = xmlNewDoc ("1.0");
-	if (doc == NULL)
-		return NULL;
-
-	root = xmlNewDocNode (doc, NULL, "ETableSpecification", NULL);
-	xmlDocSetRootElement (doc, root);
-	xmlAddChild (root, et_build_column_spec (e_table));
-	xmlAddChild (root, et_build_grouping_spec (e_table));
-
-	return doc;
-}
-
-gchar *
-e_table_get_specification (ETable *e_table)
-{
-	xmlDoc *doc;
-	xmlChar *buffer;
-	gint size;
-
-	g_return_val_if_fail(e_table != NULL, NULL);
-	g_return_val_if_fail(E_IS_TABLE(e_table), NULL);
-
-	doc = et_build_tree (e_table);
-	xmlDocDumpMemory (doc, &buffer, &size);
-	xmlFreeDoc (doc);
-
-	return buffer;
-}
-
-int
-e_table_set_specification (ETable *e_table, const char *spec)
-{
-	xmlDoc *xmlSpec;
-	int ret;
-
-	g_return_val_if_fail(e_table != NULL, -1);
-	g_return_val_if_fail(E_IS_TABLE(e_table), -1);
-	g_return_val_if_fail(spec != NULL, -1);
-
-	/* doesn't work yet, sigh */
-	xmlSpec = xmlParseMemory ((char *)spec, strlen(spec));
-	ret = et_real_set_specification(e_table, xmlSpec);
-	xmlFreeDoc (xmlSpec);
-
-	return ret;
-}
-
-void
-e_table_save_specification (ETable *e_table, gchar *filename)
-{
-	xmlDoc *doc = et_build_tree (e_table);
-
-	g_return_if_fail(e_table != NULL);
-	g_return_if_fail(E_IS_TABLE(e_table));
-	g_return_if_fail(filename != NULL);
-
-	xmlSaveFile (filename, doc);
-	xmlFreeDoc (doc);
-}
-
-int
-e_table_load_specification (ETable *e_table, gchar *filename)
-{
-	xmlDoc *xmlSpec;
-	int ret;
-
-	g_return_val_if_fail(e_table != NULL, -1);
-	g_return_val_if_fail(E_IS_TABLE(e_table), -1);
-	g_return_val_if_fail(filename != NULL, -1);
-
-	/* doesn't work yet, yay */
-	xmlSpec = xmlParseFile (filename);
-	ret = et_real_set_specification(e_table, xmlSpec);
-	xmlFreeDoc (xmlSpec);
-
-	return ret;
-}
-#endif
-
-void
-e_table_set_cursor_row (ETable *e_table, int row)
-{
-	g_return_if_fail(e_table != NULL);
-	g_return_if_fail(E_IS_TABLE(e_table));
-	g_return_if_fail(row >= 0);
-
-	gtk_object_set(GTK_OBJECT(e_table->selection),
-		       "cursor_row", row,
-		       NULL);
-}
-
-int
-e_table_get_cursor_row (ETable *e_table)
-{
-	int row;
-	g_return_val_if_fail(e_table != NULL, -1);
-	g_return_val_if_fail(E_IS_TABLE(e_table), -1);
-
-	gtk_object_get(GTK_OBJECT(e_table->selection),
-		       "cursor_row", &row,
-		       NULL);
-	return row;
-}
-
-void
-e_table_selected_row_foreach     (ETable *e_table,
-				  EForeachFunc callback,
-				  gpointer closure)
-{
-	g_return_if_fail(e_table != NULL);
-	g_return_if_fail(E_IS_TABLE(e_table));
-
-	e_selection_model_foreach(E_SELECTION_MODEL (e_table->selection),
-						     callback,
-						     closure);
-}
-
-gint
-e_table_selected_count     (ETable *e_table)
-{
-	g_return_val_if_fail(e_table != NULL, -1);
-	g_return_val_if_fail(E_IS_TABLE(e_table), -1);
-
-	return e_selection_model_selected_count(E_SELECTION_MODEL (e_table->selection));
-}
-
-void
-e_table_select_all (ETable *table)
-{
-	g_return_if_fail (table != NULL);
-	g_return_if_fail (E_IS_TABLE (table));
-
-	e_selection_model_select_all (E_SELECTION_MODEL (table->selection));
-}
-
-void
-e_table_invert_selection (ETable *table)
-{
-	g_return_if_fail (table != NULL);
-	g_return_if_fail (E_IS_TABLE (table));
-
-	e_selection_model_invert_selection (E_SELECTION_MODEL (table->selection));
-}
-
-
-EPrintable *
-e_table_get_printable (ETable *e_table)
-{
-	g_return_val_if_fail(e_table != NULL, NULL);
-	g_return_val_if_fail(E_IS_TABLE(e_table), NULL);
-
-	return e_table_group_get_printable(e_table->group);
-}
-
-static void
-et_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ETable *etable = E_TABLE (o);
-
-	switch (arg_id){
-	case ARG_MODEL:
-		GTK_VALUE_OBJECT (*arg) = (GtkObject *) etable->model;
-		break;
-
-	default:
-		break;
-	}
-}
-
-typedef struct {
-	char     *arg;
-	gboolean  setting;
-} bool_closure;
-
-static void
-et_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ETable *etable = E_TABLE (o);
-
-	switch (arg_id){
-	case ARG_LENGTH_THRESHOLD:
-		etable->length_threshold = GTK_VALUE_INT (*arg);
-		if (etable->group) {
-			gnome_canvas_item_set (GNOME_CANVAS_ITEM(etable->group),
-					       "length_threshold", GTK_VALUE_INT (*arg),
-					       NULL);
-		}
-		break;
-
-	}
-}
-
-static void
-set_scroll_adjustments   (ETable *table,
-			  GtkAdjustment *hadjustment,
-			  GtkAdjustment *vadjustment)
-{
-	if (vadjustment != NULL) {
-		vadjustment->step_increment = 20;
-		gtk_adjustment_changed(vadjustment);
-	}
-
-	gtk_layout_set_hadjustment (GTK_LAYOUT(table->table_canvas),
-				    hadjustment);
-	gtk_layout_set_vadjustment (GTK_LAYOUT(table->table_canvas),
-				    vadjustment);
-
-	if (table->header_canvas != NULL)
-		gtk_layout_set_hadjustment (GTK_LAYOUT(table->header_canvas),
-					    hadjustment);
-}
-
-gint
-e_table_get_next_row      (ETable *e_table,
-			   gint    model_row)
-{
-	g_return_val_if_fail(e_table != NULL, -1);
-	g_return_val_if_fail(E_IS_TABLE(e_table), -1);
-
-	if (e_table->sorter) {
-		int i;
-		i = e_sorter_model_to_sorted(E_SORTER (e_table->sorter), model_row);
-		i++;
-		if (i < e_table_model_row_count(e_table->model)) {
-			return e_sorter_sorted_to_model(E_SORTER (e_table->sorter), i);
-		} else
-			return -1;
-	} else
-		if (model_row < e_table_model_row_count(e_table->model) - 1)
-			return model_row + 1;
-		else
-			return -1;
-}
-
-gint
-e_table_get_prev_row      (ETable *e_table,
-			   gint    model_row)
-{
-	g_return_val_if_fail(e_table != NULL, -1);
-	g_return_val_if_fail(E_IS_TABLE(e_table), -1);
-
-	if (e_table->sorter) {
-		int i;
-		i = e_sorter_model_to_sorted(E_SORTER (e_table->sorter), model_row);
-		i--;
-		if (i >= 0)
-			return e_sorter_sorted_to_model(E_SORTER (e_table->sorter), i);
-		else
-			return -1;
-	} else
-		return model_row - 1;
-}
-
-gint
-e_table_model_to_view_row        (ETable *e_table,
-				  gint    model_row)
-{
-	g_return_val_if_fail(e_table != NULL, -1);
-	g_return_val_if_fail(E_IS_TABLE(e_table), -1);
-
-	if (e_table->sorter)
-		return e_sorter_model_to_sorted(E_SORTER (e_table->sorter), model_row);
-	else
-		return model_row;
-}
-
-gint
-e_table_view_to_model_row        (ETable *e_table,
-				  gint    view_row)
-{
-	g_return_val_if_fail(e_table != NULL, -1);
-	g_return_val_if_fail(E_IS_TABLE(e_table), -1);
-
-	if (e_table->sorter)
-		return e_sorter_sorted_to_model (E_SORTER (e_table->sorter), view_row);
-	else
-		return view_row;
-}
-
-/**
- * e_table_get_cell_at:
- * @table: An ETable widget
- * @x: X coordinate for the pixel
- * @y: Y coordinate for the pixel
- * @row_return: Pointer to return the row value
- * @col_return: Pointer to return the column value
- * 
- * Return the row and column for the cell in which the pixel at (@x, @y) is
- * contained.
- **/
-void
-e_table_get_cell_at (ETable *table,
-		     int x, int y,
-		     int *row_return, int *col_return)
-{
-	g_return_if_fail (table != NULL);
-	g_return_if_fail (E_IS_TABLE (table));
-	g_return_if_fail (row_return != NULL);
-	g_return_if_fail (col_return != NULL);
-
-	/* FIXME it would be nice if it could handle a NULL row_return or
-	 * col_return gracefully.  */
-
-	x += GTK_LAYOUT(table->table_canvas)->hadjustment->value;
-	y += GTK_LAYOUT(table->table_canvas)->vadjustment->value;
-	e_table_group_compute_location(table->group, &x, &y, row_return, col_return);
-}
-
-/**
- * e_table_get_cell_geometry:
- * @table: The table.
- * @row: The row to get the geometry of.
- * @col: The col to get the geometry of.
- * @x_return: Returns the x coordinate of the upper right hand corner of the cell with respect to the widget.
- * @y_return: Returns the y coordinate of the upper right hand corner of the cell with respect to the widget.
- * @width_return: Returns the width of the cell.
- * @height_return: Returns the height of the cell.
- * 
- * Computes the data about this cell.
- **/
-void
-e_table_get_cell_geometry (ETable *table,
-			   int row, int col,
-			   int *x_return, int *y_return,
-			   int *width_return, int *height_return)
-{
-	g_return_if_fail (table != NULL);
-	g_return_if_fail (E_IS_TABLE (table));
-
-	/* FIXME it would be nice if it could handle a NULL row_return or
-	 * col_return gracefully.  */
-
-	e_table_group_get_cell_geometry(table->group, &row, &col, x_return, y_return, width_return, height_return);
-
-	if (x_return)
-		(*x_return) -= GTK_LAYOUT(table->table_canvas)->hadjustment->value;
-	if (y_return) {
-		(*y_return) -= GTK_LAYOUT(table->table_canvas)->vadjustment->value;
-		(*y_return) += GTK_WIDGET(table->header_canvas)->allocation.height;
-	}
-}
-
-struct _ETableDragSourceSite
-{
-	GdkModifierType    start_button_mask;
-	GtkTargetList     *target_list;        /* Targets for drag data */
-	GdkDragAction      actions;            /* Possible actions */
-	GdkColormap       *colormap;	         /* Colormap for drag icon */
-	GdkPixmap         *pixmap;             /* Icon for drag data */
-	GdkBitmap         *mask;
-
-	/* Stored button press information to detect drag beginning */
-	gint               state;
-	gint               x, y;
-	gint               row, col;
-};
-
-typedef enum
-{
-  GTK_DRAG_STATUS_DRAG,
-  GTK_DRAG_STATUS_WAIT,
-  GTK_DRAG_STATUS_DROP
-} GtkDragStatus;
-
-typedef struct _GtkDragDestInfo GtkDragDestInfo;
-typedef struct _GtkDragSourceInfo GtkDragSourceInfo;
-
-struct _GtkDragDestInfo
-{
-  GtkWidget         *widget;	   /* Widget in which drag is in */
-  GdkDragContext    *context;	   /* Drag context */
-  GtkDragSourceInfo *proxy_source; /* Set if this is a proxy drag */
-  GtkSelectionData  *proxy_data;   /* Set while retrieving proxied data */
-  gboolean           dropped : 1;     /* Set after we receive a drop */
-  guint32            proxy_drop_time; /* Timestamp for proxied drop */
-  gboolean           proxy_drop_wait : 1; /* Set if we are waiting for a
-					   * status reply before sending
-					   * a proxied drop on.
-					   */
-  gint               drop_x, drop_y; /* Position of drop */
-};
-
-struct _GtkDragSourceInfo
-{
-  GtkWidget         *widget;
-  GtkTargetList     *target_list; /* Targets for drag data */
-  GdkDragAction      possible_actions; /* Actions allowed by source */
-  GdkDragContext    *context;	  /* drag context */
-  GtkWidget         *icon_window; /* Window for drag */
-  GtkWidget         *ipc_widget;  /* GtkInvisible for grab, message passing */
-  GdkCursor         *cursor;	  /* Cursor for drag */
-  gint hot_x, hot_y;		  /* Hot spot for drag */
-  gint button;			  /* mouse button starting drag */
-
-  GtkDragStatus      status;	  /* drag status */
-  GdkEvent          *last_event;  /* motion event waiting for response */
-
-  gint               start_x, start_y; /* Initial position */
-  gint               cur_x, cur_y;     /* Current Position */
-
-  GList             *selections;  /* selections we've claimed */
-
-  GtkDragDestInfo   *proxy_dest;  /* Set if this is a proxy drag */
-
-  guint              drop_timeout;     /* Timeout for aborting drop */
-  guint              destroy_icon : 1; /* If true, destroy icon_window
-					*/
-};
-
-/* Drag & drop stuff. */
-/* Target */
-void
-e_table_drag_get_data (ETable         *table,
-		       int             row,
-		       int             col,
-		       GdkDragContext *context,
-		       GdkAtom         target,
-		       guint32         time)
-{
-	g_return_if_fail(table != NULL);
-	g_return_if_fail(E_IS_TABLE(table));
-
-	table->drag_get_data_row = row;
-	table->drag_get_data_col = col;
-	gtk_drag_get_data(GTK_WIDGET(table),
-			  context,
-			  target,
-			  time);
-
-}
-
-/**
- * e_table_drag_highlight:
- * @table:
- * @row:
- * @col:
- *
- * Set col to -1 to highlight the entire row.
- */
-void
-e_table_drag_highlight (ETable *table,
-			int     row,
-			int     col)
-{
-	g_return_if_fail(table != NULL);
-	g_return_if_fail(E_IS_TABLE(table));
-}
-
-void
-e_table_drag_unhighlight (ETable *table)
-{
-	g_return_if_fail(table != NULL);
-	g_return_if_fail(E_IS_TABLE(table));
-}
-
-void e_table_drag_dest_set   (ETable               *table,
-			      GtkDestDefaults       flags,
-			      const GtkTargetEntry *targets,
-			      gint                  n_targets,
-			      GdkDragAction         actions)
-{
-	g_return_if_fail(table != NULL);
-	g_return_if_fail(E_IS_TABLE(table));
-
-	gtk_drag_dest_set(GTK_WIDGET(table),
-			  flags,
-			  targets,
-			  n_targets,
-			  actions);
-}
-
-void e_table_drag_dest_set_proxy (ETable         *table,
-				  GdkWindow      *proxy_window,
-				  GdkDragProtocol protocol,
-				  gboolean        use_coordinates)
-{
-	g_return_if_fail(table != NULL);
-	g_return_if_fail(E_IS_TABLE(table));
-
-	gtk_drag_dest_set_proxy(GTK_WIDGET(table),
-				proxy_window,
-				protocol,
-				use_coordinates);
-}
-
-/*
- * There probably should be functions for setting the targets
- * as a GtkTargetList
- */
-
-void
-e_table_drag_dest_unset (GtkWidget *widget)
-{
-	g_return_if_fail(widget != NULL);
-	g_return_if_fail(E_IS_TABLE(widget));
-
-	gtk_drag_dest_unset(widget);
-}
-
-/* Source side */
-
-void
-e_table_drag_source_set  (ETable               *table,
-			  GdkModifierType       start_button_mask,
-			  const GtkTargetEntry *targets,
-			  gint                  n_targets,
-			  GdkDragAction         actions)
-{
-	ETableDragSourceSite *site;
-	GtkWidget *canvas;
-
-	g_return_if_fail(table != NULL);
-	g_return_if_fail(E_IS_TABLE(table));
-
-	canvas = GTK_WIDGET(table->table_canvas);
-	site = table->site;
-
-	gtk_widget_add_events (canvas,
-			       gtk_widget_get_events (canvas) |
-			       GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
-			       GDK_BUTTON_MOTION_MASK | GDK_STRUCTURE_MASK);
-
-	if (site) {
-		if (site->target_list)
-			gtk_target_list_unref (site->target_list);
-	} else {
-		site = g_new0 (ETableDragSourceSite, 1);
-
-		table->drag_source_button_press_event_id =
-			gtk_signal_connect (GTK_OBJECT (canvas), "button_press_event",
-					    GTK_SIGNAL_FUNC (e_table_drag_source_event_cb),
-					    table);
-		table->drag_source_motion_notify_event_id =
-			gtk_signal_connect (GTK_OBJECT (canvas), "motion_notify_event",
-					    GTK_SIGNAL_FUNC (e_table_drag_source_event_cb),
-					    table);
-
-		table->site = site;
-	}
-
-	site->start_button_mask = start_button_mask;
-
-	if (targets)
-		site->target_list = gtk_target_list_new (targets, n_targets);
-	else
-		site->target_list = NULL;
-
-	site->actions = actions;
-}
-
-void
-e_table_drag_source_unset (ETable *table)
-{
-	ETableDragSourceSite *site;
-
-	g_return_if_fail (table != NULL);
-	g_return_if_fail (E_IS_TABLE(table));
-
-	site = table->site;
-
-	if (site) {
-		gtk_signal_disconnect (
-			GTK_OBJECT (table->table_canvas),
-			table->drag_source_button_press_event_id);
-		gtk_signal_disconnect (
-			GTK_OBJECT (table->table_canvas),
-			table->drag_source_motion_notify_event_id);
-		g_free (site);
-		table->site = NULL;
-	}
-}
-
-/* There probably should be functions for setting the targets
- * as a GtkTargetList
- */
-
-GdkDragContext *
-e_table_drag_begin (ETable            *table,
-		    int     	       row,
-		    int     	       col,
-		    GtkTargetList     *targets,
-		    GdkDragAction      actions,
-		    gint               button,
-		    GdkEvent          *event)
-{
-	g_return_val_if_fail (table != NULL, NULL);
-	g_return_val_if_fail (E_IS_TABLE(table), NULL);
-
-	table->drag_row = row;
-	table->drag_col = col;
-
-	return gtk_drag_begin(GTK_WIDGET(table),
-			      targets,
-			      actions,
-			      button,
-			      event);
-}
-
-static void
-et_drag_begin (GtkWidget *widget,
-	       GdkDragContext *context,
-	       ETable *et)
-{
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [TABLE_DRAG_BEGIN],
-			 et->drag_row,
-			 et->drag_col,
-			 context);
-}
-
-static void
-et_drag_end (GtkWidget *widget,
-	     GdkDragContext *context,
-	     ETable *et)
-{
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [TABLE_DRAG_END],
-			 et->drag_row,
-			 et->drag_col,
-			 context);
-}
-
-static void
-et_drag_data_get(GtkWidget *widget,
-		 GdkDragContext *context,
-		 GtkSelectionData *selection_data,
-		 guint info,
-		 guint time,
-		 ETable *et)
-{
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [TABLE_DRAG_DATA_GET],
-			 et->drag_row,
-			 et->drag_col,
-			 context,
-			 selection_data,
-			 info,
-			 time);
-}
-
-static void
-et_drag_data_delete(GtkWidget *widget,
-		    GdkDragContext *context,
-		    ETable *et)
-{
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [TABLE_DRAG_DATA_DELETE],
-			 et->drag_row,
-			 et->drag_col,
-			 context);
-}
-
-static void
-et_drag_leave(GtkWidget *widget,
-	      GdkDragContext *context,
-	      guint time,
-	      ETable *et)
-{
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [TABLE_DRAG_LEAVE],
-			 et->drop_row,
-			 et->drop_col,
-			 context,
-			 time);
-	et->drop_row = -1;
-	et->drop_col = -1;
-}
-
-static gboolean
-et_drag_motion(GtkWidget *widget,
-	       GdkDragContext *context,
-	       gint x,
-	       gint y,
-	       guint time,
-	       ETable *et)
-{
-	gboolean ret_val;
-	int row, col;
-
-	e_table_get_cell_at (et, x, y, &row, &col);
-
-	if (row != et->drop_row && col != et->drop_row) {
-		gtk_signal_emit (GTK_OBJECT (et),
-				 et_signals [TABLE_DRAG_LEAVE],
-				 et->drop_row,
-				 et->drop_col,
-				 context,
-				 time);
-	}
-	et->drop_row = row;
-	et->drop_col = col;
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [TABLE_DRAG_MOTION],
-			 et->drop_row,
-			 et->drop_col,
-			 context,
-			 x,
-			 y,
-			 time,
-			 &ret_val);
-	return ret_val;
-}
-
-static gboolean
-et_drag_drop(GtkWidget *widget,
-	     GdkDragContext *context,
-	     gint x,
-	     gint y,
-	     guint time,
-	     ETable *et)
-{
-	gboolean ret_val;
-	int row, col;
-
-	e_table_get_cell_at (et, x, y, &row, &col);
-
-	if (row != et->drop_row && col != et->drop_row) {
-		gtk_signal_emit (GTK_OBJECT (et),
-				 et_signals [TABLE_DRAG_LEAVE],
-				 et->drop_row,
-				 et->drop_col,
-				 context,
-				 time);
-		gtk_signal_emit (GTK_OBJECT (et),
-				 et_signals [TABLE_DRAG_MOTION],
-				 row,
-				 col,
-				 context,
-				 x,
-				 y,
-				 time,
-				 &ret_val);
-	}
-	et->drop_row = row;
-	et->drop_col = col;
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [TABLE_DRAG_DROP],
-			 et->drop_row,
-			 et->drop_col,
-			 context,
-			 x,
-			 y,
-			 time,
-			 &ret_val);
-	et->drop_row = -1;
-	et->drop_col = -1;
-	return ret_val;
-}
-
-static void
-et_drag_data_received(GtkWidget *widget,
-		      GdkDragContext *context,
-		      gint x,
-		      gint y,
-		      GtkSelectionData *selection_data,
-		      guint info,
-		      guint time,
-		      ETable *et)
-{
-	int row, col;
-
-	e_table_get_cell_at (et, x, y, &row, &col);
-
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [TABLE_DRAG_DATA_RECEIVED],
-			 row,
-			 col,
-			 context,
-			 x,
-			 y,
-			 selection_data,
-			 info,
-			 time);
-}
-
-static gint
-e_table_drag_source_event_cb (GtkWidget      *widget,
-			      GdkEvent       *event,
-			      ETable         *table)
-{
-	ETableDragSourceSite *site;
-	site = table->site;
-
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-		if ((GDK_BUTTON1_MASK << (event->button.button - 1)) & site->start_button_mask) {
-			int row, col;
-			e_table_get_cell_at (table, event->button.x, event->button.y, &row, &col);
-			if (row >= 0 && col >= 0) {
-				site->state |= (GDK_BUTTON1_MASK << (event->button.button - 1));
-				site->x = event->button.x;
-				site->y = event->button.y;
-				site->row = row;
-				site->col = col;
-			}
-		}
-		break;
-
-	case GDK_BUTTON_RELEASE:
-		if ((GDK_BUTTON1_MASK << (event->button.button - 1)) & site->start_button_mask) {
-			site->state &= ~(GDK_BUTTON1_MASK << (event->button.button - 1));
-		}
-		break;
-
-	case GDK_MOTION_NOTIFY:
-		if (site->state & event->motion.state & site->start_button_mask) {
-			/* FIXME: This is really broken and can leave us
-			 * with a stuck grab
-			 */
-			int i;
-			for (i=1; i<6; i++) {
-				if (site->state & event->motion.state &
-				    GDK_BUTTON1_MASK << (i - 1))
-					break;
-			}
-
-			if (MAX (abs (site->x - event->motion.x),
-				 abs (site->y - event->motion.y)) > 3) {
-				GtkDragSourceInfo *info;
-				GdkDragContext *context;
-
-				site->state = 0;
-				context = e_table_drag_begin (table, site->row, site->col,
-							      site->target_list,
-							      site->actions,
-							      i, event);
-
-
-				info = g_dataset_get_data (context, "gtk-info");
-
-				if (!info->icon_window) {
-					if (site->pixmap)
-						gtk_drag_set_icon_pixmap (context,
-									  site->colormap,
-									  site->pixmap,
-									  site->mask, -2, -2);
-					else
-						gtk_drag_set_icon_default (context);
-				}
-
-				return TRUE;
-			}
-		}
-		break;
-
-	default:			/* hit for 2/3BUTTON_PRESS */
-		break;
-	}
-	return FALSE;
-}
-
-static void
-e_table_class_init (ETableClass *class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	GtkContainerClass *container_class;
-
-	object_class = (GtkObjectClass *) class;
-	widget_class = (GtkWidgetClass *) class;
-	container_class = (GtkContainerClass *) class;
-
-	e_table_parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->destroy           = et_destroy;
-	object_class->set_arg           = et_set_arg;
-	object_class->get_arg           = et_get_arg;
-
-	widget_class->grab_focus = et_grab_focus;
-
-	container_class->focus = et_focus;
-
-	class->cursor_change            = NULL;
-	class->cursor_activated            = NULL;
-	class->selection_change         = NULL;
-	class->double_click             = NULL;
-	class->right_click              = NULL;
-	class->click                    = NULL;
-	class->key_press                = NULL;
-
-	class->table_drag_begin         = NULL;
-	class->table_drag_end           = NULL;
-	class->table_drag_data_get      = NULL;
-	class->table_drag_data_delete   = NULL;
-
-	class->table_drag_leave         = NULL;
-	class->table_drag_motion        = NULL;
-	class->table_drag_drop          = NULL;
-	class->table_drag_data_received = NULL;
-
-	et_signals [CURSOR_CHANGE] =
-		gtk_signal_new ("cursor_change",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableClass, cursor_change),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
-
-	et_signals [CURSOR_ACTIVATED] =
-		gtk_signal_new ("cursor_activated",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableClass, cursor_activated),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
-
-	et_signals [SELECTION_CHANGE] =
-		gtk_signal_new ("selection_change",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableClass, selection_change),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	et_signals [DOUBLE_CLICK] =
-		gtk_signal_new ("double_click",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableClass, double_click),
-				gtk_marshal_NONE__INT_INT_POINTER,
-				GTK_TYPE_NONE, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
-
-	et_signals [RIGHT_CLICK] =
-		gtk_signal_new ("right_click",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableClass, right_click),
-				e_marshal_INT__INT_INT_POINTER,
-				GTK_TYPE_INT, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
-
-	et_signals [CLICK] =
-		gtk_signal_new ("click",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableClass, click),
-				e_marshal_INT__INT_INT_POINTER,
-				GTK_TYPE_INT, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
-
-	et_signals [KEY_PRESS] =
-		gtk_signal_new ("key_press",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableClass, key_press),
-				e_marshal_INT__INT_INT_POINTER,
-				GTK_TYPE_INT, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
-
-	et_signals[TABLE_DRAG_BEGIN] =
-		gtk_signal_new ("table_drag_begin",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableClass, table_drag_begin),
-				gtk_marshal_NONE__INT_INT_POINTER,
-				GTK_TYPE_NONE, 3,
-				GTK_TYPE_INT,
-				GTK_TYPE_INT,
-				GTK_TYPE_GDK_DRAG_CONTEXT);
-	et_signals[TABLE_DRAG_END] =
-		gtk_signal_new ("table_drag_end",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableClass, table_drag_end),
-				gtk_marshal_NONE__INT_INT_POINTER,
-				GTK_TYPE_NONE, 3,
-				GTK_TYPE_INT,
-				GTK_TYPE_INT,
-				GTK_TYPE_GDK_DRAG_CONTEXT);
-	et_signals[TABLE_DRAG_DATA_GET] =
-		gtk_signal_new ("table_drag_data_get",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableClass, table_drag_data_get),
-				e_marshal_NONE__INT_INT_POINTER_POINTER_UINT_UINT,
-				GTK_TYPE_NONE, 6,
-				GTK_TYPE_INT,
-				GTK_TYPE_INT,
-				GTK_TYPE_GDK_DRAG_CONTEXT,
-				GTK_TYPE_SELECTION_DATA,
-				GTK_TYPE_UINT,
-				GTK_TYPE_UINT);
-	et_signals[TABLE_DRAG_DATA_DELETE] =
-		gtk_signal_new ("table_drag_data_delete",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableClass, table_drag_data_delete),
-				gtk_marshal_NONE__INT_INT_POINTER,
-				GTK_TYPE_NONE, 3,
-				GTK_TYPE_INT,
-				GTK_TYPE_INT,
-				GTK_TYPE_GDK_DRAG_CONTEXT);
-
-	et_signals[TABLE_DRAG_LEAVE] =
-		gtk_signal_new ("table_drag_leave",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableClass, table_drag_leave),
-				e_marshal_NONE__INT_INT_POINTER_UINT,
-				GTK_TYPE_NONE, 4,
-				GTK_TYPE_INT,
-				GTK_TYPE_INT,
-				GTK_TYPE_GDK_DRAG_CONTEXT,
-				GTK_TYPE_UINT);
-	et_signals[TABLE_DRAG_MOTION] =
-		gtk_signal_new ("table_drag_motion",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableClass, table_drag_motion),
-				e_marshal_BOOL__INT_INT_POINTER_INT_INT_UINT,
-				GTK_TYPE_BOOL, 6,
-				GTK_TYPE_INT,
-				GTK_TYPE_INT,
-				GTK_TYPE_GDK_DRAG_CONTEXT,
-				GTK_TYPE_INT,
-				GTK_TYPE_INT,
-				GTK_TYPE_UINT);
-	et_signals[TABLE_DRAG_DROP] =
-		gtk_signal_new ("table_drag_drop",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableClass, table_drag_drop),
-				e_marshal_BOOL__INT_INT_POINTER_INT_INT_UINT,
-				GTK_TYPE_BOOL, 6,
-				GTK_TYPE_INT,
-				GTK_TYPE_INT,
-				GTK_TYPE_GDK_DRAG_CONTEXT,
-				GTK_TYPE_INT,
-				GTK_TYPE_INT,
-				GTK_TYPE_UINT);
-	et_signals[TABLE_DRAG_DATA_RECEIVED] =
-		gtk_signal_new ("table_drag_data_received",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableClass, table_drag_data_received),
-				e_marshal_NONE__INT_INT_POINTER_INT_INT_POINTER_UINT_UINT,
-				GTK_TYPE_NONE, 8,
-				GTK_TYPE_INT,
-				GTK_TYPE_INT,
-				GTK_TYPE_GDK_DRAG_CONTEXT,
-				GTK_TYPE_INT,
-				GTK_TYPE_INT,
-				GTK_TYPE_SELECTION_DATA,
-				GTK_TYPE_UINT,
-				GTK_TYPE_UINT);
-
-	gtk_object_class_add_signals (object_class, et_signals, LAST_SIGNAL);
-
-	class->set_scroll_adjustments = set_scroll_adjustments;
-
-	widget_class->set_scroll_adjustments_signal =
-		gtk_signal_new ("set_scroll_adjustments",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETableClass, set_scroll_adjustments),
-				gtk_marshal_NONE__POINTER_POINTER,
-				GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
-
-	gtk_object_add_arg_type ("ETable::length_threshold", GTK_TYPE_INT,
-				 GTK_ARG_WRITABLE, ARG_LENGTH_THRESHOLD);
-	gtk_object_add_arg_type ("ETable::model", E_TABLE_MODEL_TYPE,
-				 GTK_ARG_READABLE, ARG_MODEL);
-}
-
-E_MAKE_TYPE(e_table, "ETable", ETable, e_table_class_init, e_table_init, PARENT_TYPE);
diff --git a/widgets/table/e-table.dia b/widgets/table/e-table.dia
deleted file mode 100644
index 5aeb01228c..0000000000
--- a/widgets/table/e-table.dia
+++ /dev/null
diff --git a/widgets/table/e-table.h b/widgets/table/e-table.h
deleted file mode 100644
index 829b8ffcaf..0000000000
--- a/widgets/table/e-table.h
+++ /dev/null
@@ -1,292 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TABLE_H_
-#define _E_TABLE_H_
-
-#include <libgnomeui/gnome-canvas.h>
-#include <gtk/gtktable.h>
-#include <gnome-xml/tree.h>
-#include <gal/e-table/e-table-model.h>
-#include <gal/e-table/e-table-header.h>
-#include <gal/e-table/e-table-group.h>
-#include <gal/e-table/e-table-sort-info.h>
-#include <gal/e-table/e-table-item.h>
-#include <gal/e-table/e-table-selection-model.h>
-#include <gal/e-table/e-table-extras.h>
-#include <gal/e-table/e-table-specification.h>
-#include <gal/widgets/e-printable.h>
-#include <gal/e-table/e-table-state.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TABLE_TYPE        (e_table_get_type ())
-#define E_TABLE(o)          (GTK_CHECK_CAST ((o), E_TABLE_TYPE, ETable))
-#define E_TABLE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TABLE_TYPE, ETableClass))
-#define E_IS_TABLE(o)       (GTK_CHECK_TYPE ((o), E_TABLE_TYPE))
-#define E_IS_TABLE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_TYPE))
-
-typedef struct _ETableDragSourceSite ETableDragSourceSite;
-
-typedef enum {
-	E_TABLE_CURSOR_LOC_NONE = 0,
-	E_TABLE_CURSOR_LOC_ETCTA = 1 << 0,
-	E_TABLE_CURSOR_LOC_TABLE = 1 << 1,
-} ETableCursorLoc;
-
-typedef struct {
-	GtkTable parent;
-
-	ETableModel *model;
-
-	ETableHeader *full_header, *header;
-
-	GnomeCanvasItem *canvas_vbox;
-	ETableGroup  *group;
-
-	ETableSortInfo *sort_info;
-	ETableSorter   *sorter;
-
-	ETableSelectionModel *selection;
-	ETableCursorLoc cursor_loc;
-	ETableSpecification *spec;
-
-	int table_model_change_id;
-	int table_row_change_id;
-	int table_cell_change_id;
-	int table_rows_inserted_id;
-	int table_rows_deleted_id;
-
-	int group_info_change_id;
-
-	int reflow_idle_id;
-
-	GnomeCanvas *header_canvas, *table_canvas;
-
-	GnomeCanvasItem *header_item, *root;
-
-	GnomeCanvasItem *white_item;
-
-	gint length_threshold;
-
-	gint rebuild_idle_id;
-	guint need_rebuild:1;
-
-	/*
-	 * Configuration settings
-	 */
-	guint alternating_row_colors : 1;
-	guint horizontal_draw_grid : 1;
-	guint vertical_draw_grid : 1;
-	guint draw_focus : 1;
-	guint row_selection_active : 1;
-
-	guint horizontal_scrolling : 1;
-
-	guint is_grouped : 1;
-	
-	char *click_to_add_message;
-	GnomeCanvasItem *click_to_add;
-	gboolean use_click_to_add;
-
-	ECursorMode cursor_mode;
-
-	int drag_get_data_row;
-	int drag_get_data_col;
-
-	int drop_row;
-	int drop_col;
-
-	int drag_row;
-	int drag_col;
-	ETableDragSourceSite *site;
-	
-	int drag_source_button_press_event_id;
-	int drag_source_motion_notify_event_id;
-} ETable;
-
-typedef struct {
-	GtkTableClass parent_class;
-
-	void        (*cursor_change)      (ETable *et, int row);
-	void        (*cursor_activated)   (ETable *et, int row);
-	void        (*selection_change)   (ETable *et);
-	void        (*double_click)       (ETable *et, int row, int col, GdkEvent *event);
-	gint        (*right_click)        (ETable *et, int row, int col, GdkEvent *event);
-	gint        (*click)              (ETable *et, int row, int col, GdkEvent *event);
-	gint        (*key_press)          (ETable *et, int row, int col, GdkEvent *event);
-
-	void  (*set_scroll_adjustments)   (ETable	 *table,
-					   GtkAdjustment *hadjustment,
-					   GtkAdjustment *vadjustment);
-
-	/* Source side drag signals */
-	void (* table_drag_begin)	           (ETable	       *table,
-						    int                 row,
-						    int                 col,
-						    GdkDragContext     *context);
-	void (* table_drag_end)	           (ETable	       *table,
-					    int                 row,
-					    int                 col,
-					    GdkDragContext     *context);
-	void (* table_drag_data_get)             (ETable             *table,
-						  int                 row,
-						  int                 col,
-						  GdkDragContext     *context,
-						  GtkSelectionData   *selection_data,
-						  guint               info,
-						  guint               time);
-	void (* table_drag_data_delete)          (ETable	       *table,
-						  int                 row,
-						  int                 col,
-						  GdkDragContext     *context);
-	
-	/* Target side drag signals */	   
-	void (* table_drag_leave)	           (ETable	       *table,
-						    int                 row,
-						    int                 col,
-						    GdkDragContext     *context,
-						    guint               time);
-	gboolean (* table_drag_motion)           (ETable	       *table,
-						  int                 row,
-						  int                 col,
-						  GdkDragContext     *context,
-						  gint                x,
-						  gint                y,
-						  guint               time);
-	gboolean (* table_drag_drop)             (ETable	       *table,
-						  int                 row,
-						  int                 col,
-						  GdkDragContext     *context,
-						  gint                x,
-						  gint                y,
-						  guint               time);
-	void (* table_drag_data_received)        (ETable             *table,
-						  int                 row,
-						  int                 col,
-						  GdkDragContext     *context,
-						  gint                x,
-						  gint                y,
-						  GtkSelectionData   *selection_data,
-						  guint               info,
-						  guint               time);
-} ETableClass;
-
-GtkType         e_table_get_type                  (void);
-
-ETable         *e_table_construct                 (ETable               *e_table,
-						   ETableModel          *etm,
-						   ETableExtras         *ete,
-						   const char           *spec,
-						   const char           *state);
-GtkWidget      *e_table_new                       (ETableModel          *etm,
-						   ETableExtras         *ete,
-						   const char           *spec,
-						   const char           *state);
-
-/* Create an ETable using files. */
-ETable         *e_table_construct_from_spec_file  (ETable               *e_table,
-						   ETableModel          *etm,
-						   ETableExtras         *ete,
-						   const char           *spec_fn,
-						   const char           *state_fn);
-GtkWidget      *e_table_new_from_spec_file        (ETableModel          *etm,
-						   ETableExtras         *ete,
-						   const char           *spec_fn,
-						   const char           *state_fn);
-
-/* To save the state */
-gchar          *e_table_get_state                 (ETable               *e_table);
-void            e_table_save_state                (ETable               *e_table,
-						   const gchar          *filename);
-ETableState    *e_table_get_state_object          (ETable               *e_table);
-
-/* note that it is more efficient to provide the state at creation time */
-void            e_table_set_state                 (ETable               *e_table,
-						   const gchar          *state);
-void            e_table_set_state_object          (ETable               *e_table,
-						   ETableState          *state);
-void            e_table_load_state                (ETable               *e_table,
-						   const gchar          *filename);
-
-void            e_table_set_cursor_row            (ETable               *e_table,
-						   int                   row);
-
-/* -1 means we don't have the cursor. */
-int             e_table_get_cursor_row            (ETable               *e_table);
-void            e_table_selected_row_foreach      (ETable               *e_table,
-						   EForeachFunc          callback,
-						   gpointer              closure);
-gint            e_table_selected_count            (ETable               *e_table);
-EPrintable     *e_table_get_printable             (ETable               *e_table);
-
-gint            e_table_get_next_row              (ETable               *e_table,
-						   gint                  model_row);
-gint            e_table_get_prev_row              (ETable               *e_table,
-						   gint                  model_row);
-
-gint            e_table_model_to_view_row         (ETable               *e_table,
-						   gint                  model_row);
-gint            e_table_view_to_model_row         (ETable               *e_table,
-						   gint                  view_row);
-void            e_table_get_cell_at               (ETable *table,
-						   int x, int y,
-						   int *row_return, int *col_return);
-
-void            e_table_get_cell_geometry         (ETable *table,
-						   int row, int col,
-						   int *x_return, int *y_return,
-						   int *width_return, int *height_return);
-
-/* Drag & drop stuff. */
-/* Target */
-void            e_table_drag_get_data             (ETable               *table,
-						   int                   row,
-						   int                   col,
-						   GdkDragContext       *context,
-						   GdkAtom               target,
-						   guint32               time);
-void            e_table_drag_highlight            (ETable               *table,
-						   int                   row,
-						   int                   col); /* col == -1 to highlight entire row. */
-void            e_table_drag_unhighlight          (ETable               *table);
-void            e_table_drag_dest_set             (ETable               *table,
-						   GtkDestDefaults       flags,
-						   const GtkTargetEntry *targets,
-						   gint                  n_targets,
-						   GdkDragAction         actions);
-void            e_table_drag_dest_set_proxy       (ETable               *table,
-						   GdkWindow            *proxy_window,
-						   GdkDragProtocol       protocol,
-						   gboolean              use_coordinates);
-
-/* There probably should be functions for setting the targets
- * as a GtkTargetList
- */
-void            e_table_drag_dest_unset           (GtkWidget            *widget);
-
-/* Source side */
-void            e_table_drag_source_set           (ETable               *table,
-						   GdkModifierType       start_button_mask,
-						   const GtkTargetEntry *targets,
-						   gint                  n_targets,
-						   GdkDragAction         actions);
-void            e_table_drag_source_unset         (ETable               *table);
-
-/* There probably should be functions for setting the targets
- * as a GtkTargetList
- */
-GdkDragContext *e_table_drag_begin                (ETable               *table,
-						   int                   row,
-						   int                   col,
-						   GtkTargetList        *targets,
-						   GdkDragAction         actions,
-						   gint                  button,
-						   GdkEvent             *event);
-
-/* selection stuff */
-void            e_table_select_all                (ETable               *table);
-void            e_table_invert_selection          (ETable               *table);
-
-END_GNOME_DECLS
-
-#endif /* _E_TABLE_H_ */
-
diff --git a/widgets/table/e-tree-memory-callbacks.c b/widgets/table/e-tree-memory-callbacks.c
deleted file mode 100644
index adb5160bc2..0000000000
--- a/widgets/table/e-tree-memory-callbacks.c
+++ /dev/null
@@ -1,262 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-tree-memory-callbacks.c: a Tree Model that offers a function pointer
- * interface to using ETreeModel, similar to ETableSimple.
- *
- * Author:
- *   Chris Toshok (toshok@ximian.com)
- *
- * (C) 2000 Ximian, Inc.  */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "gal/util/e-util.h"
-#include "e-tree-memory-callbacks.h"
-
-#define PARENT_TYPE E_TREE_MEMORY_TYPE
-
-static GdkPixbuf *
-etmc_icon_at (ETreeModel *etm, ETreePath node)
-{
-	ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS(etm);
-
-	return etmc->icon_at (etm, node, etmc->model_data);
-}
-
-static int
-etmc_column_count (ETreeModel *etm)
-{
-	ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS(etm);
-
-	if (etmc->column_count)
-		return etmc->column_count (etm, etmc->model_data);
-	else
-		return 0;
-}
-
-
-static gboolean
-etmc_has_save_id (ETreeModel *etm)
-{
-	ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS(etm);
-
-	if (etmc->has_save_id)
-		return etmc->has_save_id (etm, etmc->model_data);
-	else
-		return FALSE;
-}
-
-static char *
-etmc_get_save_id (ETreeModel *etm, ETreePath node)
-{
-	ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS(etm);
-
-	if (etmc->get_save_id)
-		return etmc->get_save_id (etm, node, etmc->model_data);
-	else
-		return NULL;
-}
-
-static gboolean
-etmc_has_get_node_by_id (ETreeModel *etm)
-{
-	ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS(etm);
-
-	if (etmc->has_get_node_by_id)
-		return etmc->has_get_node_by_id (etm, etmc->model_data);
-	else
-		return FALSE;
-}
-
-static ETreePath
-etmc_get_node_by_id (ETreeModel *etm, gchar *save_id)
-{
-	ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS(etm);
-
-	if (etmc->get_node_by_id)
-		return etmc->get_node_by_id (etm, save_id, etmc->model_data);
-	else
-		return NULL;
-}
-
-
-static void *
-etmc_value_at (ETreeModel *etm, ETreePath node, int col)
-{
-	ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS(etm);
-
-	return etmc->value_at (etm, node, col, etmc->model_data);
-}
-
-static void
-etmc_set_value_at (ETreeModel *etm, ETreePath node, int col, const void *val)
-{
-	ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS(etm);
-
-	etmc->set_value_at (etm, node, col, val, etmc->model_data);
-}
-
-static gboolean
-etmc_is_editable (ETreeModel *etm, ETreePath node, int col)
-{
-	ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS(etm);
-
-	return etmc->is_editable (etm, node, col, etmc->model_data);
-}
-
-
-/* The default for etmc_duplicate_value is to return the raw value. */
-static void *
-etmc_duplicate_value (ETreeModel *etm, int col, const void *value)
-{
-	ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS(etm);
-
-	if (etmc->duplicate_value)
-		return etmc->duplicate_value (etm, col, value, etmc->model_data);
-	else
-		return (void *)value;
-}
-
-static void
-etmc_free_value (ETreeModel *etm, int col, void *value)
-{
-	ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS(etm);
-
-	if (etmc->free_value)
-		etmc->free_value (etm, col, value, etmc->model_data);
-}
-
-static void *
-etmc_initialize_value (ETreeModel *etm, int col)
-{
-	ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS(etm);
-	
-	if (etmc->initialize_value)
-		return etmc->initialize_value (etm, col, etmc->model_data);
-	else
-		return NULL;
-}
-
-static gboolean
-etmc_value_is_empty (ETreeModel *etm, int col, const void *value)
-{
-	ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS(etm);
-	
-	if (etmc->value_is_empty)
-		return etmc->value_is_empty (etm, col, value, etmc->model_data);
-	else
-		return FALSE;
-}
-
-static char *
-etmc_value_to_string (ETreeModel *etm, int col, const void *value)
-{
-	ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS(etm);
-	
-	if (etmc->value_to_string)
-		return etmc->value_to_string (etm, col, value, etmc->model_data);
-	else
-		return g_strdup ("");
-}
-
-static void
-e_tree_memory_callbacks_class_init (GtkObjectClass *object_class)
-{
-	ETreeModelClass *model_class        = (ETreeModelClass *) object_class;
-
-	model_class->icon_at            = etmc_icon_at;
-
-	model_class->column_count       = etmc_column_count;
-
-	model_class->has_save_id        = etmc_has_save_id;
-	model_class->get_save_id        = etmc_get_save_id;
-
-	model_class->has_get_node_by_id = etmc_has_get_node_by_id;
-	model_class->get_node_by_id     = etmc_get_node_by_id;
-
-	model_class->value_at           = etmc_value_at;
-	model_class->set_value_at       = etmc_set_value_at;
-	model_class->is_editable        = etmc_is_editable;
-
-	model_class->duplicate_value    = etmc_duplicate_value;
-	model_class->free_value         = etmc_free_value;
-	model_class->initialize_value   = etmc_initialize_value;
-	model_class->value_is_empty     = etmc_value_is_empty;
-	model_class->value_to_string    = etmc_value_to_string;
-}
-
-E_MAKE_TYPE(e_tree_memory_callbacks, "ETreeMemoryCallbacks", ETreeMemoryCallbacks, e_tree_memory_callbacks_class_init, NULL, PARENT_TYPE)
-
-/**
- * e_tree_memory_callbacks_new:
- * 
- * This initializes a new ETreeMemoryCallbacksModel object.
- * ETreeMemoryCallbacksModel is an implementaiton of the somewhat
- * abstract class ETreeMemory.  The ETreeMemoryCallbacksModel is
- * designed to allow people to easily create ETreeMemorys without
- * having to create a new GtkType derived from ETreeMemory every time
- * they need one.
- *
- * Instead, ETreeMemoryCallbacksModel uses a setup based in callback functions, every
- * callback function signature mimics the signature of each ETreeModel method
- * and passes the extra @data pointer to each one of the method to provide them
- * with any context they might want to use. 
- * 
- * ETreeMemoryCallbacks is to ETreeMemory as ETableSimple is to ETableModel.
- *
- * Return value: An ETreeMemoryCallbacks object (which is also an
- * ETreeMemory and thus an ETreeModel object).
- *
- */
-ETreeModel *
-e_tree_memory_callbacks_new  (ETreeMemoryCallbacksIconAtFn icon_at,
-
-			      ETreeMemoryCallbacksColumnCountFn        column_count,
-
-			      ETreeMemoryCallbacksHasSaveIdFn          has_save_id,
-			      ETreeMemoryCallbacksGetSaveIdFn          get_save_id,
-
-			      ETreeMemoryCallbacksHasGetNodeByIdFn     has_get_node_by_id,
-			      ETreeMemoryCallbacksGetNodeByIdFn        get_node_by_id,
-
-			      ETreeMemoryCallbacksValueAtFn            value_at,
-			      ETreeMemoryCallbacksSetValueAtFn         set_value_at,
-			      ETreeMemoryCallbacksIsEditableFn         is_editable,
-
-			      ETreeMemoryCallbacksDuplicateValueFn     duplicate_value,
-			      ETreeMemoryCallbacksFreeValueFn          free_value,
-			      ETreeMemoryCallbacksInitializeValueFn    initialize_value,
-			      ETreeMemoryCallbacksValueIsEmptyFn       value_is_empty,
-			      ETreeMemoryCallbacksValueToStringFn      value_to_string,
-
-			      gpointer                                 model_data)
-{
-	ETreeMemoryCallbacks *etmc;
-
-	etmc = gtk_type_new (e_tree_memory_callbacks_get_type ());
-
-	etmc->icon_at            = icon_at;
-
-	etmc->column_count       = column_count;
-
-	etmc->has_save_id        = has_save_id;
-	etmc->get_save_id        = get_save_id;
-
-	etmc->has_get_node_by_id = has_get_node_by_id;
-	etmc->get_node_by_id     = get_node_by_id;
-
-	etmc->value_at           = value_at;
-	etmc->set_value_at       = set_value_at;
-	etmc->is_editable        = is_editable;
-
-	etmc->duplicate_value    = duplicate_value;
-	etmc->free_value         = free_value;
-	etmc->initialize_value   = initialize_value;
-	etmc->value_is_empty     = value_is_empty;
-	etmc->value_to_string    = value_to_string;
-
-	etmc->model_data         = model_data;
-
-	return (ETreeModel*)etmc;
-}
-
diff --git a/widgets/table/e-tree-memory-callbacks.h b/widgets/table/e-tree-memory-callbacks.h
deleted file mode 100644
index 441c5be9f4..0000000000
--- a/widgets/table/e-tree-memory-callbacks.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#ifndef _E_TREE_MEMORY_CALLBACKS_H_
-#define _E_TREE_MEMORY_CALLBACKS_H_
-
-#include <gal/e-table/e-tree-memory.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_TREE_MEMORY_CALLBACKS_TYPE        (e_tree_memory_callbacks_get_type ())
-#define E_TREE_MEMORY_CALLBACKS(o)          (GTK_CHECK_CAST ((o), E_TREE_MEMORY_CALLBACKS_TYPE, ETreeMemoryCallbacks))
-#define E_TREE_MEMORY_CALLBACKS_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TREE_MEMORY_CALLBACKS_TYPE, ETreeMemoryCallbacksClass))
-#define E_IS_TREE_MEMORY_CALLBACKS(o)       (GTK_CHECK_TYPE ((o), E_TREE_MEMORY_CALLBACKS_TYPE))
-#define E_IS_TREE_MEMORY_CALLBACKS_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TREE_MEMORY_CALLBACKS_TYPE))
-
-
-typedef GdkPixbuf* (*ETreeMemoryCallbacksIconAtFn)             (ETreeModel *etree, ETreePath path, void *model_data);
-
-typedef gint       (*ETreeMemoryCallbacksColumnCountFn)        (ETreeModel *etree, void *model_data);
-
-typedef gboolean   (*ETreeMemoryCallbacksHasSaveIdFn)          (ETreeModel *etree, void *model_data);
-typedef gchar     *(*ETreeMemoryCallbacksGetSaveIdFn)          (ETreeModel *etree, ETreePath path, void *model_data);
-
-typedef gboolean   (*ETreeMemoryCallbacksHasGetNodeByIdFn)     (ETreeModel *etree, void *model_data);
-typedef ETreePath  (*ETreeMemoryCallbacksGetNodeByIdFn)        (ETreeModel *etree, gchar *save_id, void *model_data);
-
-typedef void*      (*ETreeMemoryCallbacksValueAtFn)            (ETreeModel *etree, ETreePath path, int col, void *model_data);
-typedef void       (*ETreeMemoryCallbacksSetValueAtFn)         (ETreeModel *etree, ETreePath path, int col, const void *val, void *model_data);
-typedef gboolean   (*ETreeMemoryCallbacksIsEditableFn)         (ETreeModel *etree, ETreePath path, int col, void *model_data);
-
-typedef	void      *(*ETreeMemoryCallbacksDuplicateValueFn)     (ETreeModel *etm, int col, const void *val, void *data);
-typedef	void       (*ETreeMemoryCallbacksFreeValueFn)          (ETreeModel *etm, int col, void *val, void *data);
-typedef void      *(*ETreeMemoryCallbacksInitializeValueFn)    (ETreeModel *etm, int col, void *data);
-typedef gboolean   (*ETreeMemoryCallbacksValueIsEmptyFn)       (ETreeModel *etm, int col, const void *val, void *data);
-typedef char      *(*ETreeMemoryCallbacksValueToStringFn)      (ETreeModel *etm, int col, const void *val, void *data);
-
-typedef struct {
-	ETreeMemory parent;
-
-	ETreeMemoryCallbacksIconAtFn icon_at;
-
-	ETreeMemoryCallbacksColumnCountFn     column_count;
-
-	ETreeMemoryCallbacksHasSaveIdFn       has_save_id;
-	ETreeMemoryCallbacksGetSaveIdFn       get_save_id;
-
-	ETreeMemoryCallbacksHasGetNodeByIdFn  has_get_node_by_id;
-	ETreeMemoryCallbacksGetNodeByIdFn     get_node_by_id;
-
-	ETreeMemoryCallbacksValueAtFn         value_at;
-	ETreeMemoryCallbacksSetValueAtFn      set_value_at;
-	ETreeMemoryCallbacksIsEditableFn      is_editable;
-
-	ETreeMemoryCallbacksDuplicateValueFn  duplicate_value;
-	ETreeMemoryCallbacksFreeValueFn       free_value;
-	ETreeMemoryCallbacksInitializeValueFn initialize_value;
-	ETreeMemoryCallbacksValueIsEmptyFn    value_is_empty;
-	ETreeMemoryCallbacksValueToStringFn   value_to_string;
-
-	gpointer model_data;
-} ETreeMemoryCallbacks;
-
-typedef struct {
-	ETreeMemoryClass parent_class;
-} ETreeMemoryCallbacksClass;
-
-GtkType e_tree_memory_callbacks_get_type (void);
-
-ETreeModel *e_tree_memory_callbacks_new  (ETreeMemoryCallbacksIconAtFn icon_at,
-
-					  ETreeMemoryCallbacksColumnCountFn        column_count,
-
-					  ETreeMemoryCallbacksHasSaveIdFn          has_save_id,
-					  ETreeMemoryCallbacksGetSaveIdFn          get_save_id,
-
-					  ETreeMemoryCallbacksHasGetNodeByIdFn     has_get_node_by_id,
-					  ETreeMemoryCallbacksGetNodeByIdFn        get_node_by_id,
-
-					  ETreeMemoryCallbacksValueAtFn            value_at,
-					  ETreeMemoryCallbacksSetValueAtFn         set_value_at,
-					  ETreeMemoryCallbacksIsEditableFn         is_editable,
-
-					  ETreeMemoryCallbacksDuplicateValueFn     duplicate_value,
-					  ETreeMemoryCallbacksFreeValueFn          free_value,
-					  ETreeMemoryCallbacksInitializeValueFn    initialize_value,
-					  ETreeMemoryCallbacksValueIsEmptyFn       value_is_empty,
-					  ETreeMemoryCallbacksValueToStringFn      value_to_string,
-
-					  gpointer                                 model_data);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TREE_MEMORY_CALLBACKS_H_ */
diff --git a/widgets/table/e-tree-memory.c b/widgets/table/e-tree-memory.c
deleted file mode 100644
index e3283f7730..0000000000
--- a/widgets/table/e-tree-memory.c
+++ /dev/null
@@ -1,644 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-tree-memory.c: a Tree Model implementation that the programmer builds in memory.
- *
- * Author:
- *   Chris Toshok (toshok@ximian.com)
- *   Chris Lahey <clahey@ximian.com>
- *
- * Adapted from the gtree code and ETableModel.
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#include <config.h>
-
-#include <stdio.h>
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdlib.h>
-
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include <gtk/gtksignal.h>
-#include "gal/util/e-util.h"
-#include "gal/util/e-xml-utils.h"
-#include "e-tree-memory.h"
-
-#define PARENT_TYPE E_TREE_MODEL_TYPE
-
-#define TREEPATH_CHUNK_AREA_SIZE (30 * sizeof (ETreeMemoryPath))
-
-static ETreeModel *parent_class;
-static GMemChunk  *node_chunk;
-
-typedef struct ETreeMemoryPath ETreeMemoryPath;
-
-struct ETreeMemoryPath {
-	gpointer         node_data;
-
-	/* parent/child/sibling pointers */
-	ETreeMemoryPath *parent;
-	ETreeMemoryPath *next_sibling;
-	ETreeMemoryPath *prev_sibling;
-	ETreeMemoryPath *first_child;
-	ETreeMemoryPath *last_child;
-
-	gint             num_children;
-};
-
-struct ETreeMemoryPriv {
-	ETreeMemoryPath *root;
-	gboolean         expanded_default; /* whether nodes are created expanded or collapsed by default */
-	gint             frozen;
-	GFunc            destroy_func;
-	gpointer         destroy_user_data;
-};
-
-
-/* ETreeMemoryPath functions */
-
-static int
-e_tree_memory_path_depth (ETreeMemoryPath *path)
-{
-	int depth = 0;
-
-	g_return_val_if_fail(path != NULL, -1);
-
-	for ( path = path->parent; path; path = path->parent)
-		depth ++;
-	return depth;
-}
-
-static void
-e_tree_memory_path_insert (ETreeMemoryPath *parent, int position, ETreeMemoryPath *child)
-{
-	g_return_if_fail (position <= parent->num_children && position >= -1);
-
-	child->parent = parent;
-
-	if (parent->first_child == NULL)
-		parent->first_child = child;
-
-	if (position == -1 || position == parent->num_children) {
-		child->prev_sibling = parent->last_child;
-		if (parent->last_child)
-			parent->last_child->next_sibling = child;
-		parent->last_child = child;
-	} else {
-		ETreeMemoryPath *c;
-		for (c = parent->first_child; c; c = c->next_sibling) {
-			if (position == 0) {
-				child->next_sibling = c;
-				child->prev_sibling = c->prev_sibling;
-
-				if (child->next_sibling)
-					child->next_sibling->prev_sibling = child;
-				if (child->prev_sibling)
-					child->prev_sibling->next_sibling = child;
-
-				if (parent->first_child == c)
-					parent->first_child = child;
-				break;
-			}
-			position --;
-		}
-	}
-
-	parent->num_children++;
-}
-
-static void
-e_tree_path_unlink (ETreeMemoryPath *path)
-{
-	ETreeMemoryPath *parent = path->parent;
-
-	/* unlink first/last child if applicable */
-	if (parent) {
-		if (path == parent->first_child)
-			parent->first_child = path->next_sibling;
-		if (path == parent->last_child)
-			parent->last_child = path->prev_sibling;
-
-		parent->num_children --;
-	}
-
-	/* unlink prev/next sibling links */
-	if (path->next_sibling)
-		path->next_sibling->prev_sibling = path->prev_sibling;
-	if (path->prev_sibling)
-		path->prev_sibling->next_sibling = path->next_sibling;
-
-	path->parent = NULL;
-	path->next_sibling = NULL;
-	path->prev_sibling = NULL;
-}
-
-
-
-/**
- * e_tree_memory_freeze:
- * @etmm: the ETreeModel to freeze.
- * 
- * This function prepares an ETreeModel for a period of much change.
- * All signals regarding changes to the tree are deferred until we
- * thaw the tree.
- * 
- **/
-void
-e_tree_memory_freeze(ETreeMemory *etmm)
-{
-	ETreeMemoryPriv *priv = etmm->priv;
-
-	e_tree_model_pre_change(E_TREE_MODEL(etmm));
-
-	priv->frozen ++;
-}
-
-/**
- * e_tree_memory_thaw:
- * @etmm: the ETreeMemory to thaw.
- * 
- * This function thaws an ETreeMemory.  All the defered signals can add
- * up to a lot, we don't know - so we just emit a model_changed
- * signal.
- * 
- **/
-void
-e_tree_memory_thaw(ETreeMemory *etmm)
-{
-	ETreeMemoryPriv *priv = etmm->priv;
-
-	if (priv->frozen > 0)
-		priv->frozen --;
-	if (priv->frozen == 0) {
-		e_tree_model_node_changed(E_TREE_MODEL(etmm), priv->root);
-	}
-}
-
-
-/* virtual methods */
-
-static void
-etmm_destroy (GtkObject *object)
-{
-	ETreeMemory *etmm = E_TREE_MEMORY (object);
-	ETreeMemoryPriv *priv = etmm->priv;
-
-	/* XXX lots of stuff to free here */
-
-	if (priv->root)
-		e_tree_memory_node_remove (etmm, priv->root);
-
-	g_free (priv);
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-static ETreePath
-etmm_get_root (ETreeModel *etm)
-{
-	ETreeMemoryPriv *priv = E_TREE_MEMORY(etm)->priv;
-	return priv->root;
-}
-
-static ETreePath
-etmm_get_parent (ETreeModel *etm, ETreePath node)
-{
-	ETreeMemoryPath *path = node;
-	return path->parent;
-}
-
-static ETreePath
-etmm_get_first_child (ETreeModel *etm, ETreePath node)
-{
-	ETreeMemoryPath *path = node;
-	return path->first_child;
-}
-
-static ETreePath
-etmm_get_last_child (ETreeModel *etm, ETreePath node)
-{
-	ETreeMemoryPath *path = node;
-	return path->last_child;
-}
-
-static ETreePath
-etmm_get_next (ETreeModel *etm, ETreePath node)
-{
-	ETreeMemoryPath *path = node;
-	return path->next_sibling;
-}
-
-static ETreePath
-etmm_get_prev (ETreeModel *etm, ETreePath node)
-{
-	ETreeMemoryPath *path = node;
-	return path->prev_sibling;
-}
-
-static gboolean
-etmm_is_root (ETreeModel *etm, ETreePath node)
-{
- 	ETreeMemoryPath *path = node;
-	return e_tree_memory_path_depth (path) == 0;
-}
-
-static gboolean
-etmm_is_expandable (ETreeModel *etm, ETreePath node)
-{
-	ETreeMemoryPath *path = node;
-	return path->first_child != NULL;
-}
-
-static guint
-etmm_get_children (ETreeModel *etm, ETreePath node, ETreePath **nodes)
-{
-	ETreeMemoryPath *path = node;
-	guint n_children;
-
-	n_children = path->num_children;
-
-	if (nodes) {
-		ETreeMemoryPath *p;
-		int i = 0;
-
-		(*nodes) = g_malloc (sizeof (ETreePath) * n_children);
-		for (p = path->first_child; p; p = p->next_sibling) {
-			(*nodes)[i++] = p;
-		}
-	}
-
-	return n_children;
-}
-
-static guint
-etmm_depth (ETreeModel *etm, ETreePath path)
-{
-	return e_tree_memory_path_depth(path);
-}
-
-static gboolean
-etmm_get_expanded_default (ETreeModel *etm)
-{
-	ETreeMemory *etmm = E_TREE_MEMORY (etm);
-	ETreeMemoryPriv *priv = etmm->priv;
-
-	return priv->expanded_default;
-}
-
-
-static void
-e_tree_memory_class_init (GtkObjectClass *klass)
-{
-	ETreeModelClass *tree_class = (ETreeModelClass *) klass;
-
-	parent_class                     = gtk_type_class (PARENT_TYPE);
-	
-	node_chunk                       = g_mem_chunk_create (ETreeMemoryPath, TREEPATH_CHUNK_AREA_SIZE, G_ALLOC_AND_FREE);
-
-	klass->destroy                   = etmm_destroy;
-
-	tree_class->get_root             = etmm_get_root;
-	tree_class->get_prev             = etmm_get_prev;
-	tree_class->get_next             = etmm_get_next;
-	tree_class->get_first_child      = etmm_get_first_child;
-	tree_class->get_last_child       = etmm_get_last_child;
-	tree_class->get_parent           = etmm_get_parent;
-
-	tree_class->is_root              = etmm_is_root;
-	tree_class->is_expandable        = etmm_is_expandable;
-	tree_class->get_children         = etmm_get_children;
-	tree_class->depth                = etmm_depth;
-	tree_class->get_expanded_default = etmm_get_expanded_default;
-}
-
-static void
-e_tree_memory_init (GtkObject *object)
-{
-	ETreeMemory *etmm = (ETreeMemory *)object;
-
-	ETreeMemoryPriv *priv;
-
-	priv = g_new0 (ETreeMemoryPriv, 1);
-	etmm->priv = priv;
-
-	priv->root = NULL;
-	priv->frozen = 0;
-	priv->expanded_default = 0;
-	priv->destroy_func = NULL;
-	priv->destroy_user_data = NULL;
-}
-
-E_MAKE_TYPE(e_tree_memory, "ETreeMemory", ETreeMemory, e_tree_memory_class_init, e_tree_memory_init, PARENT_TYPE)
-
-
-
-/**
- * e_tree_memory_construct:
- * @etree: 
- * 
- * 
- **/
-void
-e_tree_memory_construct (ETreeMemory *etmm)
-{
-}
-
-/**
- * e_tree_memory_new
- *
- * XXX docs here.
- *
- * return values: a newly constructed ETreeMemory.
- */
-ETreeMemory *
-e_tree_memory_new (void)
-{
-	ETreeMemory *etmm;
-
-	etmm = gtk_type_new (e_tree_memory_get_type ());
-
-	e_tree_memory_construct(etmm);
-
-	return etmm;
-}
-
-void
-e_tree_memory_set_expanded_default         (ETreeMemory *etree, gboolean expanded)
-{
-	etree->priv->expanded_default = expanded;
-}
-
-/**
- * e_tree_memory_node_get_data:
- * @etmm: 
- * @node: 
- * 
- * 
- * 
- * Return value: 
- **/
-gpointer
-e_tree_memory_node_get_data (ETreeMemory *etmm, ETreePath node)
-{
-	ETreeMemoryPath *path = node;
-
-	g_return_val_if_fail (path, NULL);
-
-	return path->node_data;
-}
-
-/**
- * e_tree_memory_node_set_data:
- * @etmm: 
- * @node: 
- * @node_data: 
- * 
- * 
- **/
-void
-e_tree_memory_node_set_data (ETreeMemory *etmm, ETreePath node, gpointer node_data)
-{
-	ETreeMemoryPath *path = node;
-
-	g_return_if_fail (path);
-
-	path->node_data = node_data;
-}
-
-/**
- * e_tree_memory_node_insert:
- * @tree_model: 
- * @parent_path: 
- * @position: 
- * @node_data: 
- * 
- * 
- * 
- * Return value: 
- **/
-ETreePath
-e_tree_memory_node_insert (ETreeMemory *tree_model,
-			   ETreePath parent_node,
-			   int position,
-			   gpointer node_data)
-{
-	ETreeMemoryPriv *priv;
-	ETreeMemoryPath *new_path;
-	ETreeMemoryPath *parent_path = parent_node;
-
-	g_return_val_if_fail(tree_model != NULL, NULL);
-
-	priv = tree_model->priv;
-
-	g_return_val_if_fail (parent_path != NULL || priv->root == NULL, NULL);
-
-	priv = tree_model->priv;
-
-	if (!tree_model->priv->frozen)
-		e_tree_model_pre_change(E_TREE_MODEL(tree_model));
-
-	new_path = g_chunk_new0 (ETreeMemoryPath, node_chunk);
-
-	new_path->node_data = node_data;
-
-	if (parent_path != NULL) {
-		e_tree_memory_path_insert (parent_path, position, new_path);
-		if (!tree_model->priv->frozen)
-			e_tree_model_node_inserted (E_TREE_MODEL(tree_model), parent_path, new_path);
-	}
-	else {
-		priv->root = new_path;
-		if (!tree_model->priv->frozen)
-			e_tree_model_node_changed(E_TREE_MODEL(tree_model), new_path);
-	}
-
-	return new_path;
-}
-
-ETreePath e_tree_memory_node_insert_id     (ETreeMemory *etree, ETreePath parent, int position, gpointer node_data, char *id)
-{
-	return e_tree_memory_node_insert(etree, parent, position, node_data);
-}
-
-/**
- * e_tree_memory_node_insert_before:
- * @etree: 
- * @parent: 
- * @sibling: 
- * @node_data: 
- * 
- * 
- * 
- * Return value: 
- **/
-ETreePath
-e_tree_memory_node_insert_before (ETreeMemory *etree,
-				  ETreePath parent,
-				  ETreePath sibling,
-				  gpointer node_data)
-{
-	ETreeMemoryPath *child;
-	ETreeMemoryPath *parent_path = parent;
-	ETreeMemoryPath *sibling_path = sibling;
-	int position = 0;
-
-	g_return_val_if_fail(etree != NULL, NULL);
-
-	if (sibling != NULL) {
-		for (child = parent_path->first_child; child; child = child->next_sibling) {
-			if (child == sibling_path)
-				break;
-			position ++;
-		}
-	} else
-		position = parent_path->num_children;
-	return e_tree_memory_node_insert (etree, parent, position, node_data);
-}
-
-/* just blows away child data, doesn't take into account unlinking/etc */
-static void
-child_free(ETreeMemory *etree, ETreeMemoryPath *node)
-{
-	ETreeMemoryPath *child, *next;
-
-	child = node->first_child;
-	while (child) {
-		next = child->next_sibling;
-		child_free(etree, child);
-		child = next;
-	}
-
-	if (etree->priv->destroy_func) {
-		etree->priv->destroy_func (node->node_data, etree->priv->destroy_user_data);
-	}
-
-	g_chunk_free(node, node_chunk);
-}
-
-/**
- * e_tree_memory_node_remove:
- * @etree: 
- * @path: 
- * 
- * 
- * 
- * Return value: 
- **/
-gpointer
-e_tree_memory_node_remove (ETreeMemory *etree, ETreePath node)
-{
-	ETreeMemoryPath *path = node;
-	ETreeMemoryPath *parent = path->parent;
-	ETreeMemoryPath *sibling;
-	gpointer ret = path->node_data;
-	int old_position = 0;
-
-	g_return_val_if_fail(etree != NULL, NULL);
-
-	if (!etree->priv->frozen) {
-		e_tree_model_pre_change(E_TREE_MODEL(etree));
-		for (old_position = 0, sibling = path;
-		     sibling; 
-		     old_position++, sibling = sibling->prev_sibling)
-			/* Empty intentionally*/;
-		old_position --;
-	}
-
-	/* unlink this node - we only have to unlink the root node being removed,
-	   since the others are only references from this node */
-	e_tree_path_unlink (path);
-
-	/*printf("removing %d nodes from position %d\n", visible, base);*/
-	if (!etree->priv->frozen)
-		e_tree_model_node_removed(E_TREE_MODEL(etree), parent, path, old_position);
-
-	child_free(etree, path);
-
-	if (path == etree->priv->root)
-		etree->priv->root = NULL;
-
-	return ret;
-}
-
-typedef struct {
-	ETreeMemory *memory;
-	gpointer closure;
-	ETreeMemorySortCallback callback;
-} MemoryAndClosure;
-
-static int
-sort_callback(const void *data1, const void *data2, gpointer user_data)
-{
-	ETreePath path1 = *(ETreePath *)data1;
-	ETreePath path2 = *(ETreePath *)data2;
-	MemoryAndClosure *mac = user_data;
-	return (*mac->callback) (mac->memory, path1, path2, mac->closure);
-}
-
-void
-e_tree_memory_sort_node             (ETreeMemory             *etmm,
-				     ETreePath                node,
-				     ETreeMemorySortCallback  callback,
-				     gpointer                 user_data)
-{
-	ETreeMemoryPath **children;
-	ETreeMemoryPath *child;
-	int count;
-	int i;
-	ETreeMemoryPath *path = node;
-	MemoryAndClosure mac;
-	ETreeMemoryPath *last;
-	
-	i = 0;
-	for (child = path->first_child; child; child = child->next_sibling)
-		i++;
-
-	children = g_new(ETreeMemoryPath *, i);
-
-	count = i;
-
-	for (child = path->first_child, i = 0;
-	     child;
-	     child = child->next_sibling, i++) {
-		children[i] = child;
-	}
-
-	mac.memory = etmm;
-	mac.closure = user_data;
-	mac.callback = callback;
-
-	e_sort (children, count, sizeof (ETreeMemoryPath *), sort_callback, &mac);
-
-	path->first_child = NULL;
-	last = NULL;
-	for (i = 0;
-	     i < count;
-	     i++) {
-		children[i]->prev_sibling = last;
-		if (last)
-			last->next_sibling = children[i];
-		else
-			path->first_child = children[i];
-		last = children[i];
-	}
-	if (last)
-		last->next_sibling = NULL;
-
-	path->last_child = last;
-
-	g_free(children);
-
-	e_tree_model_node_changed(E_TREE_MODEL(etmm), node);
-}
-
-void
-e_tree_memory_set_node_destroy_func  (ETreeMemory             *etmm,
-				      GFunc                    destroy_func,
-				      gpointer                 user_data)
-{
-	etmm->priv->destroy_func = destroy_func;
-	etmm->priv->destroy_user_data = user_data;
-}
diff --git a/widgets/table/e-tree-memory.h b/widgets/table/e-tree-memory.h
deleted file mode 100644
index c14940b6ac..0000000000
--- a/widgets/table/e-tree-memory.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TREE_MEMORY_H_
-#define _E_TREE_MEMORY_H_
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gal/e-table/e-tree-model.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-#define E_TREE_MEMORY_TYPE        (e_tree_memory_get_type ())
-#define E_TREE_MEMORY(o)          (GTK_CHECK_CAST ((o), E_TREE_MEMORY_TYPE, ETreeMemory))
-#define E_TREE_MEMORY_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TREE_MEMORY_TYPE, ETreeMemoryClass))
-#define E_IS_TREE_MEMORY(o)       (GTK_CHECK_TYPE ((o), E_TREE_MEMORY_TYPE))
-#define E_IS_TREE_MEMORY_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TREE_MEMORY_TYPE))
-
-typedef struct ETreeMemory ETreeMemory;
-typedef struct ETreeMemoryPriv ETreeMemoryPriv;
-typedef struct ETreeMemoryClass ETreeMemoryClass;
-
-typedef int (*ETreeMemorySortCallback) (ETreeMemory *etmm, ETreePath path1, ETreePath path2, gpointer closure);
-
-struct ETreeMemory {
-	ETreeModel base;
-	ETreeMemoryPriv *priv;
-};
-
-struct ETreeMemoryClass {
-	ETreeModelClass parent_class;
-};
-
-
-GtkType      e_tree_memory_get_type               (void);
-void         e_tree_memory_construct              (ETreeMemory             *etree);
-ETreeMemory *e_tree_memory_new                    (void);
-
-/* node operations */
-ETreePath    e_tree_memory_node_insert            (ETreeMemory             *etree,
-						   ETreePath                parent,
-						   int                      position,
-						   gpointer                 node_data);
-ETreePath    e_tree_memory_node_insert_id         (ETreeMemory             *etree,
-						   ETreePath                parent,
-						   int                      position,
-						   gpointer                 node_data,
-						   char                    *id);
-ETreePath    e_tree_memory_node_insert_before     (ETreeMemory             *etree,
-						   ETreePath                parent,
-						   ETreePath                sibling,
-						   gpointer                 node_data);
-gpointer     e_tree_memory_node_remove            (ETreeMemory             *etree,
-						   ETreePath                path);
-
-/* Freeze and thaw */
-void         e_tree_memory_freeze                 (ETreeMemory             *etree);
-void         e_tree_memory_thaw                   (ETreeMemory             *etree);
-void         e_tree_memory_set_expanded_default   (ETreeMemory             *etree,
-						   gboolean                 expanded);
-gpointer     e_tree_memory_node_get_data          (ETreeMemory             *etm,
-						   ETreePath                node);
-void         e_tree_memory_node_set_data          (ETreeMemory             *etm,
-						   ETreePath                node,
-						   gpointer                 node_data);
-void         e_tree_memory_sort_node              (ETreeMemory             *etm,
-						   ETreePath                node,
-						   ETreeMemorySortCallback  callback,
-						   gpointer                 user_data);
-void         e_tree_memory_set_node_destroy_func  (ETreeMemory             *etmm,
-						   GFunc                    destroy_func,
-						   gpointer                 user_data);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TREE_MEMORY_H */
-
diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c
deleted file mode 100644
index 90ed489a74..0000000000
--- a/widgets/table/e-tree-model.c
+++ /dev/null
@@ -1,876 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-tree-model.c: a Tree Model
- *
- * Author:
- *   Chris Toshok (toshok@ximian.com)
- *   Chris Lahey  <clahey@ximian.com>
- *
- * Adapted from the gtree code and ETableModel.
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#include <config.h>
-
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include <gtk/gtksignal.h>
-#include "gal/util/e-util.h"
-#include "gal/util/e-xml-utils.h"
-#include "e-tree-model.h"
-
-#define ETM_CLASS(e) ((ETreeModelClass *)((GtkObject *)e)->klass)
-
-#define PARENT_TYPE (gtk_object_get_type())
-
-static GtkObjectClass *parent_class;
-
-enum {
-	PRE_CHANGE,
-	NODE_CHANGED,
-	NODE_DATA_CHANGED,
-	NODE_COL_CHANGED,
-	NODE_INSERTED,
-	NODE_REMOVED,
-	LAST_SIGNAL
-};
-
-static guint e_tree_model_signals [LAST_SIGNAL] = {0, };
-
-
-static void
-e_tree_model_class_init (GtkObjectClass *klass)
-{
-	ETreeModelClass *tree_class = (ETreeModelClass *) klass;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	e_tree_model_signals [PRE_CHANGE] =
-		gtk_signal_new ("pre_change",
-				GTK_RUN_LAST,
-				klass->type,
-				GTK_SIGNAL_OFFSET (ETreeModelClass, pre_change),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_tree_model_signals [NODE_CHANGED] =
-		gtk_signal_new ("node_changed",
-				GTK_RUN_LAST,
-				klass->type,
-				GTK_SIGNAL_OFFSET (ETreeModelClass, node_changed),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
-
-	e_tree_model_signals [NODE_DATA_CHANGED] =
-		gtk_signal_new ("node_data_changed",
-				GTK_RUN_LAST,
-				klass->type,
-				GTK_SIGNAL_OFFSET (ETreeModelClass, node_data_changed),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
-
-	e_tree_model_signals [NODE_COL_CHANGED] =
-		gtk_signal_new ("node_col_changed",
-				GTK_RUN_LAST,
-				klass->type,
-				GTK_SIGNAL_OFFSET (ETreeModelClass, node_col_changed),
-				gtk_marshal_NONE__POINTER_INT,
-				GTK_TYPE_NONE, 2, GTK_TYPE_POINTER, GTK_TYPE_INT);
-
-	e_tree_model_signals [NODE_INSERTED] =
-		gtk_signal_new ("node_inserted",
-				GTK_RUN_LAST,
-				klass->type,
-				GTK_SIGNAL_OFFSET (ETreeModelClass, node_inserted),
-				gtk_marshal_NONE__POINTER_POINTER,
-				GTK_TYPE_NONE, 2, GTK_TYPE_POINTER, GTK_TYPE_POINTER);
-
-	e_tree_model_signals [NODE_REMOVED] =
-		gtk_signal_new ("node_removed",
-				GTK_RUN_LAST,
-				klass->type,
-				GTK_SIGNAL_OFFSET (ETreeModelClass, node_removed),
-				e_marshal_NONE__POINTER_POINTER_INT,
-				GTK_TYPE_NONE, 3, GTK_TYPE_POINTER, GTK_TYPE_POINTER, GTK_TYPE_INT);
-
-	gtk_object_class_add_signals (klass, e_tree_model_signals, LAST_SIGNAL);
-
-	tree_class->get_root             = NULL;
-
-	tree_class->get_parent           = NULL;
-	tree_class->get_first_child      = NULL;
-	tree_class->get_last_child       = NULL;
-	tree_class->get_next             = NULL;
-	tree_class->get_prev             = NULL;
-
-	tree_class->is_root              = NULL;
-	tree_class->is_expandable        = NULL;
-	tree_class->get_children         = NULL;
-	tree_class->depth                = NULL;
-
-	tree_class->icon_at              = NULL;
-
-	tree_class->get_expanded_default = NULL;
-	tree_class->column_count         = NULL;
-
-	tree_class->has_save_id          = NULL;
-	tree_class->get_save_id          = NULL;
-	tree_class->has_get_node_by_id   = NULL;
-	tree_class->get_node_by_id       = NULL;
-
-	tree_class->has_change_pending   = NULL;
-
-	tree_class->value_at             = NULL;
-	tree_class->set_value_at         = NULL;
-	tree_class->is_editable          = NULL;
-
-	tree_class->duplicate_value      = NULL;
-	tree_class->free_value           = NULL;
-	tree_class->initialize_value     = NULL;
-	tree_class->value_is_empty       = NULL;
-	tree_class->value_to_string      = NULL;
-
-	tree_class->pre_change           = NULL;
-	tree_class->node_changed         = NULL;
-	tree_class->node_data_changed    = NULL;
-	tree_class->node_col_changed     = NULL;
-	tree_class->node_inserted        = NULL;
-	tree_class->node_removed         = NULL;
-}
-
-static void
-e_tree_init (GtkObject *object)
-{
-}
-
-E_MAKE_TYPE(e_tree_model, "ETreeModel", ETreeModel, e_tree_model_class_init, e_tree_init, PARENT_TYPE)
-
-
-/* signals */
-
-/**
- * e_tree_model_node_changed:
- * @tree_model: 
- * @node: 
- * 
- * 
- * 
- * Return value: 
- **/
-void
-e_tree_model_pre_change  (ETreeModel *tree_model)
-{
-	g_return_if_fail (tree_model != NULL);
-	g_return_if_fail (E_IS_TREE_MODEL (tree_model));
-	
-	gtk_signal_emit (GTK_OBJECT (tree_model),
-			 e_tree_model_signals [PRE_CHANGE]);
-}
-
-/**
- * e_tree_model_node_changed:
- * @tree_model: 
- * @node: 
- * 
- * 
- * 
- * Return value: 
- **/
-void
-e_tree_model_node_changed  (ETreeModel *tree_model, ETreePath node)
-{
-	g_return_if_fail (tree_model != NULL);
-	g_return_if_fail (E_IS_TREE_MODEL (tree_model));
-	
-	gtk_signal_emit (GTK_OBJECT (tree_model),
-			 e_tree_model_signals [NODE_CHANGED], node);
-}
-
-/**
- * e_tree_model_node_data_changed:
- * @tree_model: 
- * @node: 
- * 
- * 
- * 
- * Return value: 
- **/
-void
-e_tree_model_node_data_changed  (ETreeModel *tree_model, ETreePath node)
-{
-	g_return_if_fail (tree_model != NULL);
-	g_return_if_fail (E_IS_TREE_MODEL (tree_model));
-	
-	gtk_signal_emit (GTK_OBJECT (tree_model),
-			 e_tree_model_signals [NODE_DATA_CHANGED], node);
-}
-
-/**
- * e_tree_model_node_col_changed:
- * @tree_model: 
- * @node: 
- * 
- * 
- * 
- * Return value: 
- **/
-void
-e_tree_model_node_col_changed  (ETreeModel *tree_model, ETreePath node, int col)
-{
-	g_return_if_fail (tree_model != NULL);
-	g_return_if_fail (E_IS_TREE_MODEL (tree_model));
-	
-	gtk_signal_emit (GTK_OBJECT (tree_model),
-			 e_tree_model_signals [NODE_COL_CHANGED], node, col);
-}
-
-/**
- * e_tree_model_node_inserted:
- * @tree_model: 
- * @parent_node: 
- * @inserted_node: 
- * 
- * 
- **/
-void
-e_tree_model_node_inserted (ETreeModel *tree_model,
-			    ETreePath parent_node,
-			    ETreePath inserted_node)
-{
-	g_return_if_fail (tree_model != NULL);
-	g_return_if_fail (E_IS_TREE_MODEL (tree_model));
-
-	gtk_signal_emit (GTK_OBJECT (tree_model),
-			 e_tree_model_signals [NODE_INSERTED],
-			 parent_node, inserted_node);
-}
-
-/**
- * e_tree_model_node_removed:
- * @tree_model: 
- * @parent_node: 
- * @removed_node: 
- * 
- * 
- **/
-void
-e_tree_model_node_removed  (ETreeModel *tree_model, ETreePath parent_node, ETreePath removed_node, int old_position)
-{
-	g_return_if_fail (tree_model != NULL);
-	g_return_if_fail (E_IS_TREE_MODEL (tree_model));
-	
-	gtk_signal_emit (GTK_OBJECT (tree_model),
-			 e_tree_model_signals [NODE_REMOVED],
-			 parent_node, removed_node, old_position);
-}
-
-
-
-/**
- * e_tree_model_new
- *
- * XXX docs here.
- *
- * return values: a newly constructed ETreeModel.
- */
-ETreeModel *
-e_tree_model_new ()
-{
-	ETreeModel *et;
-
-	et = gtk_type_new (e_tree_model_get_type ());
-
-	return et;
-}
-
-/**
- * e_tree_model_get_root
- * @etree: the ETreeModel of which we want the root node.
- *
- * Accessor for the root node of @etree.
- *
- * return values: the ETreePath corresponding to the root node.
- */
-ETreePath 
-e_tree_model_get_root (ETreeModel *etree)
-{
-	g_return_val_if_fail (etree != NULL, NULL);
-	g_return_val_if_fail (E_IS_TREE_MODEL (etree), NULL);
-
-	if (ETM_CLASS(etree)->get_root)
-		return ETM_CLASS(etree)->get_root(etree);
-	else
-		return NULL;
-}
-
-/**
- * e_tree_model_node_get_parent:
- * @etree: 
- * @path: 
- * 
- * 
- * 
- * Return value: 
- **/
-ETreePath 
-e_tree_model_node_get_parent (ETreeModel *etree, ETreePath node)
-{
-	g_return_val_if_fail(etree != NULL, NULL);
-	if (ETM_CLASS(etree)->get_parent)
-		return ETM_CLASS(etree)->get_parent(etree, node);
-	else
-		return NULL;
-}
-
-/**
- * e_tree_model_node_get_first_child:
- * @etree: 
- * @node: 
- * 
- * 
- * 
- * Return value: 
- **/
-ETreePath 
-e_tree_model_node_get_first_child (ETreeModel *etree, ETreePath node)
-{
-	g_return_val_if_fail (etree != NULL, NULL);
-	g_return_val_if_fail (E_IS_TREE_MODEL (etree), NULL);
-
-	if (ETM_CLASS(etree)->get_first_child)
-		return ETM_CLASS(etree)->get_first_child(etree, node);
-	else
-		return NULL;
-}
-
-/**
- * e_tree_model_node_get_last_child:
- * @etree: 
- * @node: 
- * 
- * 
- * 
- * Return value: 
- **/
-ETreePath 
-e_tree_model_node_get_last_child (ETreeModel *etree, ETreePath node)
-{
-	g_return_val_if_fail (etree != NULL, NULL);
-	g_return_val_if_fail (E_IS_TREE_MODEL (etree), NULL);
-
-	if (ETM_CLASS(etree)->get_last_child)
-		return ETM_CLASS(etree)->get_last_child(etree, node);
-	else
-		return NULL;
-}
-
-
-/**
- * e_tree_model_node_get_next:
- * @etree: 
- * @node: 
- * 
- * 
- * 
- * Return value: 
- **/
-ETreePath 
-e_tree_model_node_get_next (ETreeModel *etree, ETreePath node)
-{
-	g_return_val_if_fail (etree != NULL, NULL);
-	g_return_val_if_fail (E_IS_TREE_MODEL (etree), NULL);
-
-	if (ETM_CLASS(etree)->get_next)
-		return ETM_CLASS(etree)->get_next(etree, node);
-	else
-		return NULL;
-}
-
-/**
- * e_tree_model_node_get_prev:
- * @etree: 
- * @node: 
- * 
- * 
- * 
- * Return value: 
- **/
-ETreePath 
-e_tree_model_node_get_prev (ETreeModel *etree, ETreePath node)
-{
-	g_return_val_if_fail (etree != NULL, NULL);
-	g_return_val_if_fail (E_IS_TREE_MODEL (etree), NULL);
-
-	if (ETM_CLASS(etree)->get_prev)
-		return ETM_CLASS(etree)->get_prev(etree, node);
-	else
-		return NULL;
-}
-
-/**
- * e_tree_model_node_is_root:
- * @etree: 
- * @path: 
- * 
- * 
- * 
- * Return value: 
- **/
-gboolean
-e_tree_model_node_is_root (ETreeModel *etree, ETreePath node)
-{
-	g_return_val_if_fail(etree != NULL, FALSE);
-
-	if (ETM_CLASS(etree)->is_root)
-		return ETM_CLASS(etree)->is_root(etree, node);
-	else
-		return FALSE;
-}
-
-/**
- * e_tree_model_node_is_expandable:
- * @etree: 
- * @path: 
- * 
- * 
- * 
- * Return value: 
- **/
-gboolean
-e_tree_model_node_is_expandable (ETreeModel *etree, ETreePath node)
-{
-	g_return_val_if_fail(etree != NULL, FALSE);
-
-	if (ETM_CLASS(etree)->is_expandable)
-		return ETM_CLASS(etree)->is_expandable(etree, node);
-	else
-		return FALSE;
-}
-
-guint
-e_tree_model_node_get_children (ETreeModel *etree, ETreePath node, ETreePath **nodes)
-{
-	g_return_val_if_fail(etree != NULL, 0);
-	if (ETM_CLASS(etree)->get_children)
-		return ETM_CLASS(etree)->get_children (etree, node, nodes);
-	else
-		return 0;
-}
-
-/**
- * e_tree_model_node_depth:
- * @etree: 
- * @path: 
- * 
- * 
- * 
- * Return value: 
- **/
-guint
-e_tree_model_node_depth (ETreeModel *etree, ETreePath node)
-{
-	g_return_val_if_fail (etree != NULL, 0);
-	g_return_val_if_fail (E_IS_TREE_MODEL (etree), 0);
-
-	if (ETM_CLASS(etree)->depth)
-		return ETM_CLASS(etree)->depth(etree, node);
-	else
-		return 0;
-}
-
-/**
- * e_tree_model_icon_at
- * @etree: The ETreeModel.
- * @path: The ETreePath to the node we're getting the icon of.
- *
- * XXX docs here.
- *
- * return values: the GdkPixbuf associated with this node.
- */
-GdkPixbuf *
-e_tree_model_icon_at (ETreeModel *etree, ETreePath node)
-{
-	g_return_val_if_fail (etree != NULL, NULL);
-	g_return_val_if_fail (E_IS_TREE_MODEL (etree), NULL);
-
-	if (ETM_CLASS(etree)->icon_at)
-		return ETM_CLASS(etree)->icon_at (etree, node);
-	else
-		return NULL;
-}
-
-/**
- * e_tree_model_get_expanded_default
- * @etree: The ETreeModel.
- *
- * XXX docs here.
- *
- * return values: Whether nodes should be expanded by default.
- */
-gboolean
-e_tree_model_get_expanded_default (ETreeModel *etree)
-{
-	g_return_val_if_fail (etree != NULL, FALSE);
-	g_return_val_if_fail (E_IS_TREE_MODEL (etree), FALSE);
-
-	if (ETM_CLASS(etree)->get_expanded_default)
-		return ETM_CLASS(etree)->get_expanded_default (etree);
-	else
-		return FALSE;
-}
-
-/**
- * e_tree_model_column_count
- * @etree: The ETreeModel.
- *
- * XXX docs here.
- *
- * return values: The number of columns
- */
-gint
-e_tree_model_column_count (ETreeModel *etree)
-{
-	g_return_val_if_fail (etree != NULL, 0);
-	g_return_val_if_fail (E_IS_TREE_MODEL (etree), 0);
-
-	if (ETM_CLASS(etree)->column_count)
-		return ETM_CLASS(etree)->column_count (etree);
-	else
-		return 0;
-}
-
-/**
- * e_tree_model_has_save_id
- * @etree: The ETreeModel.
- *
- * XXX docs here.
- *
- * return values: Whether this tree has valid save id data.
- */
-gboolean
-e_tree_model_has_save_id (ETreeModel *etree)
-{
-	g_return_val_if_fail (etree != NULL, FALSE);
-	g_return_val_if_fail (E_IS_TREE_MODEL (etree), FALSE);
-
-	if (ETM_CLASS(etree)->has_save_id)
-		return ETM_CLASS(etree)->has_save_id (etree);
-	else
-		return FALSE;
-}
-
-/**
- * e_tree_model_get_save_id
- * @etree: The ETreeModel.
- * @node: The ETreePath.
- *
- * XXX docs here.
- *
- * return values: The save id for this path.
- */
-gchar *
-e_tree_model_get_save_id (ETreeModel *etree, ETreePath node)
-{
-	g_return_val_if_fail (etree != NULL, NULL);
-	g_return_val_if_fail (E_IS_TREE_MODEL (etree), NULL);
-
-	if (ETM_CLASS(etree)->get_save_id)
-		return ETM_CLASS(etree)->get_save_id (etree, node);
-	else
-		return NULL;
-}
-
-/**
- * e_tree_model_has_get_node_by_id
- * @etree: The ETreeModel.
- *
- * XXX docs here.
- *
- * return values: Whether this tree can quickly get a node from its save id.
- */
-gboolean
-e_tree_model_has_get_node_by_id (ETreeModel *etree)
-{
-	g_return_val_if_fail (etree != NULL, FALSE);
-	g_return_val_if_fail (E_IS_TREE_MODEL (etree), FALSE);
-
-	if (ETM_CLASS(etree)->has_get_node_by_id)
-		return ETM_CLASS(etree)->has_get_node_by_id (etree);
-	else
-		return FALSE;
-}
-
-/**
- * e_tree_model_get_node_by_id
- * @etree: The ETreeModel.
- * @node: The ETreePath.
- *
- * get_node_by_id(get_save_id(node)) should be the original node.
- * Likewise if get_node_by_id is not NULL, then
- * get_save_id(get_node_by_id(string)) should be a copy of the
- * original string.
- *
- * return values: The path for this save id.
- */
-ETreePath
-e_tree_model_get_node_by_id (ETreeModel *etree, gchar *save_id)
-{
-	g_return_val_if_fail (etree != NULL, NULL);
-	g_return_val_if_fail (E_IS_TREE_MODEL (etree), NULL);
-
-	if (ETM_CLASS(etree)->get_node_by_id)
-		return ETM_CLASS(etree)->get_node_by_id (etree, save_id);
-	else
-		return NULL;
-}
-
-/**
- * e_tree_model_has_change_pending
- * @etree: The ETreeModel.
- *
- * XXX docs here.
- *
- * return values: Whether this tree has valid save id data.
- */
-gboolean
-e_tree_model_has_change_pending (ETreeModel *etree)
-{
-	g_return_val_if_fail (etree != NULL, FALSE);
-	g_return_val_if_fail (E_IS_TREE_MODEL (etree), FALSE);
-
-	if (ETM_CLASS(etree)->has_change_pending)
-		return ETM_CLASS(etree)->has_change_pending (etree);
-	else
-		return FALSE;
-}
-
-/**
- * e_tree_model_icon_of_node
- * @etree: The ETreeModel.
- * @path: The ETreePath to the node we're getting the icon of.
- *
- * XXX docs here.
- *
- * return values: the GdkPixbuf associated with this node.
- */
-void *
-e_tree_model_value_at (ETreeModel *etree, ETreePath node, int col)
-{
-	g_return_val_if_fail (etree != NULL, NULL);
-	g_return_val_if_fail (E_IS_TREE_MODEL (etree), NULL);
-
-	if (ETM_CLASS(etree)->value_at)
-		return ETM_CLASS(etree)->value_at (etree, node, col);
-	else
-		return NULL;
-}
-
-/**
- * e_tree_model_icon_of_node
- * @etree: The ETreeModel.
- * @path: The ETreePath to the node we're getting the icon of.
- *
- * XXX docs here.
- *
- * return values: the GdkPixbuf associated with this node.
- */
-void
-e_tree_model_set_value_at (ETreeModel *etree, ETreePath node, int col, const void *val)
-{
-	g_return_if_fail (etree != NULL);
-	g_return_if_fail (E_IS_TREE_MODEL (etree));
-
-	if (ETM_CLASS(etree)->set_value_at)
-		ETM_CLASS(etree)->set_value_at (etree, node, col, val);
-}
-
-/**
- * e_tree_model_node_is_editable:
- * @etree: 
- * @path: 
- * 
- * 
- * 
- * Return value: 
- **/
-gboolean
-e_tree_model_node_is_editable (ETreeModel *etree, ETreePath node, int col)
-{
-	g_return_val_if_fail(etree != NULL, FALSE);
-
-	if (ETM_CLASS(etree)->is_editable)
-		return ETM_CLASS(etree)->is_editable(etree, node, col);
-	else
-		return FALSE;
-}
-
-/**
- * e_tree_model_duplicate_value:
- * @etree: 
- * @path: 
- * 
- * 
- * 
- * Return value: 
- **/
-void *
-e_tree_model_duplicate_value (ETreeModel *etree, int col, const void *value)
-{
-	g_return_val_if_fail(etree != NULL, NULL);
-
-	if (ETM_CLASS(etree)->duplicate_value)
-		return ETM_CLASS(etree)->duplicate_value(etree, col, value);
-	else
-		return NULL;
-}
-
-/**
- * e_tree_model_free_value:
- * @etree: 
- * @path: 
- * 
- * 
- * 
- * Return value: 
- **/
-void
-e_tree_model_free_value (ETreeModel *etree, int col, void *value)
-{
-	g_return_if_fail(etree != NULL);
-
-	if (ETM_CLASS(etree)->free_value)
-		ETM_CLASS(etree)->free_value(etree, col, value);
-}
-
-/**
- * e_tree_model_initialize_value:
- * @etree: 
- * @path: 
- * 
- * 
- * 
- * Return value: 
- **/
-void *
-e_tree_model_initialize_value (ETreeModel *etree, int col)
-{
-	g_return_val_if_fail(etree != NULL, NULL);
-
-	if (ETM_CLASS(etree)->initialize_value)
-		return ETM_CLASS(etree)->initialize_value(etree, col);
-	else
-		return NULL;
-}
-
-/**
- * e_tree_model_value_is_empty:
- * @etree: 
- * @path: 
- * 
- * 
- * 
- * Return value: 
- **/
-gboolean
-e_tree_model_value_is_empty (ETreeModel *etree, int col, const void *value)
-{
-	g_return_val_if_fail(etree != NULL, TRUE);
-
-	if (ETM_CLASS(etree)->value_is_empty)
-		return ETM_CLASS(etree)->value_is_empty(etree, col, value);
-	else
-		return TRUE;
-}
-
-/**
- * e_tree_model_value_to_string:
- * @etree: 
- * @path: 
- * 
- * 
- * 
- * Return value: 
- **/
-char *
-e_tree_model_value_to_string (ETreeModel *etree, int col, const void *value)
-{
-	g_return_val_if_fail(etree != NULL, g_strdup(""));
-
-	if (ETM_CLASS(etree)->value_to_string)
-		return ETM_CLASS(etree)->value_to_string(etree, col, value);
-	else
-		return g_strdup("");
-}
-
-/**
- * e_tree_model_node_traverse:
- * @model: 
- * @path: 
- * @func: 
- * @data: 
- * 
- * 
- **/
-void
-e_tree_model_node_traverse (ETreeModel *model, ETreePath path, ETreePathFunc func, gpointer data)
-{
-	ETreePath child;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_TREE_MODEL (model));
-	g_return_if_fail (path != NULL);
-
-	child = e_tree_model_node_get_first_child (model, path);
-
-	while (child) {
-		ETreePath next_child;
-
-		next_child = e_tree_model_node_get_next (model, child);
-		e_tree_model_node_traverse (model, child, func, data);
-		if (func (model, child, data) == TRUE)
-			return;
-
-		child = next_child;
-	}
-}
-
-/**
- * e_tree_model_node_traverse_preorder:
- * @model: 
- * @path: 
- * @func: 
- * @data: 
- * 
- * 
- **/
-void
-e_tree_model_node_traverse_preorder (ETreeModel *model, ETreePath path, ETreePathFunc func, gpointer data)
-{
-	ETreePath child;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_TREE_MODEL (model));
-	g_return_if_fail (path != NULL);
-
-	child = e_tree_model_node_get_first_child (model, path);
-
-	while (child) {
-		ETreePath next_child;
-
-		if (func (model, child, data) == TRUE)
-			return;
-
-		next_child = e_tree_model_node_get_next (model, child);
-		e_tree_model_node_traverse_preorder (model, child, func, data);
-
-		child = next_child;
-	}
-}
-
diff --git a/widgets/table/e-tree-model.h b/widgets/table/e-tree-model.h
deleted file mode 100644
index 1b48e23963..0000000000
--- a/widgets/table/e-tree-model.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TREE_MODEL_H_
-#define _E_TREE_MODEL_H_
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkobject.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-#define E_TREE_MODEL_TYPE        (e_tree_model_get_type ())
-#define E_TREE_MODEL(o)          (GTK_CHECK_CAST ((o), E_TREE_MODEL_TYPE, ETreeModel))
-#define E_TREE_MODEL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TREE_MODEL_TYPE, ETreeModelClass))
-#define E_IS_TREE_MODEL(o)       (GTK_CHECK_TYPE ((o), E_TREE_MODEL_TYPE))
-#define E_IS_TREE_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TREE_MODEL_TYPE))
-
-typedef void * ETreePath;
-typedef struct ETreeModel ETreeModel;
-typedef struct ETreeModelClass ETreeModelClass;
-typedef gint (*ETreePathCompareFunc)(ETreeModel *model, ETreePath path1, ETreePath path2);
-typedef gboolean (*ETreePathFunc)(ETreeModel *model, ETreePath path, gpointer data);
-
-struct ETreeModel {
-	GtkObject base;
-};
-
-struct ETreeModelClass {
-	GtkObjectClass parent_class;
-
-	/*
-	 * Virtual methods
-	 */
-	ETreePath (*get_root)              (ETreeModel *etm);
-
-	ETreePath (*get_parent)            (ETreeModel *etm, ETreePath node);
-	ETreePath (*get_first_child)       (ETreeModel *etm, ETreePath node);
-	ETreePath (*get_last_child)        (ETreeModel *etm, ETreePath node);
-	ETreePath (*get_next)              (ETreeModel *etm, ETreePath node);
-	ETreePath (*get_prev)              (ETreeModel *etm, ETreePath node);
-
-	gboolean   (*is_root)              (ETreeModel *etm, ETreePath node);
-	gboolean   (*is_expandable)        (ETreeModel *etm, ETreePath node);
-	guint      (*get_children)         (ETreeModel *etm, ETreePath node, ETreePath **paths);
-	guint      (*depth)                (ETreeModel *etm, ETreePath node);
-
-	GdkPixbuf *(*icon_at)              (ETreeModel *etm, ETreePath node);
-
-	gboolean   (*get_expanded_default) (ETreeModel *etm);
-	gint       (*column_count)         (ETreeModel *etm);
-
-	gboolean   (*has_save_id)          (ETreeModel *etm);
-	gchar     *(*get_save_id)          (ETreeModel *etm, ETreePath node);
-
-	gboolean   (*has_get_node_by_id)   (ETreeModel *etm);
-	ETreePath  (*get_node_by_id)       (ETreeModel *etm, gchar *save_id);
-
-	gboolean   (*has_change_pending)   (ETreeModel *etm);
-
-	/*
-	 * ETable analogs
-	 */
-	void      *(*value_at)             (ETreeModel *etm, ETreePath node, int col);
-	void       (*set_value_at)         (ETreeModel *etm, ETreePath node, int col, const void *val);
-	gboolean   (*is_editable)          (ETreeModel *etm, ETreePath node, int col);
-
-	void      *(*duplicate_value)      (ETreeModel *etm, int col, const void *value);
-	void       (*free_value)           (ETreeModel *etm, int col, void *value);
-	void	  *(*initialize_value)     (ETreeModel *etm, int col);
-	gboolean   (*value_is_empty)       (ETreeModel *etm, int col, const void *value);
-	char      *(*value_to_string)      (ETreeModel *etm, int col, const void *value);
-
-	/*
-	 * Signals
-	 */
-	void       (*pre_change)           (ETreeModel *etm);
-	void       (*node_changed)         (ETreeModel *etm, ETreePath node);
-	void       (*node_data_changed)    (ETreeModel *etm, ETreePath node);
-	void       (*node_col_changed)     (ETreeModel *etm, ETreePath node,   int col);
-	void       (*node_inserted)        (ETreeModel *etm, ETreePath parent, ETreePath inserted_node);
-	void       (*node_removed)         (ETreeModel *etm, ETreePath parent, ETreePath removed_node, int old_position);
-};
-GtkType     e_tree_model_get_type              (void);
-ETreeModel *e_tree_model_new                   (void);
-
-/* tree traversal operations */
-ETreePath   e_tree_model_get_root              (ETreeModel     *etree);
-ETreePath   e_tree_model_node_get_parent       (ETreeModel     *etree,
-						ETreePath       path);
-ETreePath   e_tree_model_node_get_first_child  (ETreeModel     *etree,
-						ETreePath       path);
-ETreePath   e_tree_model_node_get_last_child   (ETreeModel     *etree,
-						ETreePath       path);
-ETreePath   e_tree_model_node_get_next         (ETreeModel     *etree,
-						ETreePath       path);
-ETreePath   e_tree_model_node_get_prev         (ETreeModel     *etree,
-						ETreePath       path);
-
-/* node accessors */
-gboolean    e_tree_model_node_is_root          (ETreeModel     *etree,
-						ETreePath       path);
-gboolean    e_tree_model_node_is_expandable    (ETreeModel     *etree,
-						ETreePath       path);
-guint       e_tree_model_node_get_children     (ETreeModel     *etree,
-						ETreePath       path,
-						ETreePath     **paths);
-guint       e_tree_model_node_depth            (ETreeModel     *etree,
-						ETreePath       path);
-GdkPixbuf  *e_tree_model_icon_at               (ETreeModel     *etree,
-						ETreePath       path);
-gboolean    e_tree_model_get_expanded_default  (ETreeModel     *model);
-gint        e_tree_model_column_count          (ETreeModel     *model);
-
-
-gboolean    e_tree_model_has_save_id           (ETreeModel     *model);
-gchar      *e_tree_model_get_save_id           (ETreeModel     *model,
-						ETreePath       node);
-
-gboolean    e_tree_model_has_get_node_by_id    (ETreeModel     *model);
-ETreePath   e_tree_model_get_node_by_id        (ETreeModel     *model,
-						gchar          *save_id);
-
-gboolean    e_tree_model_has_change_pending    (ETreeModel     *model);
-
-void       *e_tree_model_value_at              (ETreeModel     *etree,
-						ETreePath       node,
-						int             col);
-void        e_tree_model_set_value_at          (ETreeModel     *etree,
-						ETreePath       node,
-						int             col,
-						const void     *val);
-gboolean    e_tree_model_node_is_editable      (ETreeModel     *etree,
-						ETreePath       node,
-						int             col);
-void       *e_tree_model_duplicate_value       (ETreeModel     *etree,
-						int             col,
-						const void     *value);
-void        e_tree_model_free_value            (ETreeModel     *etree,
-						int             col,
-						void           *value);
-void       *e_tree_model_initialize_value      (ETreeModel     *etree,
-						int             col);
-gboolean    e_tree_model_value_is_empty        (ETreeModel     *etree,
-						int             col,
-						const void     *value);
-char       *e_tree_model_value_to_string       (ETreeModel     *etree,
-						int             col,
-						const void     *value);
-
-/* depth first traversal of path's descendents, calling func on each one */
-void        e_tree_model_node_traverse         (ETreeModel     *model,
-						ETreePath       path,
-						ETreePathFunc   func,
-						gpointer        data);
-void        e_tree_model_node_traverse_preorder (ETreeModel     *model,
-						 ETreePath       path,
-						 ETreePathFunc   func,
-						 gpointer        data);
-	
-/*
-** Routines for emitting signals on the ETreeModel
-*/
-void        e_tree_model_pre_change            (ETreeModel     *tree_model);
-void        e_tree_model_node_changed          (ETreeModel     *tree_model,
-						ETreePath       node);
-void        e_tree_model_node_data_changed     (ETreeModel     *tree_model,
-						ETreePath       node);
-void        e_tree_model_node_col_changed      (ETreeModel     *tree_model,
-						ETreePath       node,
-						int             col);
-void        e_tree_model_node_inserted         (ETreeModel     *tree_model,
-						ETreePath       parent_node,
-						ETreePath       inserted_node);
-void        e_tree_model_node_removed          (ETreeModel     *tree_model,
-						ETreePath       parent_node,
-						ETreePath       removed_node,
-						int             old_position);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TREE_MODEL_H */
diff --git a/widgets/table/e-tree-scrolled.c b/widgets/table/e-tree-scrolled.c
deleted file mode 100644
index ba1780036c..0000000000
--- a/widgets/table/e-tree-scrolled.c
+++ /dev/null
@@ -1,208 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-tree-scrolled.c: A graphical view of a Tree.
- *
- * Author:
- *   Chris Lahey <clahey@ximian.com>
- *   Miguel de Icaza (miguel@ximian.com)
- *
- * Copyright 2000, 1999, Ximian, Inc
- */
-#include <config.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdio.h>
-#include <libgnomeui/gnome-canvas.h>
-#include <gtk/gtksignal.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-#include <gal/util/e-util.h>
-
-#include "e-tree-scrolled.h"
-
-#define COLUMN_HEADER_HEIGHT 16
-
-#define PARENT_TYPE e_scroll_frame_get_type ()
-
-static GtkObjectClass *parent_class;
-
-enum {
-	ARG_0,
-	ARG_TREE,
-};
-
-static void
-e_tree_scrolled_init (GtkObject *object)
-{
-	ETreeScrolled *ets;
-	EScrollFrame *scroll_frame;
-
-	ets          = E_TREE_SCROLLED (object);
-	scroll_frame = E_SCROLL_FRAME   (object);
-
-	GTK_WIDGET_SET_FLAGS (ets, GTK_CAN_FOCUS);
-
-	ets->tree = gtk_type_new(e_tree_get_type());
-
-	e_scroll_frame_set_policy      (scroll_frame, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	e_scroll_frame_set_shadow_type (scroll_frame, GTK_SHADOW_IN);
-}
-
-static void
-e_tree_scrolled_real_construct (ETreeScrolled *ets)
-{
-	gtk_container_add(GTK_CONTAINER(ets), GTK_WIDGET(ets->tree));
-
-	gtk_widget_show(GTK_WIDGET(ets->tree));
-}
-
-ETreeScrolled *e_tree_scrolled_construct                 (ETreeScrolled    *ets,
-							    ETreeModel       *etm,
-							    ETableExtras      *ete,
-							    const char        *spec,
-							    const char        *state)
-{
-	g_return_val_if_fail(ets != NULL, NULL);
-	g_return_val_if_fail(E_IS_TREE_SCROLLED(ets), NULL);
-	g_return_val_if_fail(etm != NULL, NULL);
-	g_return_val_if_fail(E_IS_TREE_MODEL(etm), NULL);
-	g_return_val_if_fail(ete == NULL || E_IS_TABLE_EXTRAS(ete), NULL);
-	g_return_val_if_fail(spec != NULL, NULL);
-
-	e_tree_construct(ets->tree, etm, ete, spec, state);
-
-	e_tree_scrolled_real_construct(ets);
-
-	return ets;
-}
-
-GtkWidget      *e_tree_scrolled_new                       (ETreeModel       *etm,
-							    ETableExtras      *ete,
-							    const char        *spec,
-							    const char        *state)
-{
-	ETreeScrolled *ets;
-
-	g_return_val_if_fail(etm != NULL, NULL);
-	g_return_val_if_fail(E_IS_TREE_MODEL(etm), NULL);
-	g_return_val_if_fail(ete == NULL || E_IS_TABLE_EXTRAS(ete), NULL);
-	g_return_val_if_fail(spec != NULL, NULL);
-
-	ets = E_TREE_SCROLLED (gtk_widget_new (e_tree_scrolled_get_type (),
-						"hadjustment", NULL,
-						"vadjustment", NULL,
-						NULL));
-
-	ets = e_tree_scrolled_construct (ets, etm, ete, spec, state);
-
-	return GTK_WIDGET (ets);
-}
-
-ETreeScrolled *e_tree_scrolled_construct_from_spec_file  (ETreeScrolled    *ets,
-							    ETreeModel       *etm,
-							    ETableExtras      *ete,
-							    const char        *spec_fn,
-							    const char        *state_fn)
-{
-	g_return_val_if_fail(ets != NULL, NULL);
-	g_return_val_if_fail(E_IS_TREE_SCROLLED(ets), NULL);
-	g_return_val_if_fail(etm != NULL, NULL);
-	g_return_val_if_fail(E_IS_TREE_MODEL(etm), NULL);
-	g_return_val_if_fail(ete == NULL || E_IS_TABLE_EXTRAS(ete), NULL);
-	g_return_val_if_fail(spec_fn != NULL, NULL);
-
-	e_tree_construct_from_spec_file(ets->tree, etm, ete, spec_fn, state_fn);
-
-	e_tree_scrolled_real_construct(ets);
-
-	return ets;
-}
-
-GtkWidget      *e_tree_scrolled_new_from_spec_file        (ETreeModel       *etm,
-							    ETableExtras      *ete,
-							    const char        *spec_fn,
-							    const char        *state_fn)
-{
-	ETreeScrolled *ets;
-
-	g_return_val_if_fail(etm != NULL, NULL);
-	g_return_val_if_fail(E_IS_TREE_MODEL(etm), NULL);
-	g_return_val_if_fail(ete == NULL || E_IS_TABLE_EXTRAS(ete), NULL);
-	g_return_val_if_fail(spec_fn != NULL, NULL);
-
-	ets = gtk_type_new (e_tree_scrolled_get_type ());
-
-	ets = e_tree_scrolled_construct_from_spec_file (ets, etm, ete, spec_fn, state_fn);
-
-	return GTK_WIDGET (ets);
-}
-
-ETree *
-e_tree_scrolled_get_tree                 (ETreeScrolled *ets)
-{
-	return ets->tree;
-}
-
-static void
-ets_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ETreeScrolled *ets = E_TREE_SCROLLED (o);
-
-	switch (arg_id){
-	case ARG_TREE:
-		if (ets->tree)
-			GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(ets->tree);
-		else
-			GTK_VALUE_OBJECT (*arg) = NULL;
-		break;
-	}
-}
-
-/* Grab_focus handler for the scrolled ETree */
-static void
-ets_grab_focus (GtkWidget *widget)
-{
-	ETreeScrolled *ets;
-
-	ets = E_TREE_SCROLLED (widget);
-
-	gtk_widget_grab_focus (GTK_WIDGET (ets->tree));
-}
-
-/* Focus handler for the scrolled ETree */
-static gint
-ets_focus (GtkContainer *container, GtkDirectionType direction)
-{
-	ETreeScrolled *ets;
-
-	ets = E_TREE_SCROLLED (container);
-
-	return gtk_container_focus (GTK_CONTAINER (ets->tree), direction);
-}
-
-static void
-e_tree_scrolled_class_init (ETreeScrolledClass *class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	GtkContainerClass *container_class;
-
-	object_class = (GtkObjectClass *) class;
-	widget_class = (GtkWidgetClass *) class;
-	container_class = (GtkContainerClass *) class;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->get_arg = ets_get_arg;
-
-	widget_class->grab_focus = ets_grab_focus;
-
-	container_class->focus = ets_focus;
-
-	gtk_object_add_arg_type ("ETreeScrolled::tree", GTK_TYPE_OBJECT,
-				 GTK_ARG_READABLE, ARG_TREE);
-}
-
-E_MAKE_TYPE(e_tree_scrolled, "ETreeScrolled", ETreeScrolled, e_tree_scrolled_class_init, e_tree_scrolled_init, PARENT_TYPE);
-
diff --git a/widgets/table/e-tree-scrolled.h b/widgets/table/e-tree-scrolled.h
deleted file mode 100644
index 374a036f0b..0000000000
--- a/widgets/table/e-tree-scrolled.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TREE_SCROLLED_H_
-#define _E_TREE_SCROLLED_H_
-
-#include <gal/widgets/e-scroll-frame.h>
-#include <gal/e-table/e-tree-model.h>
-#include <gal/e-table/e-tree.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TREE_SCROLLED_TYPE        (e_tree_scrolled_get_type ())
-#define E_TREE_SCROLLED(o)          (GTK_CHECK_CAST ((o), E_TREE_SCROLLED_TYPE, ETreeScrolled))
-#define E_TREE_SCROLLED_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TREE_SCROLLED_TYPE, ETreeScrolledClass))
-#define E_IS_TREE_SCROLLED(o)       (GTK_CHECK_TYPE ((o), E_TREE_SCROLLED_TYPE))
-#define E_IS_TREE_SCROLLED_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TREE_SCROLLED_TYPE))
-
-typedef struct {
-	EScrollFrame parent;
-
-	ETree *tree;
-} ETreeScrolled;
-
-typedef struct {
-	EScrollFrameClass parent_class;
-} ETreeScrolledClass;
-
-GtkType         e_tree_scrolled_get_type                  (void);
-
-ETreeScrolled *e_tree_scrolled_construct                 (ETreeScrolled *ets,
-							  ETreeModel    *etm,
-							  ETableExtras   *ete,
-							  const char     *spec,
-							  const char     *state);
-GtkWidget      *e_tree_scrolled_new                       (ETreeModel    *etm,
-							   ETableExtras   *ete,
-							   const char     *spec,
-							   const char     *state);
-
-ETreeScrolled *e_tree_scrolled_construct_from_spec_file  (ETreeScrolled *ets,
-							  ETreeModel    *etm,
-							  ETableExtras   *ete,
-							  const char     *spec_fn,
-							  const char     *state_fn);
-GtkWidget      *e_tree_scrolled_new_from_spec_file        (ETreeModel    *etm,
-							   ETableExtras   *ete,
-							   const char     *spec_fn,
-							   const char     *state_fn);
-
-ETree         *e_tree_scrolled_get_tree                 (ETreeScrolled *ets);
-
-END_GNOME_DECLS
-
-#endif /* _E_TREE_SCROLLED_H_ */
-
diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c
deleted file mode 100644
index 375003f35d..0000000000
--- a/widgets/table/e-tree-selection-model.c
+++ /dev/null
@@ -1,1251 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-tree-selection-model.c: a Selection Model
- *
- * Author:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#include <config.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtksignal.h>
-#include "e-tree-selection-model.h"
-#include <gal/util/e-bit-array.h>
-#include <gal/util/e-sorter.h>
-#include <gal/util/e-util.h>
-#include <gdk/gdkkeysyms.h>
-#include <gal/e-table/e-tree-sorted.h>
-#include <gal/e-table/e-tree-table-adapter.h>
-
-#define ETSM_CLASS(e) ((ETreeSelectionModelClass *)((GtkObject *)e)->klass)
-
-#define PARENT_TYPE e_selection_model_get_type ()
-
-static ESelectionModelClass *parent_class;
-
-enum {
-	ARG_0,
-	ARG_CURSOR_ROW,
-	ARG_CURSOR_COL,
-	ARG_MODEL,
-	ARG_ETTA,
-	ARG_ETS,
-};
-
-typedef struct ETreeSelectionModelNode {
-	guint selected : 1;
-	guint all_children_selected : 1;
-	guint any_children_selected : 1;
-	EBitArray *all_children_selected_array;
-	EBitArray *any_children_selected_array;
-	struct ETreeSelectionModelNode **children;
-	int num_children;
-} ETreeSelectionModelNode;
-
-struct ETreeSelectionModelPriv {
-	ETreeTableAdapter *etta;
-	ETreeSorted *ets;
-	ETreeModel *model;
-
-	ETreeSelectionModelNode *root;
-
-	ETreePath cursor_path;
-	gint cursor_col;
-	ETreePath selection_start_path;
-
-	char *cursor_save_id;
-
-	int          tree_model_pre_change_id;
-	int          tree_model_node_changed_id;
-	int          tree_model_node_data_changed_id;
-	int          tree_model_node_col_changed_id;
-	int          tree_model_node_inserted_id;
-	int          tree_model_node_removed_id;
-
-	int          sorted_model_pre_change_id;
-	int          sorted_model_node_changed_id;
-	int          sorted_model_node_data_changed_id;
-	int          sorted_model_node_col_changed_id;
-	int          sorted_model_node_inserted_id;
-	int          sorted_model_node_removed_id;
-};
-
-/* ETreeSelectionModelNode helpers */
-
-static ETreeSelectionModelNode *
-e_tree_selection_model_node_new (void)
-{
-	ETreeSelectionModelNode *node = g_new(ETreeSelectionModelNode, 1);
-
-	node->selected = 0;
-	node->all_children_selected = 0;
-	node->any_children_selected = 0;
-	node->all_children_selected_array = NULL;
-	node->any_children_selected_array = NULL;
-	node->children = NULL;
-	node->num_children = -1;
-
-	return node;
-}
-
-static void
-e_tree_selection_model_node_fill_children(ETreeSelectionModel *etsm, ETreePath path, ETreeSelectionModelNode *selection_node)
-{
-	int i;
-	selection_node->num_children = e_tree_sorted_node_num_children(etsm->priv->ets, path);
-	selection_node->children = g_new(ETreeSelectionModelNode *, selection_node->num_children);
-	for (i = 0; i < selection_node->num_children; i++) {
-		selection_node->children[i] = NULL;
-	}
-}
-
-static void
-e_tree_selection_model_node_free(ETreeSelectionModelNode *node)
-{
-	int i;
-
-	if (node->all_children_selected_array)
-		gtk_object_unref(GTK_OBJECT(node->all_children_selected_array));
-	if (node->any_children_selected_array)
-		gtk_object_unref(GTK_OBJECT(node->any_children_selected_array));
-
-	for (i = 0; i < node->num_children; i++)
-		if (node->children[i])
-			e_tree_selection_model_node_free(node->children[i]);
-	g_free(node->children);
-
-	g_free(node);
-}
-
-
-/* Other helper functions */
-static ETreePath
-etsm_node_at_row(ETreeSelectionModel *etsm, int row)
-{
-	ETreePath path;
-
-	if (!(row >= 0 && row < e_table_model_row_count(E_TABLE_MODEL(etsm->priv->etta))))
-		return NULL;
-
-	path = e_tree_table_adapter_node_at_row(etsm->priv->etta, row);
-
-	if (path)
-		path = e_tree_sorted_view_to_model_path(etsm->priv->ets, path);
- 
-	return path;
-}
-
-static int
-etsm_row_of_node(ETreeSelectionModel *etsm, ETreePath path)
-{
-	path = e_tree_sorted_model_to_view_path(etsm->priv->ets, path);
-
-	if (path)
-		return e_tree_table_adapter_row_of_node(etsm->priv->etta, path);
-	else
-		return -1;
-}
-
-static int
-etsm_cursor_row_real (ETreeSelectionModel *etsm)
-{
-	if (etsm->priv->cursor_path)
-		return etsm_row_of_node(etsm, etsm->priv->cursor_path);
-	else
-		return -1;
-}
-
-static void
-etsm_real_clear (ETreeSelectionModel *etsm)
-{
-	if (etsm->priv->root) {
-		e_tree_selection_model_node_free(etsm->priv->root);
-		etsm->priv->root = NULL;
-	}
-}
-
-static ETreeSelectionModelNode *
-etsm_find_node_unless_equals (ETreeSelectionModel *etsm,
-			      ETreePath path,
-			      gboolean grow)
-{
-	ETreeSelectionModelNode *selection_node;
-	ETreeSorted *ets = etsm->priv->ets;
-	ETreePath parent;
-
-	parent = e_tree_model_node_get_parent(E_TREE_MODEL(ets), path);
-
-	if (parent) {
-		selection_node = etsm_find_node_unless_equals(etsm, parent, grow);
-		if (selection_node) {
-			int position = e_tree_sorted_orig_position(ets, path);
-			if (selection_node->all_children_selected && grow)
-				return NULL;
-			if (!(selection_node->any_children_selected || grow))
-				return NULL;
-			if (selection_node->all_children_selected_array && e_bit_array_value_at(selection_node->all_children_selected_array, position) && grow)
-				return NULL;
-			if (selection_node->any_children_selected_array && ! (e_bit_array_value_at(selection_node->any_children_selected_array, position) || grow))
-				return NULL;
-			if (selection_node->children == NULL) {
-				e_tree_selection_model_node_fill_children(etsm, parent, selection_node);
-			}
-			if (!selection_node->children[position]) 
-				selection_node->children[position] = e_tree_selection_model_node_new();
-
-			return selection_node->children[position];
-		} else
-			  return NULL;
-	} else {
-		if (!etsm->priv->root)
-			etsm->priv->root = e_tree_selection_model_node_new();
-		return etsm->priv->root;
-	}
-}
-
-#if 0
-static ETreeSelectionModelNode *
-find_or_create_node (ETreeSelectionModel *etsm,
-		     ETreePath path)
-{
-	ETreeSelectionModelNode *selection_node;
-	ETreeSelectionModelNode **place = NULL;
-	ETreeSorted *ets = etsm->priv->ets;
-	ETreePath parent;
-
-	parent = e_tree_model_node_get_parent(E_TREE_MODEL(ets), path);
-
-	if (parent) {
-		selection_node = find_or_create_node(etsm, parent);
-		if (selection_node) {
-			int position = e_tree_sorted_orig_position(ets, path);
-			if (!selection_node->children) {
-				e_tree_selection_model_node_fill_children(etsm, parent, selection_node);
-			}
-			if (!selection_node->children[position]) 
-				slection_node->children[position] = e_tree_selection_model_node_new();
-
-			return selection_node->children[position];
-		} else
-			  return NULL;
-	} else {
-		if (!etsm->priv->root)
-			etsm->priv->root = e_tree_selection_model_node_new();
-		return etsm->priv->root;
-	}
-}
-#endif
-
-static void
-update_parents (ETreeSelectionModel *etsm, ETreePath path)
-{
-	int i;
-	int depth;
-	ETreeSorted *ets = etsm->priv->ets;
-	int *orig_position_sequence;
-	ETreeSelectionModelNode **node_sequence;
-	ETreePath parents;
-
-	if (!etsm->priv->root)
-		return;
-
-	depth = e_tree_model_node_depth (E_TREE_MODEL(ets), path);
-
-	orig_position_sequence = g_new(int, depth + 1);
-	node_sequence = g_new(ETreeSelectionModelNode *, depth + 1);
-
-	parents = path;
-
-	for (i = depth; i > 0; i--) {
-		if (!parents) {
-			g_free(orig_position_sequence);
-			g_free(node_sequence);
-			return;
-		}
-		orig_position_sequence[i] = e_tree_sorted_orig_position(etsm->priv->ets, parents);
-		parents = e_tree_model_node_get_parent(E_TREE_MODEL(etsm->priv->ets), parents);
-	}
-
-	node_sequence[0] = etsm->priv->root;
-	for (i = 0; i < depth; i++) {
-		node_sequence[i + 1] = NULL;
-
-		if (node_sequence[i]->children)
-			node_sequence[i + 1] = node_sequence[i]->children[orig_position_sequence[i + 1]];
-
-		if (node_sequence[i + 1] == NULL) {
-			g_free(orig_position_sequence);
-			g_free(node_sequence);
-			return;
-		}
-	}
-
-	if (node_sequence[depth]->num_children == -1)
-		e_tree_selection_model_node_fill_children(etsm, path, node_sequence[depth]);
-
-	if (!node_sequence[depth]->all_children_selected_array)
-		node_sequence[depth]->all_children_selected_array = e_bit_array_new(node_sequence[depth]->num_children);
-	if (!node_sequence[depth]->any_children_selected_array)
-		node_sequence[depth]->any_children_selected_array = e_bit_array_new(node_sequence[depth]->num_children);
-
-	node_sequence[depth]->all_children_selected =
-		e_bit_array_cross_and(node_sequence[depth]->all_children_selected_array) &&
-		node_sequence[depth]->selected;
-
-	node_sequence[depth]->any_children_selected =
-		e_bit_array_cross_or(node_sequence[depth]->any_children_selected_array) ||
-		node_sequence[depth]->selected;
-
-	for (i = depth - 1; i >= 0; i--) {
-		gboolean all_children, any_children;
-
-		if (!node_sequence[i]->all_children_selected_array)
-			node_sequence[i]->all_children_selected_array = e_bit_array_new(node_sequence[i]->num_children);
-		if (!node_sequence[i]->any_children_selected_array)
-			node_sequence[i]->any_children_selected_array = e_bit_array_new(node_sequence[i]->num_children);
-
-		e_bit_array_change_one_row(node_sequence[i]->all_children_selected_array,
-					   orig_position_sequence[i + 1], node_sequence[i + 1]->all_children_selected);
-		e_bit_array_change_one_row(node_sequence[i]->any_children_selected_array,
-					   orig_position_sequence[i + 1], node_sequence[i + 1]->any_children_selected);
-
-		all_children = node_sequence[i]->all_children_selected;
-		any_children = node_sequence[i]->any_children_selected;
-
-		node_sequence[i]->all_children_selected =
-			e_bit_array_cross_and(node_sequence[i]->all_children_selected_array) &&
-			node_sequence[i]->selected;
-		node_sequence[i]->any_children_selected =
-			e_bit_array_cross_or(node_sequence[i]->any_children_selected_array) ||
-			node_sequence[i]->selected;
-
-		if (all_children == node_sequence[i]->all_children_selected &&
-		    any_children == node_sequence[i]->any_children_selected)
-			break;
-	}
-
-	g_free(orig_position_sequence);
-	g_free(node_sequence);
-}
-
-
-/* Signal handlers */
-
-static void
-etsm_pre_change (ETreeModel *etm, ETreeSelectionModel *etsm)
-{
-	g_free (etsm->priv->cursor_save_id);
-	etsm->priv->cursor_save_id = NULL;
-
-	if (e_tree_model_has_get_node_by_id (etm) &&
-	    e_tree_model_has_save_id (etm) &&
-	    etsm->priv->cursor_path) {
-		etsm->priv->cursor_save_id = e_tree_model_get_save_id (etm, etsm->priv->cursor_path);
-	}
-}
-
-static void
-etsm_node_changed (ETreeModel *etm, ETreePath node, ETreeSelectionModel *etsm)
-{
-	int cursor_row;
-
-	etsm_real_clear (etsm);
-
-	if (e_tree_model_has_get_node_by_id (etm) && etsm->priv->cursor_save_id) {
-		ETreePath cursor_path;
-
-		cursor_path = e_tree_model_get_node_by_id (etm, etsm->priv->cursor_save_id);
-		etsm->priv->cursor_path = cursor_path;
-		if (cursor_path != NULL && etsm->priv->cursor_col == -1)
-			etsm->priv->cursor_col = 0;
-
-		e_tree_selection_model_select_single_path(etsm, cursor_path);
-	}
-
-	cursor_row = etsm_cursor_row_real (etsm);
-	e_selection_model_selection_changed(E_SELECTION_MODEL(etsm));
-	if (cursor_row != -1)
-		e_selection_model_cursor_changed(E_SELECTION_MODEL(etsm), cursor_row, etsm->priv->cursor_col);
-	else {
-		e_selection_model_cursor_changed(E_SELECTION_MODEL(etsm), -1, -1);
-		e_selection_model_cursor_activated(E_SELECTION_MODEL(etsm), -1, -1);
-	}
-
-	g_free (etsm->priv->cursor_save_id);
-	etsm->priv->cursor_save_id = NULL;
-}
-
-static void
-etsm_node_data_changed (ETreeModel *etm, ETreePath node, ETreeSelectionModel *etsm)
-{
-	g_free (etsm->priv->cursor_save_id);
-	etsm->priv->cursor_save_id = NULL;
-}
-
-static void
-etsm_node_col_changed (ETreeModel *etm, ETreePath node, int col, ETreeSelectionModel *etsm)
-{
-	g_free (etsm->priv->cursor_save_id);
-	etsm->priv->cursor_save_id = NULL;
-}
-
-static void
-etsm_node_inserted (ETreeModel *etm, ETreePath parent, ETreePath child, ETreeSelectionModel *etsm)
-{
-	etsm_node_changed(etm, parent, etsm);
-#if 0
-	ETreeSelectionModelNode *node;
-	ETreePath path;
-
-	path = e_tree_sorted_model_to_view_path(etsm->priv->ets, parent);
-
-	if (!path)
-		return;
-
-	node = etsm_find_node_unless_equals (etsm, path, FALSE);
-
-	if (node) {
-		node->selected = FALSE;
-		update_parents(etsm, path);
-	}
-#endif
-}
-
-static void
-etsm_node_removed (ETreeModel *etm, ETreePath parent, ETreePath child, int old_position, ETreeSelectionModel *etsm)
-{
-	etsm_node_changed(etm, parent, etsm);
-}
-
-
-
-static void
-etsm_sorted_pre_change (ETreeModel *etm, ETreeSelectionModel *etsm)
-{
-}
-
-static void
-etsm_sorted_node_changed (ETreeModel *etm, ETreePath node, ETreeSelectionModel *etsm)
-{
-	int cursor_row = etsm_cursor_row_real (etsm);
-	e_selection_model_selection_changed(E_SELECTION_MODEL(etsm));
-
-	if (cursor_row != -1)
-		e_selection_model_cursor_changed(E_SELECTION_MODEL(etsm), cursor_row, etsm->priv->cursor_col);
-	else
-		e_selection_model_cursor_changed(E_SELECTION_MODEL(etsm), -1, -1);
-}
-
-static void
-etsm_sorted_node_data_changed (ETreeModel *etm, ETreePath node, ETreeSelectionModel *etsm)
-{
-}
-
-static void
-etsm_sorted_node_col_changed (ETreeModel *etm, ETreePath node, int col, ETreeSelectionModel *etsm)
-{
-}
-
-static void
-etsm_sorted_node_inserted (ETreeModel *etm, ETreePath parent, ETreePath child, ETreeSelectionModel *etsm)
-{
-	etsm_sorted_node_changed(etm, parent, etsm);
-}
-
-static void
-etsm_sorted_node_removed (ETreeModel *etm, ETreePath parent, ETreePath child, int old_position, ETreeSelectionModel *etsm)
-{
-	etsm_sorted_node_changed(etm, parent, etsm);
-}
-
-
-static void
-add_model(ETreeSelectionModel *etsm, ETreeModel *model)
-{
-	ETreeSelectionModelPriv *priv = etsm->priv;
-
-	priv->model = model;
-
-	if (!priv->model)
-		return;
-
-	gtk_object_ref(GTK_OBJECT(priv->model));
-	priv->tree_model_pre_change_id        = gtk_signal_connect (GTK_OBJECT (priv->model), "pre_change",
-								    GTK_SIGNAL_FUNC (etsm_pre_change), etsm);
-	priv->tree_model_node_changed_id      = gtk_signal_connect (GTK_OBJECT (priv->model), "node_changed",
-								    GTK_SIGNAL_FUNC (etsm_node_changed), etsm);
-	priv->tree_model_node_data_changed_id = gtk_signal_connect (GTK_OBJECT (priv->model), "node_data_changed",
-								    GTK_SIGNAL_FUNC (etsm_node_data_changed), etsm);
-	priv->tree_model_node_col_changed_id  = gtk_signal_connect (GTK_OBJECT (priv->model), "node_col_changed",
-								    GTK_SIGNAL_FUNC (etsm_node_col_changed), etsm);
-	priv->tree_model_node_inserted_id     = gtk_signal_connect (GTK_OBJECT (priv->model), "node_inserted",
-								    GTK_SIGNAL_FUNC (etsm_node_inserted), etsm);
-	priv->tree_model_node_removed_id      = gtk_signal_connect (GTK_OBJECT (priv->model), "node_removed",
-								    GTK_SIGNAL_FUNC (etsm_node_removed), etsm);
-}
-
-static void
-drop_model(ETreeSelectionModel *etsm)
-{
-	ETreeSelectionModelPriv *priv = etsm->priv;
-
-	if (!priv->model)
-		return;
-
-	gtk_signal_disconnect (GTK_OBJECT (priv->model),
-			       priv->tree_model_pre_change_id);
-	gtk_signal_disconnect (GTK_OBJECT (priv->model),
-			       priv->tree_model_node_changed_id);
-	gtk_signal_disconnect (GTK_OBJECT (priv->model),
-			       priv->tree_model_node_data_changed_id);
-	gtk_signal_disconnect (GTK_OBJECT (priv->model),
-			       priv->tree_model_node_col_changed_id);
-	gtk_signal_disconnect (GTK_OBJECT (priv->model),
-			       priv->tree_model_node_inserted_id);
-	gtk_signal_disconnect (GTK_OBJECT (priv->model),
-			       priv->tree_model_node_removed_id);
-
-	gtk_object_unref (GTK_OBJECT (priv->model));
-	priv->model = NULL;
-
-	priv->tree_model_pre_change_id = 0;
-	priv->tree_model_node_changed_id = 0;
-	priv->tree_model_node_data_changed_id = 0;
-	priv->tree_model_node_col_changed_id = 0;
-	priv->tree_model_node_inserted_id = 0;
-	priv->tree_model_node_removed_id = 0;
-}
-
-
-static void
-add_ets(ETreeSelectionModel *etsm, ETreeSorted *ets)
-{
-	ETreeSelectionModelPriv *priv = etsm->priv;
-
-	priv->ets = ets;
-
-	if (!priv->ets)
-		return;
-
-	gtk_object_ref(GTK_OBJECT(priv->ets));
-	priv->sorted_model_pre_change_id        = gtk_signal_connect (GTK_OBJECT (priv->ets), "pre_change",
-								      GTK_SIGNAL_FUNC (etsm_sorted_pre_change), etsm);
-	priv->sorted_model_node_changed_id      = gtk_signal_connect (GTK_OBJECT (priv->ets), "node_changed",
-								    GTK_SIGNAL_FUNC (etsm_sorted_node_changed), etsm);
-	priv->sorted_model_node_data_changed_id = gtk_signal_connect (GTK_OBJECT (priv->ets), "node_data_changed",
-								    GTK_SIGNAL_FUNC (etsm_sorted_node_data_changed), etsm);
-	priv->sorted_model_node_col_changed_id  = gtk_signal_connect (GTK_OBJECT (priv->ets), "node_col_changed",
-								    GTK_SIGNAL_FUNC (etsm_sorted_node_col_changed), etsm);
-	priv->sorted_model_node_inserted_id     = gtk_signal_connect (GTK_OBJECT (priv->ets), "node_inserted",
-								    GTK_SIGNAL_FUNC (etsm_sorted_node_inserted), etsm);
-	priv->sorted_model_node_removed_id      = gtk_signal_connect (GTK_OBJECT (priv->ets), "node_removed",
-								    GTK_SIGNAL_FUNC (etsm_sorted_node_removed), etsm);
-}
-
-static void
-drop_ets(ETreeSelectionModel *etsm)
-{
-	ETreeSelectionModelPriv *priv = etsm->priv;
-
-	if (!priv->ets)
-		return;
-
-	gtk_signal_disconnect (GTK_OBJECT (priv->ets),
-			       priv->sorted_model_pre_change_id);
-	gtk_signal_disconnect (GTK_OBJECT (priv->ets),
-			       priv->sorted_model_node_changed_id);
-	gtk_signal_disconnect (GTK_OBJECT (priv->ets),
-			       priv->sorted_model_node_data_changed_id);
-	gtk_signal_disconnect (GTK_OBJECT (priv->ets),
-			       priv->sorted_model_node_col_changed_id);
-	gtk_signal_disconnect (GTK_OBJECT (priv->ets),
-			       priv->sorted_model_node_inserted_id);
-	gtk_signal_disconnect (GTK_OBJECT (priv->ets),
-			       priv->sorted_model_node_removed_id);
-
-	gtk_object_unref (GTK_OBJECT (priv->ets));
-	priv->ets = NULL;
-
-	priv->sorted_model_pre_change_id = 0;
-	priv->sorted_model_node_changed_id = 0;
-	priv->sorted_model_node_data_changed_id = 0;
-	priv->sorted_model_node_col_changed_id = 0;
-	priv->sorted_model_node_inserted_id = 0;
-	priv->sorted_model_node_removed_id = 0;
-}
-
-/* Virtual functions */
-static void
-etsm_destroy (GtkObject *object)
-{
-	ETreeSelectionModel *etsm;
-
-	etsm = E_TREE_SELECTION_MODEL (object);
-
-	etsm_real_clear (etsm);
-	drop_model(etsm);
-	drop_ets(etsm);
-
-	g_free (etsm->priv->cursor_save_id);
-
-	g_free(etsm->priv);
-	etsm->priv = NULL;
-}
-
-static void
-etsm_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL (o);
-
-	switch (arg_id){
-	case ARG_CURSOR_ROW:
-		GTK_VALUE_INT(*arg) = etsm_cursor_row_real(etsm);
-		break;
-
-	case ARG_CURSOR_COL:
-		GTK_VALUE_INT(*arg) = etsm->priv->cursor_col;
-		break;
-
-	case ARG_MODEL:
-		GTK_VALUE_OBJECT(*arg) = (GtkObject *) etsm->priv->model;
-		break;
-
-	case ARG_ETTA:
-		GTK_VALUE_OBJECT(*arg) = (GtkObject *) etsm->priv->etta;
-		break;
-
-	case ARG_ETS:
-		GTK_VALUE_OBJECT(*arg) = (GtkObject *) etsm->priv->ets;
-		break;
-	}
-}
-
-static void
-etsm_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ESelectionModel *esm = E_SELECTION_MODEL (o);
-	ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL (o);
-
-	switch (arg_id){
-	case ARG_CURSOR_ROW:
-		e_selection_model_do_something(esm, GTK_VALUE_INT(*arg), etsm->priv->cursor_col, 0);
-		break;
-
-	case ARG_CURSOR_COL:
-		e_selection_model_do_something(esm, etsm_cursor_row_real(etsm), GTK_VALUE_INT(*arg), 0);
-		break;
-
-	case ARG_MODEL:
-		drop_model(etsm);
-		add_model(etsm, (ETreeModel *) GTK_VALUE_OBJECT(*arg));
-		break;
-
-	case ARG_ETTA:
-		etsm->priv->etta = (ETreeTableAdapter *) GTK_VALUE_OBJECT(*arg);
-		break;
-
-	case ARG_ETS:
-		drop_ets(etsm);
-		add_ets(etsm, (ETreeSorted *) GTK_VALUE_OBJECT(*arg));
-		break;
-	}
-}
-
-static ETreeSelectionModelNode *
-etsm_recurse_is_path_selected (ESelectionModel *selection,
-			       ETreePath path,
-			       gboolean *is_selected)
-{
-	ETreeSelectionModelNode *selection_node;
-	ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL(selection);
-	ETreeSorted *ets = etsm->priv->ets;
-	ETreePath parent;
-
-	parent = e_tree_model_node_get_parent(E_TREE_MODEL(ets), path);
-
-	if (parent) {
-		selection_node = etsm_recurse_is_path_selected (selection, parent, is_selected);
-		if (selection_node) {
-			int position = e_tree_sorted_orig_position(ets, path);
-			if (position < 0 || position >= selection_node->num_children) {
-				*is_selected = FALSE;
-				return NULL;
-			}
-			if (selection_node->all_children_selected) {
-				*is_selected = TRUE;
-				return NULL;
-			}
-			if (! selection_node->any_children_selected) {
-				*is_selected = FALSE;
-				return NULL;
-			}
-			if (selection_node->all_children_selected_array && e_bit_array_value_at(selection_node->all_children_selected_array, position)) {
-				*is_selected = TRUE;
-				return NULL;
-			}
-			if (selection_node->any_children_selected_array && ! e_bit_array_value_at(selection_node->any_children_selected_array, position)) {
-				*is_selected = FALSE;
-				return NULL;
-			}
-			if (!selection_node->children) {
-				*is_selected = FALSE;
-				return NULL;
-			}
-			return selection_node->children[position];
-		} else
-			  return NULL;
-	} else {
-		if (etsm->priv->root) {
-			return etsm->priv->root;
-		} else {
-			*is_selected = FALSE;
-			return NULL;
-		}
-	}
-}
-
-/** 
- * e_selection_model_is_row_selected
- * @selection: #ESelectionModel to check
- * @n: The row to check
- *
- * This routine calculates whether the given row is selected.
- *
- * Returns: %TRUE if the given row is selected
- */
-static gboolean
-etsm_is_row_selected (ESelectionModel *selection,
-		      gint             row)
-{
-	ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL(selection);
-	ETreePath path;
-	ETreeSelectionModelNode *selection_node;
-
-	gboolean ret_val;
-
-	g_return_val_if_fail(row < e_table_model_row_count(E_TABLE_MODEL(etsm->priv->etta)), FALSE);
-	g_return_val_if_fail(row >= 0, FALSE);
-	g_return_val_if_fail(selection != NULL, FALSE);
-
-	path = e_tree_table_adapter_node_at_row(etsm->priv->etta, row);
-
-	selection_node = etsm_recurse_is_path_selected (selection, path, &ret_val);
-
-	if (selection_node)
-		ret_val = selection_node->selected;
-
-	return ret_val;
-}
-
-
-typedef struct {
-	ETreeSelectionModel *etsm;
-	EForeachFunc callback;
-	gpointer closure;
-} ModelAndCallback;
-
-static void
-etsm_row_foreach_cb (ETreePath path, gpointer user_data)
-{
-	ModelAndCallback *mac = user_data;
-	int row = etsm_row_of_node(mac->etsm, path);
-	if (row >= 0)
-		mac->callback(row, mac->closure);
-}
-
-/** 
- * e_selection_model_foreach
- * @selection: #ESelectionModel to traverse
- * @callback: The callback function to call back.
- * @closure: The closure
- *
- * This routine calls the given callback function once for each
- * selected row, passing closure as the closure.
- */
-static void 
-etsm_foreach (ESelectionModel *selection,
-	      EForeachFunc     callback,
-	      gpointer         closure)
-{
-	ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL(selection);
-	ModelAndCallback mac;
-
-	mac.etsm = etsm;
-	mac.callback = callback;
-	mac.closure = closure;
-
-	e_tree_selection_model_foreach(etsm, etsm_row_foreach_cb, &mac);
-}
-
-/** 
- * e_selection_model_clear
- * @selection: #ESelectionModel to clear
- *
- * This routine clears the selection to no rows selected.
- */
-static void
-etsm_clear(ESelectionModel *selection)
-{
-	ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL(selection);
-
-	etsm_real_clear (etsm);
-
-	etsm->priv->cursor_path = NULL;
-	etsm->priv->cursor_col = -1;
-	e_selection_model_selection_changed(E_SELECTION_MODEL(etsm));
-	e_selection_model_cursor_changed(E_SELECTION_MODEL(etsm), -1, -1);
-}
-
-#if 0
-/** 
- * e_selection_model_selected_count
- * @selection: #ESelectionModel to count
- *
- * This routine calculates the number of rows selected.
- *
- * Returns: The number of rows selected in the given model.
- */
-static gint
-etsm_selected_count (ESelectionModel *selection)
-{
-	ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL(selection);
-
-	return g_hash_table_size(etsm->priv->data);
-}
-#endif
-
-/** 
- * e_selection_model_select_all
- * @selection: #ESelectionModel to select all
- *
- * This routine selects all the rows in the given
- * #ESelectionModel.
- */
-static void
-etsm_select_all (ESelectionModel *selection)
-{
-	ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL(selection);
-
-	etsm_real_clear (etsm);
-
-	etsm->priv->root = e_tree_selection_model_node_new();
-	etsm->priv->root->selected = TRUE;
-	etsm->priv->root->all_children_selected = TRUE;
-	etsm->priv->root->any_children_selected = TRUE;
-
-	e_tree_selection_model_node_fill_children(etsm, e_tree_model_get_root(E_TREE_MODEL(etsm->priv->ets)), etsm->priv->root);
-	etsm->priv->root->all_children_selected_array = e_bit_array_new(etsm->priv->root->num_children);
-	etsm->priv->root->any_children_selected_array = e_bit_array_new(etsm->priv->root->num_children);
-	e_bit_array_select_all(etsm->priv->root->all_children_selected_array);
-	e_bit_array_select_all(etsm->priv->root->any_children_selected_array);
-
-	if (etsm->priv->cursor_col == -1)
-		etsm->priv->cursor_col = 0;
-	if (etsm->priv->cursor_path == NULL)
-		etsm->priv->cursor_path = etsm_node_at_row(etsm, 0);
-	etsm->priv->selection_start_path = etsm_node_at_row(etsm, 0);
-	e_selection_model_selection_changed(E_SELECTION_MODEL(etsm));
-	e_selection_model_cursor_changed(E_SELECTION_MODEL(etsm), etsm_cursor_row_real(etsm), etsm->priv->cursor_col);
-}
-
-static void
-etsm_invert_selection_recurse (ETreeSelectionModel *etsm,
-			       ETreeSelectionModelNode *selection_node)
-{
-	gboolean temp;
-	EBitArray *temp_eba;
-	selection_node->selected = ! selection_node->selected;
-
-	temp = selection_node->all_children_selected;
-	selection_node->all_children_selected = ! selection_node->any_children_selected;
-	selection_node->any_children_selected = ! temp;
-
-	temp_eba = selection_node->all_children_selected_array;
-	selection_node->all_children_selected_array = selection_node->any_children_selected_array;
-	selection_node->any_children_selected_array = temp_eba;
-	if (selection_node->all_children_selected_array)
-		e_bit_array_invert_selection(selection_node->all_children_selected_array);
-	if (selection_node->any_children_selected_array)
-		e_bit_array_invert_selection(selection_node->any_children_selected_array);
-	if (selection_node->children) {
-		int i;
-		for (i = 0; i < selection_node->num_children; i++) {
-			if (selection_node->children[i])
-				etsm_invert_selection_recurse (etsm, selection_node->children[i]);
-		}
-	}
-}
-
-/** 
- * e_selection_model_invert_selection
- * @selection: #ESelectionModel to invert
- *
- * This routine inverts all the rows in the given
- * #ESelectionModel.
- */
-static void
-etsm_invert_selection (ESelectionModel *selection)
-{
-	ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL(selection);
-
-	if (etsm->priv->root)
-		etsm_invert_selection_recurse (etsm, etsm->priv->root);
-	
-	etsm->priv->cursor_col = -1;
-	etsm->priv->cursor_path = NULL;
-	etsm->priv->selection_start_path = etsm_node_at_row(etsm, 0);
-	e_selection_model_selection_changed(E_SELECTION_MODEL(etsm));
-	e_selection_model_cursor_changed(E_SELECTION_MODEL(etsm), -1, -1);
-}
-
-static int
-etsm_row_count (ESelectionModel *selection)
-{
-	ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL(selection);
-	return e_table_model_row_count(E_TABLE_MODEL(etsm->priv->etta));
-}
-
-static void
-etsm_change_one_row(ESelectionModel *selection, int row, gboolean grow)
-{
-	ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL(selection);
-	ETreeSelectionModelNode *node;
-	ETreePath path;
-
-	g_return_if_fail(row < e_table_model_row_count(E_TABLE_MODEL(etsm->priv->etta)));
-	g_return_if_fail(row >= 0);
-	g_return_if_fail(selection != NULL);
-
-	path = e_tree_table_adapter_node_at_row(etsm->priv->etta, row);
-
-	if (!path)
-		return;
-
-	node = etsm_find_node_unless_equals (etsm, path, grow);
-
-	if (node) {
-		node->selected = grow;
-		update_parents(etsm, path);
-	}
-}
-
-static void
-etsm_change_one_path(ETreeSelectionModel *etsm, ETreePath path, gboolean grow)
-{
-	ETreeSelectionModelNode *node;
-
-	if (!path)
-		return;
-
-	path = e_tree_sorted_model_to_view_path(etsm->priv->ets, path);
-
-	if (!path)
-		return;
-
-	node = etsm_find_node_unless_equals (etsm, path, grow);
-
-	if (node) {
-		node->selected = grow;
-		update_parents(etsm, path);
-	}
-}
-
-static void
-etsm_change_cursor (ESelectionModel *selection, int row, int col)
-{
-	ETreeSelectionModel *etsm;
-
-	g_return_if_fail(selection != NULL);
-	g_return_if_fail(E_IS_SELECTION_MODEL(selection));
-
-	etsm = E_TREE_SELECTION_MODEL(selection);
-
-	if (row == -1) {
-		etsm->priv->cursor_path = NULL;
-	} else {
-		etsm->priv->cursor_path = etsm_node_at_row(etsm, row);
-	}
-	etsm->priv->cursor_col = col;
-}
-
-static void
-etsm_change_range(ESelectionModel *selection, int start, int end, gboolean grow)
-{
-	int i;
-	if (start != end) {
-		if (selection->sorter && e_sorter_needs_sorting(selection->sorter)) {
-			for ( i = start; i < end; i++) {
-				e_selection_model_change_one_row(selection, e_sorter_sorted_to_model(selection->sorter, i), grow);
-			}
-		} else {
-			for ( i = start; i < end; i++) {
-				e_selection_model_change_one_row(selection, i, grow);
-			}
-		}
-	}
-}
-
-static int
-etsm_cursor_row (ESelectionModel *selection)
-{
-	return etsm_cursor_row_real(E_TREE_SELECTION_MODEL(selection));
-}
-
-static int
-etsm_cursor_col (ESelectionModel *selection)
-{
-	ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL(selection);
-	return etsm->priv->cursor_col;
-}
-
-static void
-etsm_select_single_row (ESelectionModel *selection, int row)
-{
-	ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL(selection);
-
-	etsm_real_clear (etsm);
-	etsm_change_one_row(selection, row, TRUE);
-	etsm->priv->selection_start_path = etsm_node_at_row(etsm, row);
-
-	e_selection_model_selection_changed(E_SELECTION_MODEL(etsm));
-}
-
-static void
-etsm_toggle_single_row (ESelectionModel *selection, int row)
-{
-	ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL(selection);
-
-	etsm->priv->selection_start_path = etsm_node_at_row(etsm, row);
-
-	etsm_change_one_row(selection, row, !etsm_is_row_selected(selection, row));
-
-	e_selection_model_selection_changed(E_SELECTION_MODEL(etsm));
-}
-
-static void
-etsm_move_selection_end (ESelectionModel *selection, int row)
-{
-	ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL(selection);
-	int old_start;
-	int old_end;
-	int new_start;
-	int new_end;
-	int start_row = etsm_row_of_node(etsm, etsm->priv->selection_start_path);
-	if (selection->sorter && e_sorter_needs_sorting(selection->sorter)) {
-		old_start = MIN (e_sorter_model_to_sorted(selection->sorter, start_row),
-				 e_sorter_model_to_sorted(selection->sorter, etsm_cursor_row_real(etsm)));
-		old_end = MAX (e_sorter_model_to_sorted(selection->sorter, start_row),
-			       e_sorter_model_to_sorted(selection->sorter, etsm_cursor_row_real(etsm))) + 1;
-		new_start = MIN (e_sorter_model_to_sorted(selection->sorter, start_row),
-				 e_sorter_model_to_sorted(selection->sorter, row));
-		new_end = MAX (e_sorter_model_to_sorted(selection->sorter, start_row),
-			       e_sorter_model_to_sorted(selection->sorter, row)) + 1;
-	} else {
-		old_start = MIN (start_row, etsm_cursor_row_real(etsm));
-		old_end = MAX (start_row, etsm_cursor_row_real(etsm)) + 1;
-		new_start = MIN (start_row, row);
-		new_end = MAX (start_row, row) + 1;
-	}
-	/* This wouldn't work nearly so smoothly if one end of the selection weren't held in place. */
-	if (old_start < new_start)
-		etsm_change_range(selection, old_start, new_start, FALSE);
-	if (new_start < old_start)
-		etsm_change_range(selection, new_start, old_start, TRUE);
-	if (old_end < new_end)
-		etsm_change_range(selection, old_end, new_end, TRUE);
-	if (new_end < old_end)
-		etsm_change_range(selection, new_end, old_end, FALSE);
-	e_selection_model_selection_changed(E_SELECTION_MODEL(etsm));
-}
-
-static void
-etsm_set_selection_end (ESelectionModel *selection, int row)
-{
-	ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL(selection);
-	e_tree_selection_model_select_single_path(etsm, etsm->priv->selection_start_path);
-	etsm->priv->cursor_path = etsm->priv->selection_start_path;
-	e_selection_model_move_selection_end(selection, row);
-}
-
-
-/* Standard functions */
-static void
-etsm_foreach_all_recurse (ETreeSelectionModel *etsm,
-			  ETreePath path,
-			  ETreeForeachFunc callback,
-			  gpointer closure)
-{
-	ETreePath child;
-
-	callback(path, closure);
-
-	child = e_tree_model_node_get_first_child(E_TREE_MODEL(etsm->priv->model), path);
-	for ( ; child; child = e_tree_model_node_get_next(E_TREE_MODEL(etsm->priv->model), child))
-		if (child)
-			etsm_foreach_all_recurse (etsm, child, callback, closure);
-}
-
-static void
-etsm_foreach_recurse (ETreeSelectionModel *etsm,
-		      ETreeSelectionModelNode *selection_node,
-		      ETreePath path,
-		      ETreeForeachFunc callback,
-		      gpointer closure)
-{
-	if (selection_node->all_children_selected) {
-		if (path)
-			etsm_foreach_all_recurse(etsm, path, callback, closure);
-		return;
-	}
-	if (!selection_node->any_children_selected)
-		return;
-
-	if (selection_node->selected) {
-		callback(path, closure);
-	}
-
-	if (selection_node->children) {
-		ETreePath child = e_tree_model_node_get_first_child(E_TREE_MODEL(etsm->priv->model), path);
-		int i;
-		for (i = 0; i < selection_node->num_children; i++, child = e_tree_model_node_get_next(E_TREE_MODEL(etsm->priv->model), child))
-			if (selection_node->children[i])
-				etsm_foreach_recurse (etsm, selection_node->children[i], child, callback, closure);
-	}
-}
-
-void
-e_tree_selection_model_foreach   (ETreeSelectionModel *etsm,
-				  ETreeForeachFunc     callback,
-				  gpointer             closure)
-{
-	if (etsm->priv->root) {
-		ETreePath model_root;
-		model_root = e_tree_model_get_root(etsm->priv->model);
-		etsm_foreach_recurse(etsm, etsm->priv->root, model_root, callback, closure);
-	}
-}
-
-void
-e_tree_selection_model_select_single_path (ETreeSelectionModel *etsm, ETreePath path)
-{
-	etsm_real_clear (etsm);
-	etsm_change_one_path(etsm, path, TRUE);
-	etsm->priv->selection_start_path = path;
-
-	e_selection_model_selection_changed(E_SELECTION_MODEL(etsm));
-}
-
-void
-e_tree_selection_model_add_to_selection (ETreeSelectionModel *etsm, ETreePath path)
-{
-	etsm_change_one_path(etsm, path, TRUE);
-	etsm->priv->selection_start_path = path;
-
-	e_selection_model_selection_changed(E_SELECTION_MODEL(etsm));
-}
-
-void
-e_tree_selection_model_change_cursor (ETreeSelectionModel *etsm, ETreePath path)
-{
-	int row;
-
-	etsm->priv->cursor_path = path;
-
-	row = etsm_cursor_row_real(etsm);
-
-	e_selection_model_cursor_changed(E_SELECTION_MODEL(etsm), row, etsm->priv->cursor_col);
-	e_selection_model_cursor_activated(E_SELECTION_MODEL(etsm), row, etsm->priv->cursor_col);
-}
-
-
-static void
-e_tree_selection_model_init (ETreeSelectionModel *etsm)
-{
-	ETreeSelectionModelPriv *priv;
-	priv                                    = g_new(ETreeSelectionModelPriv, 1);
-	etsm->priv                              = priv;
-
-	priv->etta                              = NULL;
-	priv->ets                               = NULL;
-	priv->model                             = NULL;
-
-	priv->root                              = NULL;
-
-	priv->cursor_path                       = NULL;
-	priv->cursor_col                        = -1;
-	priv->selection_start_path              = NULL;
-
-	priv->cursor_save_id                    = NULL;
-
-
-	priv->tree_model_pre_change_id          = 0;
-	priv->tree_model_node_changed_id        = 0;
-	priv->tree_model_node_data_changed_id   = 0;
-	priv->tree_model_node_col_changed_id    = 0;
-	priv->tree_model_node_inserted_id       = 0;
-	priv->tree_model_node_removed_id        = 0;
-
-	priv->sorted_model_pre_change_id        = 0;
-	priv->sorted_model_node_changed_id      = 0;
-	priv->sorted_model_node_data_changed_id = 0;
-	priv->sorted_model_node_col_changed_id  = 0;
-	priv->sorted_model_node_inserted_id     = 0;
-	priv->sorted_model_node_removed_id      = 0;
-}
-
-static void
-e_tree_selection_model_class_init (ETreeSelectionModelClass *klass)
-{
-	GtkObjectClass *object_class;
-	ESelectionModelClass *esm_class;
-
-	parent_class = gtk_type_class (e_selection_model_get_type ());
-
-	object_class = GTK_OBJECT_CLASS(klass);
-	esm_class = E_SELECTION_MODEL_CLASS(klass);
-
-	object_class->destroy = etsm_destroy;
-	object_class->get_arg = etsm_get_arg;
-	object_class->set_arg = etsm_set_arg;
-
-	esm_class->is_row_selected    = etsm_is_row_selected    ;
-	esm_class->foreach            = etsm_foreach            ;
-	esm_class->clear              = etsm_clear              ;
-#if 0
-	esm_class->selected_count     = etsm_selected_count     ;
-#endif
-	esm_class->select_all         = etsm_select_all         ;
-	esm_class->invert_selection   = etsm_invert_selection   ;
-	esm_class->row_count          = etsm_row_count          ;
-
-	esm_class->change_one_row     = etsm_change_one_row     ;
-	esm_class->change_cursor      = etsm_change_cursor      ;
-	esm_class->cursor_row         = etsm_cursor_row         ;
-	esm_class->cursor_col         = etsm_cursor_col         ;
-
-	esm_class->select_single_row  = etsm_select_single_row  ;
-	esm_class->toggle_single_row  = etsm_toggle_single_row  ;
-	esm_class->move_selection_end = etsm_move_selection_end ;
-	esm_class->set_selection_end  = etsm_set_selection_end  ;
-
-	gtk_object_add_arg_type ("ETreeSelectionModel::cursor_row", GTK_TYPE_INT,
-				 GTK_ARG_READWRITE, ARG_CURSOR_ROW);
-	gtk_object_add_arg_type ("ETreeSelectionModel::cursor_col", GTK_TYPE_INT,
-				 GTK_ARG_READWRITE, ARG_CURSOR_COL);
-	gtk_object_add_arg_type ("ETreeSelectionModel::model", E_TREE_MODEL_TYPE,
-				 GTK_ARG_READWRITE, ARG_MODEL);
-	gtk_object_add_arg_type ("ETreeSelectionModel::etta", E_TREE_TABLE_ADAPTER_TYPE,
-				 GTK_ARG_READWRITE, ARG_ETTA);
-	gtk_object_add_arg_type ("ETreeSelectionModel::ets", E_TREE_SORTED_TYPE,
-				 GTK_ARG_READWRITE, ARG_ETS);
-}
-
-ESelectionModel *
-e_tree_selection_model_new (void)
-{
-	return gtk_type_new(e_tree_selection_model_get_type());
-}
-
-E_MAKE_TYPE(e_tree_selection_model, "ETreeSelectionModel", ETreeSelectionModel,
-	    e_tree_selection_model_class_init, e_tree_selection_model_init, PARENT_TYPE);
diff --git a/widgets/table/e-tree-selection-model.h b/widgets/table/e-tree-selection-model.h
deleted file mode 100644
index ae5fa9bd3e..0000000000
--- a/widgets/table/e-tree-selection-model.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TREE_SELECTION_MODEL_H_
-#define _E_TREE_SELECTION_MODEL_H_
-
-#include <gdk/gdktypes.h>
-#include <gtk/gtkobject.h>
-#include <gal/util/e-sorter.h>
-#include <gal/widgets/e-selection-model.h>
-#include <gal/e-table/e-tree-model.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-typedef void (*ETreeForeachFunc) (ETreePath path,
-				  gpointer closure);
-
-typedef struct ETreeSelectionModelPriv ETreeSelectionModelPriv;
-
-#define E_TREE_SELECTION_MODEL_TYPE        (e_tree_selection_model_get_type ())
-#define E_TREE_SELECTION_MODEL(o)          (GTK_CHECK_CAST ((o), E_TREE_SELECTION_MODEL_TYPE, ETreeSelectionModel))
-#define E_TREE_SELECTION_MODEL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TREE_SELECTION_MODEL_TYPE, ETreeSelectionModelClass))
-#define E_IS_TREE_SELECTION_MODEL(o)       (GTK_CHECK_TYPE ((o), E_TREE_SELECTION_MODEL_TYPE))
-#define E_IS_TREE_SELECTION_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TREE_SELECTION_MODEL_TYPE))
-
-typedef struct {
-	ESelectionModel base;
-
-	ETreeSelectionModelPriv *priv;
-} ETreeSelectionModel;
-
-typedef struct {
-	ESelectionModelClass parent_class;
-} ETreeSelectionModelClass;
-
-
-GtkType          e_tree_selection_model_get_type            (void);
-ESelectionModel *e_tree_selection_model_new                 (void);
-void             e_tree_selection_model_foreach             (ETreeSelectionModel *etsm,
-							     ETreeForeachFunc     callback,
-							     gpointer             closure);
-void             e_tree_selection_model_select_single_path  (ETreeSelectionModel *etsm,
-							     ETreePath            path);
-void             e_tree_selection_model_add_to_selection    (ETreeSelectionModel *etsm,
-							     ETreePath            path);
-void             e_tree_selection_model_change_cursor       (ETreeSelectionModel *etsm,
-							     ETreePath            path);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* _E_TREE_SELECTION_MODEL_H_ */
diff --git a/widgets/table/e-tree-simple.c b/widgets/table/e-tree-simple.c
deleted file mode 100644
index 5ff26b088a..0000000000
--- a/widgets/table/e-tree-simple.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-tree-simple.c: a Tree Model that offers a function pointer
- * interface to using ETreeModel, similar to ETableSimple.
- *
- * Author:
- *   Chris Toshok (toshok@ximian.com)
- *
- * (C) 2000 Ximian, Inc.  */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "gal/util/e-util.h"
-#include "e-tree-simple.h"
-
-#define PARENT_TYPE E_TREE_MODEL_TYPE
-
-static int
-simple_column_count (ETableModel *etm)
-{
-	ETreeSimple *simple = E_TREE_SIMPLE(etm);
-
-	if (simple->col_count)
-		return simple->col_count (etm, simple->model_data);
-	else
-		return 0;
-}
-
-/* The default for simple_duplicate_value is to return the raw value. */
-static void *
-simple_duplicate_value (ETableModel *etm, int col, const void *value)
-{
-	ETreeSimple *simple = E_TREE_SIMPLE(etm);
-
-	if (simple->duplicate_value)
-		return simple->duplicate_value (etm, col, value, simple->model_data);
-	else
-		return (void *)value;
-}
-
-static void
-simple_free_value (ETableModel *etm, int col, void *value)
-{
-	ETreeSimple *simple = E_TREE_SIMPLE(etm);
-
-	if (simple->free_value)
-		simple->free_value (etm, col, value, simple->model_data);
-}
-
-static void *
-simple_initialize_value (ETableModel *etm, int col)
-{
-	ETreeSimple *simple = E_TREE_SIMPLE(etm);
-	
-	if (simple->initialize_value)
-		return simple->initialize_value (etm, col, simple->model_data);
-	else
-		return NULL;
-}
-
-static gboolean
-simple_value_is_empty (ETableModel *etm, int col, const void *value)
-{
-	ETreeSimple *simple = E_TREE_SIMPLE(etm);
-	
-	if (simple->value_is_empty)
-		return simple->value_is_empty (etm, col, value, simple->model_data);
-	else
-		return FALSE;
-}
-
-static char *
-simple_value_to_string (ETableModel *etm, int col, const void *value)
-{
-	ETreeSimple *simple = E_TREE_SIMPLE(etm);
-	
-	if (simple->value_to_string)
-		return simple->value_to_string (etm, col, value, simple->model_data);
-	else
-		return g_strdup ("");
-}
-
-static void *
-simple_value_at (ETreeModel *etm, ETreePath *node, int col)
-{
-	ETreeSimple *simple = E_TREE_SIMPLE(etm);
-
-	return simple->value_at (etm, node, col, simple->model_data);
-}
-
-static GdkPixbuf *
-simple_icon_at (ETreeModel *etm, ETreePath *node)
-{
-	ETreeSimple *simple = E_TREE_SIMPLE(etm);
-
-	return simple->icon_at (etm, node, simple->model_data);
-}
-
-static void
-simple_set_value_at (ETreeModel *etm, ETreePath *node, int col, const void *val)
-{
-	ETreeSimple *simple = E_TREE_SIMPLE(etm);
-
-	simple->set_value_at (etm, node, col, val, simple->model_data);
-}
-
-static gboolean
-simple_is_editable (ETreeModel *etm, ETreePath *node, int col)
-{
-	ETreeSimple *simple = E_TREE_SIMPLE(etm);
-
-	return simple->is_editable (etm, node, col, simple->model_data);
-}
-
-static void
-e_tree_simple_class_init (GtkObjectClass *object_class)
-{
-	ETreeModelClass *model_class        = (ETreeModelClass *) object_class;
-	ETableModelClass *table_model_class = (ETableModelClass *) object_class;
-
-	table_model_class->column_count     = simple_column_count;
-	table_model_class->duplicate_value  = simple_duplicate_value;
-	table_model_class->free_value       = simple_free_value;
-	table_model_class->initialize_value = simple_initialize_value;
-	table_model_class->value_is_empty   = simple_value_is_empty;
-	table_model_class->value_to_string  = simple_value_to_string;
-
-	model_class      ->icon_at          = simple_icon_at;
-	model_class      ->value_at         = simple_value_at;
-	model_class      ->set_value_at     = simple_set_value_at;
-	model_class      ->is_editable      = simple_is_editable;
-}
-
-E_MAKE_TYPE(e_tree_simple, "ETreeSimple", ETreeSimple, e_tree_simple_class_init, NULL, PARENT_TYPE)
-
-/**
- * e_tree_simple_new:
- * @col_count: 
- * @duplicate_value: 
- * @free_value: 
- * @initialize_value: 
- * @value_is_empty: 
- * @value_to_string: 
- * @icon_at: 
- * @value_at: 
- * @set_value_at: 
- * @is_editable: 
- * @model_data: 
- * 
- * This initializes a new ETreeSimpleModel object.  ETreeSimpleModel is
- * an implementaiton of the abstract class ETreeModel.  The ETreeSimpleModel
- * is designed to allow people to easily create ETreeModels without having
- * to create a new GtkType derived from ETreeModel every time they need one.
- *
- * Instead, ETreeSimpleModel uses a setup based in callback functions, every
- * callback function signature mimics the signature of each ETreeModel method
- * and passes the extra @data pointer to each one of the method to provide them
- * with any context they might want to use. 
- * 
- * ETreeSimple is to ETreeModel as ETableSimple is to ETableModel.
- *
- * Return value: An ETreeSimple object (which is also an ETreeModel
- * object).
- **/
-ETreeModel *
-e_tree_simple_new  (ETableSimpleColumnCountFn     col_count,
-		    ETableSimpleDuplicateValueFn  duplicate_value,
-		    ETableSimpleFreeValueFn       free_value,
-		    ETableSimpleInitializeValueFn initialize_value,
-		    ETableSimpleValueIsEmptyFn    value_is_empty,
-		    ETableSimpleValueToStringFn   value_to_string,
-
-		    ETreeSimpleIconAtFn      	  icon_at,
-		    ETreeSimpleValueAtFn     	  value_at,
-		    ETreeSimpleSetValueAtFn  	  set_value_at,
-		    ETreeSimpleIsEditableFn  	  is_editable,
-
-		    gpointer                 	  model_data)
-{
-	ETreeSimple *etg;
-
-	etg = gtk_type_new (e_tree_simple_get_type ());
-
-	etg->col_count        = col_count;
-	etg->duplicate_value  = duplicate_value;
-	etg->free_value       = free_value;
-	etg->initialize_value = initialize_value;
-	etg->value_is_empty   = value_is_empty;
-	etg->value_to_string  = value_to_string;
-
-	etg->icon_at          = icon_at;
-	etg->value_at         = value_at;
-	etg->set_value_at     = set_value_at;
-	etg->is_editable      = is_editable;
-
-	etg->model_data       = model_data;
-
-	return (ETreeModel*)etg;
-}
-
diff --git a/widgets/table/e-tree-simple.h b/widgets/table/e-tree-simple.h
deleted file mode 100644
index 797de7c8a7..0000000000
--- a/widgets/table/e-tree-simple.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#ifndef _E_TREE_SIMPLE_H_
-#define _E_TREE_SIMPLE_H_
-
-#include <gal/e-table/e-tree-model.h>
-#include <gal/e-table/e-table-simple.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_TREE_SIMPLE_TYPE        (e_tree_simple_get_type ())
-#define E_TREE_SIMPLE(o)          (GTK_CHECK_CAST ((o), E_TREE_SIMPLE_TYPE, ETreeSimple))
-#define E_TREE_SIMPLE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TREE_SIMPLE_TYPE, ETreeSimpleClass))
-#define E_IS_TREE_SIMPLE(o)       (GTK_CHECK_TYPE ((o), E_TREE_SIMPLE_TYPE))
-#define E_IS_TREE_SIMPLE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TREE_SIMPLE_TYPE))
-
-
-typedef GdkPixbuf* (*ETreeSimpleIconAtFn)     (ETreeModel *etree, ETreePath *path, void *model_data);
-typedef void*      (*ETreeSimpleValueAtFn)    (ETreeModel *etree, ETreePath *path, int col, void *model_data);
-typedef void       (*ETreeSimpleSetValueAtFn) (ETreeModel *etree, ETreePath *path, int col, const void *val, void *model_data);
-typedef gboolean   (*ETreeSimpleIsEditableFn) (ETreeModel *etree, ETreePath *path, int col, void *model_data);
-
-typedef struct {
-	ETreeModel parent;
-
-	/* Table methods */
-	ETableSimpleColumnCountFn     col_count;
-	ETableSimpleDuplicateValueFn  duplicate_value;
-	ETableSimpleFreeValueFn       free_value;
-	ETableSimpleInitializeValueFn initialize_value;
-	ETableSimpleValueIsEmptyFn    value_is_empty;
-	ETableSimpleValueToStringFn   value_to_string;
-
-	/* Tree methods */
-	ETreeSimpleIconAtFn icon_at;
-	ETreeSimpleValueAtFn value_at;
-	ETreeSimpleSetValueAtFn set_value_at;
-	ETreeSimpleIsEditableFn is_editable;
-
-	gpointer model_data;
-} ETreeSimple;
-
-typedef struct {
-	ETreeModelClass parent_class;
-} ETreeSimpleClass;
-
-GtkType e_tree_simple_get_type (void);
-
-ETreeModel *e_tree_simple_new  (ETableSimpleColumnCountFn     col_count,
-				ETableSimpleDuplicateValueFn  duplicate_value,
-				ETableSimpleFreeValueFn       free_value,
-				ETableSimpleInitializeValueFn initialize_value,
-				ETableSimpleValueIsEmptyFn    value_is_empty,
-				ETableSimpleValueToStringFn   value_to_string,
-				ETreeSimpleIconAtFn           icon_at,
-				ETreeSimpleValueAtFn          value_at,
-				ETreeSimpleSetValueAtFn       set_value_at,
-				ETreeSimpleIsEditableFn       is_editable,
-				gpointer                      model_data);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TREE_SIMPLE_H_ */
diff --git a/widgets/table/e-tree-sorted-variable.c b/widgets/table/e-tree-sorted-variable.c
deleted file mode 100644
index 06f9b1b261..0000000000
--- a/widgets/table/e-tree-sorted-variable.c
+++ /dev/null
@@ -1,458 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-tree-sorted-variable.c: Implements a table that sorts another table
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * (C) 1999 Ximian, Inc.
- */
-#include <config.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gtk/gtksignal.h>
-#include "gal/util/e-util.h"
-#include "e-tree-sorted-variable.h"
-
-#define d(x)
-
-#define PARENT_TYPE E_TREE_MODEL_TYPE
-
-#define INCREMENT_AMOUNT 100
-
-/* maximum insertions between an idle event that we will do without scheduling an idle sort */
-#define ETSV_INSERT_MAX (4)
-
-static ETreeModelClass *etsv_parent_class;
-
-struct ETreePath {
-	GNode node;
-};
-
-struct ETreeSortedVariablePrivate {
-	GNode *root;
-};
-
-static void etsv_proxy_model_changed      (ETableModel *etm, ETreeSortedVariable *etsv);
-#if 0
-static void etsv_proxy_model_row_changed  (ETableModel *etm, int row, ETreeSortedVariable *etsv);
-static void etsv_proxy_model_cell_changed (ETableModel *etm, int col, int row, ETreeSortedVariable *etsv);
-#endif
-static void etsv_sort_info_changed        (ETableSortInfo *info, ETreeSortedVariable *etsv);
-static void etsv_sort                     (ETreeSortedVariable *etsv);
-static void etsv_add                      (ETreeSortedVariable *etsv, gint                  row);
-static void etsv_add_all                  (ETreeSortedVariable *etsv);
-
-static void
-etsv_destroy (GtkObject *object)
-{
-	ETreeSortedVariable *etsv = E_TREE_SORTED_VARIABLE (object);
-
-	gtk_signal_disconnect (GTK_OBJECT (etss->source),
-			       etsv->table_model_changed_id);
-#if 0
-	gtk_signal_disconnect (GTK_OBJECT (etss->source),
-			       etsv->table_model_row_changed_id);
-	gtk_signal_disconnect (GTK_OBJECT (etss->source),
-			       etsv->table_model_cell_changed_id);
-#endif
-	gtk_signal_disconnect (GTK_OBJECT (etsv->sort_info),
-			       etsv->sort_info_changed_id);
-
-	if (etsv->sort_idle_id) {
-		g_source_remove(etsv->sort_idle_id);
-	}
-	if (etsv->insert_idle_id) {
-		g_source_remove(etsv->insert_idle_id);
-	}
-
-	etsv->table_model_changed_id = 0;
-	etsv->table_model_row_changed_id = 0;
-	etsv->table_model_cell_changed_id = 0;
-
-	if (etsv->sort_info)
-		gtk_object_unref(GTK_OBJECT(etsv->sort_info));
-	if (etsv->full_header)
-		gtk_object_unref(GTK_OBJECT(etsv->full_header));
-
-	GTK_OBJECT_CLASS (etsv_parent_class)->destroy (object);
-}
-
-static void
-etsv_class_init (GtkObjectClass *object_class)
-{
-	ETreeSortedVariableClass *etsv_class = E_TREE_MODEL_CLASS(object_class);
-
-	etsv_parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->destroy = etsv_destroy;
-
-	etsv_class->add = etsv_add;
-	etsv_class->add_all = etsv_add_all;
-}
-
-static void
-etsv_init (ETreeSortedVariable *etsv)
-{
-	etsv->full_header = NULL;
-	etsv->sort_info = NULL;
-
-	etsv->table_model_changed_id = 0;
-	etsv->table_model_row_changed_id = 0;
-	etsv->table_model_cell_changed_id = 0;
-	etsv->sort_info_changed_id = 0;
-
-	etsv->sort_idle_id = 0;
-	etsv->insert_count = 0;
-}
-
-E_MAKE_TYPE(e_tree_sorted_variable, "ETreeSortedVariable", ETreeSortedVariable, etsv_class_init, etsv_init, PARENT_TYPE);
-
-static gboolean
-etsv_sort_idle(ETreeSortedVariable *etsv)
-{
-	gtk_object_ref(GTK_OBJECT(etsv));
-	etsv_sort(etsv);
-	etsv->sort_idle_id = 0;
-	etsv->insert_count = 0;
-	gtk_object_unref(GTK_OBJECT(etsv));
-	return FALSE;
-}
-
-static gboolean
-etsv_insert_idle(ETreeSortedVariable *etsv)
-{
-	etsv->insert_count = 0;
-	etsv->insert_idle_id = 0;
-	return FALSE;
-}
-
-
-ETableModel *
-e_tree_sorted_variable_new (ETreeModel *source, ETableHeader *full_header, ETableSortInfo *sort_info)
-{
-	ETreeSortedVariable *etsv = gtk_type_new (E_TREE_SORTED_VARIABLE_TYPE);
-	ETreeSortedVariable *etsv = E_TABLE_SUBSET_VARIABLE (etsv);
-
-	if (e_table_subset_variable_construct (etsv, source) == NULL){
-		gtk_object_unref (GTK_OBJECT (etsv));
-		return NULL;
-	}
-
-	etsv->sort_info = sort_info;
-	gtk_object_ref(GTK_OBJECT(etsv->sort_info));
-	etsv->full_header = full_header;
-	gtk_object_ref(GTK_OBJECT(etsv->full_header));
-
-	etsv->table_model_changed_id = gtk_signal_connect (GTK_OBJECT (source), "model_changed",
-							   GTK_SIGNAL_FUNC (etsv_proxy_model_changed), etsv);
-#if 0
-	etsv->table_model_row_changed_id = gtk_signal_connect (GTK_OBJECT (source), "model_row_changed",
-							       GTK_SIGNAL_FUNC (etsv_proxy_model_row_changed), etsv);
-	etsv->table_model_cell_changed_id = gtk_signal_connect (GTK_OBJECT (source), "model_cell_changed",
-								GTK_SIGNAL_FUNC (etsv_proxy_model_cell_changed), etsv);
-#endif
-	etsv->sort_info_changed_id = gtk_signal_connect (GTK_OBJECT (sort_info), "sort_info_changed",
-							 GTK_SIGNAL_FUNC (etsv_sort_info_changed), etsv);
-
-	return E_TABLE_MODEL(etsv);
-}
-
-static void
-etsv_proxy_model_changed (ETableModel *etm, ETreeSortedVariable *etsv)
-{
-	/* FIXME: do_resort (); */
-}
-#if 0
-static void
-etsv_proxy_model_row_changed (ETableModel *etm, int row, ETreeSortedVariable *etsv)
-{
-	ETreeSortedVariable *etsv = E_TABLE_SUBSET_VARIABLE(etsv);
-
-	if (e_table_subset_variable_remove(etsv, row))
-		e_table_subset_variable_add (etsv, row);
-}
-
-static void
-etsv_proxy_model_cell_changed (ETableModel *etm, int col, int row, ETreeSortedVariable *etsv)
-{
-	ETreeSortedVariable *etsv = E_TABLE_SUBSET_VARIABLE(etsv);
-
-	if (e_table_subset_variable_remove(etsv, row))
-		e_table_subset_variable_add (etsv, row);
-}
-#endif
-
-static void
-etsv_sort_info_changed (ETableSortInfo *info, ETreeSortedVariable *etsv)
-{
-	etsv_sort(etsv);
-}
-
-/* This takes source rows. */
-static int
-etsv_compare(ETreeSortedVariable *etsv, const ETreePath *path1, const ETreePath *path2)
-{
-	int j;
-	int sort_count = e_table_sort_info_sorting_get_count(etsv->sort_info);
-	int comp_val = 0;
-	int ascending = 1;
-
-	for (j = 0; j < sort_count; j++) {
-		ETableSortColumn column = e_table_sort_info_sorting_get_nth(etsv->sort_info, j);
-		ETableCol *col;
-		col = e_table_header_get_column_by_col_idx(etsv->full_header, column.column);
-		if (col == NULL)
-			col = e_table_header_get_column (etsv->full_header, e_table_header_count (etsv->full_header) - 1);
-		comp_val = (*col->compare)(e_tree_model_value_at (etsv->source, path1, col->col_idx),
-					   e_tree_model_value_at (etsv->source, path2, col->col_idx));
-		ascending = column.ascending;
-		if (comp_val != 0)
-			break;
-	}
-	if (comp_val == 0) {
-		if (row1 < row2)
-			comp_val = -1;
-		if (row1 > row2)
-			comp_val = 1;
-	}
-	if (!ascending)
-		comp_val = -comp_val;
-	return comp_val;
-}
-
-
-static ETreeSortedVariable *etsv_closure;
-int cols_closure;
-int *ascending_closure;
-int *col_idx_closure;
-GCompareFunc *compare_closure;
-
-static int
-etsv_compare_closure(const ETreePath *path1, const ETreePath *path2)
-{
-	int j;
-	int sort_count = e_table_sort_info_sorting_get_count(etsv_closure->sort_info);
-	int comp_val = 0;
-	int ascending = 1;
-	for (j = 0; j < sort_count; j++) {
-
-		comp_val = (*(compare_closure[j]))(e_tree_model_value_at (etsv_closure->source, path1, col_idx_closure[j]),
-						   e_tree_model_value_at (etsv_closure->source, path2, col_idx_closure[j]));
-		ascending = ascending_closure[j];
-		if (comp_val != 0)
-			break;
-	}
-	if (comp_val == 0) {
-		if (row1 < row2)
-			comp_val = -1;
-		if (row1 > row2)
-			comp_val = 1;
-	}
-	if (!ascending)
-		comp_val = -comp_val;
-	return comp_val;
-}
-
-static int
-qsort_callback(const void *data1, const void *data2)
-{
-	GNode *node1 = *(GNode **)data1;
-	GNode *node2 = *(GNode **)data2;
-	return etsv_compare_closure(node1->data, node2->data);
-}
-
-static int
-qsort_callback_source(const void *data1, const void *data2)
-{
-	return etsv_compare_closure(data1, data2);
-}
-
-static void
-etsv_setup_closures(ETreeSortedVariable *etsv)
-{
-	int j;
-	int cols;
-
-	cols = e_table_sort_info_sorting_get_count(etsv->sort_info);
-	cols_closure = cols;
-	etsv_closure = etsv;
-
-	ascending_closure = g_new(int, cols);
-	col_idx_closure = g_new(int, cols);
-	compare_closure = g_new(GCompareFunc, cols);
-
-	for (j = 0; j < cols; j++) {
-		ETableSortColumn column = e_table_sort_info_sorting_get_nth(etsv->sort_info, j);
-		ETableCol *col;
-
-		col = e_table_header_get_column_by_col_idx(etsv->full_header, column.column);
-		if (col == NULL) {
-			col = e_table_header_get_column (etsv->full_header, e_table_header_count (etsv->full_header) - 1);
-		}
-
-		ascending_closure[j] = column.ascending;
-		col_idx_closure[j] = col->col_idx;
-		compare_closure[j] = col->compare;
-	}
-}
-
-static void
-etsv_free_closures(ETreeSortedVariable *etsv)
-{
-	g_free(ascending_closure);
-	g_free(col_idx_closure);
-	g_free(compare_closure);
-
-}
-
-static void
-etsv_sort_node(ETreeSortedVariable *etsv, GNode *node)
-{
-	gint n;
-	gint i;
-	GNode **children;
-	GNode *child;
-	GNode *prev;
-
-	n = g_node_n_children(node);
-	children = g_new(GNode *, n);
-	for (i = 0, child = node->children; child && i; child = child->next, i++) {
-		children[i] = child;
-	}
-	qsort(children, n, sizeof(GNode *), qsort_callback);
-
-	prev = NULL;
-	for (i = 0; i < n; i++) {
-		children[i]->prev = prev;
-		if (prev) prev->next = children[i];
-		prev = children[i];
-		children[i]->next = NULL;
-	}
-}
-
-static void
-etsv_sort_tree(ETreeSortedVariable *etsv, GNode *root)
-{
-	GNode *childr;
-
-	etsv_sort_node(etsv, node);
-	
-	for (child = node->child; child; child = child->next) {
-		etsv_sort_tree(etsv, child);
-	}
-}
-
-static void
-etsv_sort(ETreeSortedVariable *etsv)
-{
-	static int reentering = 0;
-	if (reentering)
-		return;
-	reentering = 1;
-
-	e_table_model_pre_change(E_TABLE_MODEL(etsv));
-
-	etsv_setup_closures(etsv);
-
-	etsv_sort_tree(etsv, etsv->root);
-
-	etsv_free_closures(etsv);
-
-	e_table_model_changed (E_TABLE_MODEL(etsv));
-	reentering = 0;
-}
-
-static void
-etsv_add_node (ETreeSortedVariable *etsv, ETreePath *path, GNode *root)
-{
-	GNode *node;
-	GNode *new_node;
-	for (node = root; node; node = node->next) {
-		if (e_tree_model_node_is_ancestor(etsv->source, path, node->data)) {
-			etsv_add_node(etsv, path, node->data);
-			return;
-		}
-	}
-	new_node = g_node_new(path);
-	for (node = root; node; ) {
-		if (e_tree_model_node_is_ancestor(etsv->source, node->data, path)) {
-			GNode *next;
-			next = node->next;
-			g_node_unlink(node);
-			g_node_prepend(new_node, node);
-			node = next;
-		} else
-			node = node->next;
-	}
-
-	etsv_sort_node(etsv, new_node);
-
-
-#if 0
-	g_node_prepend(root, new_node);
-	etsv_sort_node(etsv, root);
-#else
-	/* Insert sort to be a bit faster than the above prepend and then sort. */
-	for (node = root; node; node = node->next) {
-		if (etsv_compare(etsv, path, node->data) > 0) {
-			g_node_insert_before (root, node, new_node);
-			return;
-		}
-	}
-	g_node_append(root, new_node);
-#endif
-}
-
-etsv_add(ETreeSortedVariable *etsv, gint row)
-{
-	ETreeModel *source = etsv->source;
-	ETreePath *path;
-
-	path = e_table_model_value_at (E_TABLE_MODEL(source), -1, row);
-	etsv_add_node(etsv, path, etsv->root);
-}
-
-/* Optimize by doing the qsorts as we build.  But we'll do that later. */
-static void
-etsv_add_all_node (ETreeSortedVariable *etsv, ETreePath *path, GNode *node)
-{
-	ETreeModel *source = etsv->source;
-	ETreePath **children;
-	int n;
-	int i;
-
-	n = e_tree_model_node_get_children(source, path, &children);
-	qsort(children, n, sizeof(ETreePath *), qsort_callback_source);
-
-	for (i = n - 1; i >= 0; i--) {
-		GNode *new_child = g_node_new(children[i]);
-		g_node_prepend(path, new_child);
-		etsv_add_all_node (etsv, children[i], new_child)
-	}
-
-	g_free(children);
-}
-
-static void
-etsv_add_all   (ETreeSortedVariable *etsv)
-{
-	GNode *node;
-	ETreePath *path;
-
-	e_table_model_pre_change(etm);
-
-	if (etsv->root)
-		g_node_destroy(etsv->root);
-
-	etsv_setup_closures(etsv);
-
-	path = e_tree_model_get_root(etsv->source);
-	node = g_node_new(path);
-	etsv_add_all_node(etsv, path, node);
-	etsv->root = node;
-
-	etsv_free_closures(etsv);
-
-	e_tree_model_node_changed (etsv, etsv->root);
-}
diff --git a/widgets/table/e-tree-sorted-variable.h b/widgets/table/e-tree-sorted-variable.h
deleted file mode 100644
index a86ea9f602..0000000000
--- a/widgets/table/e-tree-sorted-variable.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TREE_SORTED_VARIABLE_H_
-#define _E_TREE_SORTED_VARIABLE_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/e-tree/e-tree-model.h>
-#include <gal/e-table/e-table-subset-variable.h>
-#include <gal/e-table/e-table-sort-info.h>
-#include <gal/e-table/e-table-header.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TREE_SORTED_VARIABLE_TYPE        (e_tree_sorted_variable_get_type ())
-#define E_TREE_SORTED_VARIABLE(o)          (GTK_CHECK_CAST ((o), E_TREE_SORTED_VARIABLE_TYPE, ETreeSortedVariable))
-#define E_TREE_SORTED_VARIABLE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TREE_SORTED_VARIABLE_TYPE, ETreeSortedVariableClass))
-#define E_IS_TREE_SORTED_VARIABLE(o)       (GTK_CHECK_TYPE ((o), E_TREE_SORTED_VARIABLE_TYPE))
-#define E_IS_TREE_SORTED_VARIABLE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TREE_SORTED_VARIABLE_TYPE))
-
-typedef struct {
-	ETreeModel base;
-
-	ETableSortInfo *sort_info;
-	
-	ETableHeader *full_header;
-
-	int              table_model_changed_id;
-	int              table_model_row_changed_id;
-	int              table_model_cell_changed_id;
-	int              sort_info_changed_id;
-	int              sort_idle_id;
-	int		 insert_idle_id;
-	int		 insert_count;
-
-} ETreeSortedVariable;
-
-typedef struct {
-	ETreeModelClass parent_class;
-} ETreeSortedVariableClass;
-
-GtkType      e_tree_sorted_variable_get_type        (void);
-ETableModel *e_tree_sorted_variable_new             (ETreeModel          *etm,
-						     ETableHeader        *header,
-						     ETableSortInfo      *sort_info);
-
-ETreeModel  *e_tree_sorted_get_toplevel             (ETreeSortedVariable *tree_model);
-
-void         e_tree_sorted_variable_add             (ETreeSortedVariable *ets,
-						     gint                 row);
-void         e_tree_sorted_variable_add_all         (ETreeSortedVariable *ets);
-gboolean     e_tree_sorted_variable_remove          (ETreeSortedVariable *ets,
-						     gint                 row);
-void         e_tree_sorted_variable_increment       (ETreeSortedVariable *ets,
-						     gint                 position,
-						     gint                 amount);
-void         e_tree_sorted_variable_decrement       (ETreeSortedVariable *ets,
-						     gint                 position,
-						     gint                 amount);
-void         e_tree_sorted_variable_set_allocation  (ETreeSortedVariable *ets,
-						     gint                 total);
-END_GNOME_DECLS
-
-#endif /* _E_TREE_SORTED_VARIABLE_H_ */
diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c
deleted file mode 100644
index 1e635865ae..0000000000
--- a/widgets/table/e-tree-sorted.c
+++ /dev/null
@@ -1,1281 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-tree-sorted.c: a Tree Model implementation that the programmer builds in sorted.
- *
- * Author:
- *   Chris Toshok (toshok@ximian.com)
- *   Chris Lahey <clahey@ximian.com>
- *
- * Adapted from the gtree code and ETableModel.
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-
-/* FIXME: Overall e-tree-sorted.c needs to be made more efficient. */
-
-
-#include <config.h>
-
-#include "e-tree-sorted.h"
-
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <string.h>
-
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include <gtk/gtksignal.h>
-#include "gal/util/e-util.h"
-#include "gal/util/e-xml-utils.h"
-#include "e-table-sorting-utils.h"
-
-#define PARENT_TYPE E_TREE_MODEL_TYPE
-
-/* maximum insertions between an idle event that we will do without scheduling an idle sort */
-#define ETS_INSERT_MAX (4)
-
-#define TREEPATH_CHUNK_AREA_SIZE (30 * sizeof (ETreeSortedPath))
-
-#define d(x)
-
-static ETreeModel *parent_class;
-static GMemChunk  *node_chunk;
-
-typedef struct ETreeSortedPath ETreeSortedPath;
-
-struct ETreeSortedPath {
-	ETreePath         corresponding;
-
-	/* parent/child/sibling pointers */
-	ETreeSortedPath  *parent;
-	gint              num_children;
-	ETreeSortedPath **children;
-	int               position;
-	int               orig_position;
-
-	guint             needs_resort : 1;
-	guint             child_needs_resort : 1;
-	guint             resort_all_children : 1;
-	guint             needs_regen_to_sort : 1;
-};
-
-struct ETreeSortedPriv {
-	ETreeModel      *source;
-	ETreeSortedPath *root;
-
-	ETableSortInfo   *sort_info;
-	ETableHeader     *full_header;
-
-	ETreeSortedPath  *last_access;
-
-	int          tree_model_pre_change_id;
-	int          tree_model_node_changed_id;
-	int          tree_model_node_data_changed_id;
-	int          tree_model_node_col_changed_id;
-	int          tree_model_node_inserted_id;
-	int          tree_model_node_removed_id;
-
-	int          sort_info_changed_id;
-	int          sort_idle_id;
-	int          insert_idle_id;
-	int          insert_count;
-};
-
-enum {
-	ARG_0,
-
-	ARG_SORT_INFO,
-};
-
-static void ets_sort_info_changed (ETableSortInfo *sort_info, ETreeSorted *ets);
-static void resort_node (ETreeSorted *ets, ETreeSortedPath *path, gboolean resort_all_children, gboolean needs_regen, gboolean send_signals);
-static void mark_path_needs_resort (ETreeSorted *ets, ETreeSortedPath *path, gboolean needs_rebuild, gboolean resort_all_children);
-static void schedule_resort (ETreeSorted *ets, ETreeSortedPath *path, gboolean needs_regen, gboolean resort_all_children);
-static void free_path (ETreeSortedPath *path);
-static void generate_children(ETreeSorted *ets, ETreeSortedPath *path);
-static void regenerate_children(ETreeSorted *ets, ETreeSortedPath *path);
-
-
-
-/* idle callbacks */
-
-static gboolean
-ets_sort_idle(gpointer user_data)
-{
-	ETreeSorted *ets = user_data;
-	ets->priv->sort_idle_id = 0;
-	if (ets->priv->root) {
-		resort_node (ets, ets->priv->root, FALSE, FALSE, TRUE);
-	}
-	return FALSE;
-}
-
-static gboolean
-ets_insert_idle(ETreeSorted *ets)
-{
-	ets->priv->insert_count = 0;
-	ets->priv->insert_idle_id = 0;
-	return FALSE;
-}
-
-
-
-/* Helper functions */
-
-#define CHECK_AROUND_LAST_ACCESS
-
-static inline ETreeSortedPath *
-check_last_access (ETreeSorted *ets, ETreePath corresponding)
-{
-#ifdef CHECK_AROUND_LAST_ACCESS
-	ETreeSortedPath *parent;
-	int end;
-	int start;
-	int i;
-#endif
-
-	if (ets->priv->last_access == NULL)
-		return NULL;
-
-	if (ets->priv->last_access == corresponding) {
-		d(g_print("Found last access %p at %p.", ets->priv->last_access, ets->priv->last_access));
-		return ets->priv->last_access;
-	}
-
-#ifdef CHECK_AROUND_LAST_ACCESS
-	parent = ets->priv->last_access->parent;
-	if (parent && parent->children) {
-		i = ets->priv->last_access->position;
-		end = MIN(parent->num_children, i + 10);
-		for (; i < end; i++) {
-			if (parent->children[i] && parent->children[i]->corresponding == corresponding) {
-				d(g_print("Found last access %p at %p.", ets->priv->last_access, parent->children[i]));
-				return parent->children[i];
-			}
-		}
-
-		i = ets->priv->last_access->position - 1;
-		start = MAX(0, i - 10);
-		for (; i >= start; i--) {
-			if (parent->children[i] && parent->children[i]->corresponding == corresponding) {
-				d(g_print("Found last access %p at %p.", ets->priv->last_access, parent->children[i]));
-				return parent->children[i];
-			}
-		}
-	}
-#endif
-	return NULL;
-}
-
-static ETreeSortedPath *
-find_path(ETreeSorted *ets, ETreePath corresponding)
-{
-	int depth;
-	ETreePath *sequence;
-	int i;
-	ETreeSortedPath *path;
-	ETreeSortedPath *check_last;
-
-	if (corresponding == NULL)
-		return NULL;
-
-	check_last = check_last_access (ets, corresponding);
-	if (check_last) {
-		d(g_print(" (find_path)\n"));
-		return check_last;
-	}
-
-	depth = e_tree_model_node_depth(ets->priv->source, corresponding);
-
-	sequence = g_new(ETreePath, depth + 1);
-
-	sequence[0] = corresponding;
-
-	for (i = 0; i < depth; i++)
-		sequence[i + 1] = e_tree_model_node_get_parent(ets->priv->source, sequence[i]);
-
-	path = ets->priv->root;
-
-	for (i = depth - 1; i >= 0 && path != NULL; i --) {
-		int j;
-
-		if (path->num_children == -1) {
-			path = NULL;
-			break;
-		}
-
-		for (j = 0; j < path->num_children; j++) {
-			if (path->children[j]->corresponding == sequence[i]) {
-				break;
-			}
-		}
-
-		if (j < path->num_children) {
-			path = path->children[j];
-		} else {
-			path = NULL;
-		}
-	}
-	g_free (sequence);
-
-	d(g_print("Didn't find last access %p.  Setting to %p. (find_path)\n", ets->priv->last_access, path));
-	ets->priv->last_access = path;
-
-	return path;
-}
-
-static ETreeSortedPath *
-find_child_path(ETreeSorted *ets, ETreeSortedPath *parent, ETreePath corresponding)
-{
-	int i;
-
-	if (corresponding == NULL)
-		return NULL;
-
-	if (parent->num_children == -1) {
-		return NULL;
-	}
-
-	for (i = 0; i < parent->num_children; i++)
-		if (parent->children[i]->corresponding == corresponding)
-			return parent->children[i];
-
-	return NULL;
-}
-
-static ETreeSortedPath *
-find_or_create_path(ETreeSorted *ets, ETreePath corresponding)
-{
-	int depth;
-	ETreePath *sequence;
-	int i;
-	ETreeSortedPath *path;
-	ETreeSortedPath *check_last;
-
-	if (corresponding == NULL)
-		return NULL;
-
-	check_last = check_last_access (ets, corresponding);
-	if (check_last) {
-		d(g_print(" (find_or_create_path)\n"));
-		return check_last;
-	}
-
-	depth = e_tree_model_node_depth(ets->priv->source, corresponding);
-
-	sequence = g_new(ETreePath, depth + 1);
-
-	sequence[0] = corresponding;
-
-	for (i = 0; i < depth; i++)
-		sequence[i + 1] = e_tree_model_node_get_parent(ets->priv->source, sequence[i]);
-
-	path = ets->priv->root;
-
-	for (i = depth - 1; i >= 0 && path != NULL; i --) {
-		int j;
-
-		if (path->num_children == -1) {
-			generate_children(ets, path);
-		}
-
-		for (j = 0; j < path->num_children; j++) {
-			if (path->children[j]->corresponding == sequence[i]) {
-				break;
-			}
-		}
-
-		if (j < path->num_children) {
-			path = path->children[j];
-		} else {
-			path = NULL;
-		}
-	}
-	g_free (sequence);
-
-	d(g_print("Didn't find last access %p.  Setting to %p. (find_or_create_path)\n", ets->priv->last_access, path));
-	ets->priv->last_access = path;
-
-	return path;
-}
-
-static void
-free_children (ETreeSortedPath *path)
-{
-	int i;
-
-	if (path == NULL)
-		return;
-
-	for (i = 0; i < path->num_children; i++) {
-		free_path(path->children[i]);
-	}
-
-	g_free(path->children);
-	path->children = NULL;
-	path->num_children = -1;
-}
-
-static void
-free_path (ETreeSortedPath *path)
-{
-	free_children(path);
-	g_chunk_free(path, node_chunk);
-}
-
-static ETreeSortedPath *
-new_path (ETreeSortedPath *parent, ETreePath corresponding)
-{
-	ETreeSortedPath *path;
-
-	path = g_chunk_new0 (ETreeSortedPath, node_chunk);
-
-	path->corresponding = corresponding;
-	path->parent = parent;
-	path->num_children = -1;
-	path->children = NULL;
-	path->position = -1;
-	path->orig_position = -1;
-	path->child_needs_resort = 0;
-	path->resort_all_children = 0;
-	path->needs_resort = 0;
-	path->needs_regen_to_sort = 0;
-
-	return path;
-}
-
-static void
-reposition_path (ETreeSorted *ets, ETreeSortedPath *path)
-{
-	int new_index;
-	int old_index = path->position;
-	ETreeSortedPath *parent = path->parent;
-	if (parent) {
-		if (ets->priv->sort_idle_id == 0) {
-			if (ets->priv->insert_count > ETS_INSERT_MAX) {
-				/* schedule a sort, and append instead */
-				schedule_resort(ets, parent, TRUE, FALSE);
-			} else {
-				/* make sure we have an idle handler to reset the count every now and then */
-				if (ets->priv->insert_idle_id == 0) {
-					ets->priv->insert_idle_id = g_idle_add_full(40, (GSourceFunc) ets_insert_idle, ets, NULL);
-				}
-
-				new_index = e_table_sorting_utils_tree_check_position
-					(E_TREE_MODEL(ets),
-					 ets->priv->sort_info,
-					 ets->priv->full_header,
-					 (ETreePath *) parent->children,
-					 parent->num_children,
-					 old_index);
-
-				if (new_index > old_index) {
-					int i;
-					ets->priv->insert_count++;
-					memmove(parent->children + old_index, parent->children + old_index + 1, sizeof (ETreePath) * (new_index - old_index));
-					parent->children[new_index] = path;
-					for (i = old_index; i <= new_index; i++)
-						parent->children[i]->position = i;
-					e_tree_model_node_changed(E_TREE_MODEL(ets), parent);
-					e_tree_model_pre_change(E_TREE_MODEL(ets));
-				} else if (new_index < old_index) {
-					int i;
-					ets->priv->insert_count++;
-					memmove(parent->children + new_index + 1, parent->children + new_index, sizeof (ETreePath) * (old_index - new_index));
-					parent->children[new_index] = path;
-					for (i = new_index; i <= old_index; i++)
-						parent->children[i]->position = i;
-					e_tree_model_node_changed(E_TREE_MODEL(ets), parent);
-					e_tree_model_pre_change(E_TREE_MODEL(ets));
-				}
-			}
-		} else
-			mark_path_needs_resort(ets, parent, TRUE, FALSE);
-	}
-}
-
-static void
-regenerate_children(ETreeSorted *ets, ETreeSortedPath *path)
-{
-	ETreeSortedPath **children;
-	int i;
-
-	children = g_new(ETreeSortedPath *, path->num_children);
-	for (i = 0; i < path->num_children; i++)
-		children[path->children[i]->orig_position] = path->children[i];
-	g_free(path->children);
-	path->children = children;
-}
-
-static void
-generate_children(ETreeSorted *ets, ETreeSortedPath *path)
-{
-	ETreePath child;
-	int i;
-	int count;
-
-	free_children(path);
-
-	count = 0;
-	for (child = e_tree_model_node_get_first_child(ets->priv->source, path->corresponding);
-	     child;
-	     child = e_tree_model_node_get_next(ets->priv->source, child)) {
-		count ++;
-	}
-
-	path->num_children = count;
-	path->children = g_new(ETreeSortedPath *, count);
-	for (child = e_tree_model_node_get_first_child(ets->priv->source, path->corresponding), i = 0;
-	     child;
-	     child = e_tree_model_node_get_next(ets->priv->source, child), i++) {
-		path->children[i] = new_path(path, child);
-		path->children[i]->position = i;
-		path->children[i]->orig_position = i;
-	}
-	if (path->num_children > 0)
-		schedule_resort (ets, path, FALSE, TRUE);
-}
-
-static void
-resort_node (ETreeSorted *ets, ETreeSortedPath *path, gboolean resort_all_children, gboolean needs_regen, gboolean send_signals)
-{
-	gboolean needs_resort;
-	if (path) {
-		needs_resort = path->needs_resort || resort_all_children;
-		needs_regen = path->needs_regen_to_sort || needs_regen;
-		if (path->num_children > 0) {
-			if (needs_resort && send_signals)
-				e_tree_model_pre_change(E_TREE_MODEL(ets));
-			if (needs_resort) {
-				int i;
-				d(g_print("Start sort of node %p\n", path));
-				if (needs_regen)
-					regenerate_children(ets, path);
-				d(g_print("Regened sort of node %p\n", path));
-				e_table_sorting_utils_tree_sort (E_TREE_MODEL(ets),
-								 ets->priv->sort_info,
-								 ets->priv->full_header,
-								 (ETreePath *) path->children,
-								 path->num_children);
-				d(g_print("Renumbering sort of node %p\n", path));
-				for (i = 0; i < path->num_children; i++) {
-					path->children[i]->position = i;
-				}
-				d(g_print("End sort of node %p\n", path));
-			}
-			if (path->resort_all_children)
-				resort_all_children = TRUE;
-			if ((resort_all_children || path->child_needs_resort) && path->num_children >= 0) {
-				int i;
-				for (i = 0; i < path->num_children; i++) {
-					resort_node(ets, path->children[i], resort_all_children, needs_regen, send_signals && !needs_resort);
-				}
-				path->child_needs_resort = 0;
-			}
-		}
-		path->needs_resort = 0;	
-		path->child_needs_resort = 0;
-		path->needs_regen_to_sort = 0;
-		path->resort_all_children = 0;
-		if (needs_resort && send_signals && path->num_children > 0)
-			e_tree_model_node_changed(E_TREE_MODEL(ets), path);
-	}
-}
-
-static void
-mark_path_child_needs_resort (ETreeSorted *ets, ETreeSortedPath *path)
-{
-	if (path == NULL)
-		return;
-	if (!path->child_needs_resort) {
-		path->child_needs_resort = 1;
-		mark_path_child_needs_resort (ets, path->parent);
-	}
-}
-
-static void
-mark_path_needs_resort (ETreeSorted *ets, ETreeSortedPath *path, gboolean needs_regen, gboolean resort_all_children)
-{
-	if (path == NULL)
-		return;
-	if (path->num_children == 0)
-		return;
-	path->needs_resort = 1;
-	path->needs_regen_to_sort = needs_regen;
-	path->resort_all_children = resort_all_children;
-	mark_path_child_needs_resort(ets, path->parent);
-}
-
-static void
-schedule_resort (ETreeSorted *ets, ETreeSortedPath *path, gboolean needs_regen, gboolean resort_all_children)
-{
-	ets->priv->insert_count = 0;
-	if (ets->priv->insert_idle_id != 0) {
-		g_source_remove(ets->priv->insert_idle_id);
-		ets->priv->insert_idle_id = 0;
-	}
-
-	if (path == NULL)
-		return;
-	if (path->num_children == 0)
-		return;
-
-	mark_path_needs_resort(ets, path, needs_regen, resort_all_children);
-	if (ets->priv->sort_idle_id == 0) {
-		ets->priv->sort_idle_id = g_idle_add_full(50, (GSourceFunc) ets_sort_idle, ets, NULL);
-	}
-}
-
-
-
-/* virtual methods */
-
-static void
-ets_destroy (GtkObject *object)
-{
-	ETreeSorted *ets = E_TREE_SORTED (object);
-	ETreeSortedPriv *priv = ets->priv;
-
-	/* FIXME lots of stuff to free here */
-
-	if (priv->root)
-		free_path(priv->root);
-
-	if (priv->source) {
-		gtk_signal_disconnect (GTK_OBJECT (priv->source),
-				       priv->tree_model_pre_change_id);
-		gtk_signal_disconnect (GTK_OBJECT (priv->source),
-				       priv->tree_model_node_changed_id);
-		gtk_signal_disconnect (GTK_OBJECT (priv->source),
-				       priv->tree_model_node_data_changed_id);
-		gtk_signal_disconnect (GTK_OBJECT (priv->source),
-				       priv->tree_model_node_col_changed_id);
-		gtk_signal_disconnect (GTK_OBJECT (priv->source),
-				       priv->tree_model_node_inserted_id);
-		gtk_signal_disconnect (GTK_OBJECT (priv->source),
-				       priv->tree_model_node_removed_id);
-
-		gtk_object_unref (GTK_OBJECT (priv->source));
-		priv->source = NULL;
-
-		priv->tree_model_pre_change_id = 0;
-		priv->tree_model_node_changed_id = 0;
-		priv->tree_model_node_data_changed_id = 0;
-		priv->tree_model_node_col_changed_id = 0;
-		priv->tree_model_node_inserted_id = 0;
-		priv->tree_model_node_removed_id = 0;
-	}
-
-	if (priv->sort_info) {
-		gtk_signal_disconnect (GTK_OBJECT (priv->sort_info),
-				       priv->sort_info_changed_id);
-
-		gtk_object_unref (GTK_OBJECT (priv->sort_info));
-		priv->sort_info = NULL;
-
-		priv->sort_info_changed_id = 0;
-	}
-
-	if (ets->priv->sort_idle_id) {
-		g_source_remove(ets->priv->sort_idle_id);
-		ets->priv->sort_idle_id = 0;
-	}
-	if (ets->priv->insert_idle_id) {
-		g_source_remove(ets->priv->insert_idle_id);
-		ets->priv->insert_idle_id = 0;
-	}
-
-	if (priv->full_header)
-		gtk_object_unref(GTK_OBJECT(priv->full_header));
-
-	g_free (priv);
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-/* Set_arg handler for the text item */
-static void
-ets_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ETreeSorted *ets;
-
-	ets = E_TREE_SORTED (object);
-
-	switch (arg_id) {
-	case ARG_SORT_INFO:
-		if (ets->priv->sort_info) {
-			gtk_signal_disconnect (GTK_OBJECT (ets->priv->sort_info),
-					       ets->priv->sort_info_changed_id);
-
-			gtk_object_unref (GTK_OBJECT (ets->priv->sort_info));
-			ets->priv->sort_info_changed_id = 0;
-		}
-		if (GTK_VALUE_OBJECT (*arg))
-			ets->priv->sort_info = E_TABLE_SORT_INFO(GTK_VALUE_OBJECT (*arg));
-		else
-			ets->priv->sort_info = NULL;
-		if (ets->priv->sort_info) {
-			gtk_object_ref(GTK_OBJECT(ets->priv->sort_info));
-
-			ets->priv->sort_info_changed_id = gtk_signal_connect (GTK_OBJECT (ets->priv->sort_info), "sort_info_changed",
-									      GTK_SIGNAL_FUNC (ets_sort_info_changed), ets);
-		}
-		if (ets->priv->root)
-			schedule_resort (ets, ets->priv->root, TRUE, TRUE);
-		break;
-
-	default:
-		return;
-	}
-}
-
-/* Get_arg handler for the text item */
-static void
-ets_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ETreeSorted *ets;
-
-	ets = E_TREE_SORTED (object);
-
-	switch (arg_id) {
-	case ARG_SORT_INFO:
-		if (ets->priv->sort_info)
-			GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(ets->priv->sort_info);
-		else
-			GTK_VALUE_OBJECT (*arg) = NULL;
-		break;
-
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static ETreePath
-ets_get_root (ETreeModel *etm)
-{
-	ETreeSortedPriv *priv = E_TREE_SORTED(etm)->priv;
-	if (priv->root == NULL) {
-		ETreeSorted *ets = E_TREE_SORTED(etm);
-		ETreePath corresponding = e_tree_model_get_root(ets->priv->source);
-
-		if (corresponding) {
-			priv->root = new_path(NULL, corresponding);
-		}
-	}
-	if (priv->root && priv->root->num_children == -1) {
-		generate_children(E_TREE_SORTED(etm), priv->root);
-	}
-
-	return priv->root;
-}
-
-static ETreePath
-ets_get_parent (ETreeModel *etm, ETreePath node)
-{
-	ETreeSortedPath *path = node;
-	return path->parent;
-}
-
-static ETreePath
-ets_get_first_child (ETreeModel *etm, ETreePath node)
-{
-	ETreeSortedPath *path = node;
-	ETreeSorted *ets = E_TREE_SORTED(etm);
-
-	if (path->num_children == -1)
-		generate_children(ets, path);
-
-	if (path->num_children > 0)
-		return path->children[0];
-	else
-		return NULL;
-}
-
-static ETreePath
-ets_get_last_child (ETreeModel *etm, ETreePath node)
-{
-	ETreeSortedPath *path = node;
-	ETreeSorted *ets = E_TREE_SORTED(etm);
-
-	if (path->num_children == -1)
-		generate_children(ets, path);
-
-	if (path->num_children > 0)
-		return path->children[path->num_children - 1];
-	else
-		return NULL;
-}
-
-static ETreePath
-ets_get_next (ETreeModel *etm, ETreePath node)
-{
-	ETreeSortedPath *path = node;
-	ETreeSortedPath *parent = path->parent;
-	if (parent) {
-		if (parent->num_children > path->position + 1)
-			return parent->children[path->position + 1];
-		else
-			return NULL;
-	} else
-		  return NULL;
-}
-
-static ETreePath
-ets_get_prev (ETreeModel *etm, ETreePath node)
-{
-	ETreeSortedPath *path = node;
-	ETreeSortedPath *parent = path->parent;
-	if (parent) {
-		if (path->position - 1 >= 0)
-			return parent->children[path->position - 1];
-		else
-			return NULL;
-	} else
-		  return NULL;
-}
-
-static gboolean
-ets_is_root (ETreeModel *etm, ETreePath node)
-{
- 	ETreeSortedPath *path = node;
-	ETreeSorted *ets = E_TREE_SORTED(etm);
-
-	return e_tree_model_node_is_root (ets->priv->source, path->corresponding);
-}
-
-static gboolean
-ets_is_expandable (ETreeModel *etm, ETreePath node)
-{
- 	ETreeSortedPath *path = node;
-	ETreeSorted *ets = E_TREE_SORTED(etm);
-	gboolean expandable = e_tree_model_node_is_expandable (ets->priv->source, path->corresponding);
-
-	if (path->num_children == -1) {
-		generate_children(ets, node);
-	}
-
-	return expandable;
-}
-
-static guint
-ets_get_children (ETreeModel *etm, ETreePath node, ETreePath **nodes)
-{
-	ETreeSortedPath *path = node;
-	guint n_children;
-
-	if (path->num_children == -1) {
-		generate_children(E_TREE_SORTED(etm), node);
-	}
-
-	n_children = path->num_children;
-
-	if (nodes) {
-		int i;
-
-		(*nodes) = g_malloc (sizeof (ETreePath) * n_children);
-		for (i = 0; i < n_children; i ++) {
-			(*nodes)[i] = path->children[i];
-		}
-	}
-
-	return n_children;
-}
-
-static guint
-ets_depth (ETreeModel *etm, ETreePath node)
-{
-	ETreeSortedPath *path = node;
-	ETreeSorted *ets = E_TREE_SORTED(etm);
-
-	return e_tree_model_node_depth(ets->priv->source, path->corresponding);
-}
-
-static GdkPixbuf *
-ets_icon_at (ETreeModel *etm, ETreePath node)
-{
-	ETreeSortedPath *path = node;
-	ETreeSorted *ets = E_TREE_SORTED(etm);
-
-	return e_tree_model_icon_at(ets->priv->source, path->corresponding);
-}
-
-static gboolean
-ets_get_expanded_default (ETreeModel *etm)
-{
-	ETreeSorted *ets = E_TREE_SORTED(etm);
-
-	return e_tree_model_get_expanded_default(ets->priv->source);
-}
-
-static gint
-ets_column_count (ETreeModel *etm)
-{
-	ETreeSorted *ets = E_TREE_SORTED(etm);
-
-	return e_tree_model_column_count(ets->priv->source);
-}
-
-
-static gboolean
-ets_has_save_id (ETreeModel *etm)
-{
-	return TRUE;
-}
-
-static gchar *
-ets_get_save_id (ETreeModel *etm, ETreePath node)
-{
-	ETreeSorted *ets = E_TREE_SORTED(etm);
-	ETreeSortedPath *path = node;
-
-	if (e_tree_model_has_save_id(ets->priv->source))
-		return e_tree_model_get_save_id(ets->priv->source, path->corresponding);
-	else
-		return g_strdup_printf("%p", path->corresponding);
-}
-
-static gboolean
-ets_has_get_node_by_id (ETreeModel *etm)
-{
-	ETreeSorted *ets = E_TREE_SORTED(etm);
-	return e_tree_model_has_get_node_by_id(ets->priv->source);
-}
-
-static ETreePath
-ets_get_node_by_id (ETreeModel *etm, gchar *save_id)
-{
-	ETreeSorted *ets = E_TREE_SORTED(etm);
-	ETreePath node;
-
-	node = e_tree_model_get_node_by_id (ets->priv->source, save_id);
-
-	return find_path(ets, node);
-}
-
-static gboolean
-ets_has_change_pending (ETreeModel *etm)
-{
-	ETreeSorted *ets = E_TREE_SORTED(etm);
-
-	return ets->priv->sort_idle_id != 0;
-}
-
-
-static void *
-ets_value_at (ETreeModel *etm, ETreePath node, int col)
-{
-	ETreeSorted *ets = E_TREE_SORTED(etm);
-	ETreeSortedPath *path = node;
-
-	return e_tree_model_value_at(ets->priv->source, path->corresponding, col);
-}
-
-static void
-ets_set_value_at (ETreeModel *etm, ETreePath node, int col, const void *val)
-{
-	ETreeSorted *ets = E_TREE_SORTED(etm);
-	ETreeSortedPath *path = node;
-
-	e_tree_model_set_value_at (ets->priv->source, path->corresponding, col, val);
-}
-
-static gboolean
-ets_is_editable (ETreeModel *etm, ETreePath node, int col)
-{
-	ETreeSorted *ets = E_TREE_SORTED(etm);
-	ETreeSortedPath *path = node;
-
-	return e_tree_model_node_is_editable (ets->priv->source, path->corresponding, col);
-}
-
-
-/* The default for ets_duplicate_value is to return the raw value. */
-static void *
-ets_duplicate_value (ETreeModel *etm, int col, const void *value)
-{
-	ETreeSorted *ets = E_TREE_SORTED(etm);
-
-	return e_tree_model_duplicate_value (ets->priv->source, col, value);
-}
-
-static void
-ets_free_value (ETreeModel *etm, int col, void *value)
-{
-	ETreeSorted *ets = E_TREE_SORTED(etm);
-
-	e_tree_model_free_value (ets->priv->source, col, value);
-}
-
-static void *
-ets_initialize_value (ETreeModel *etm, int col)
-{
-	ETreeSorted *ets = E_TREE_SORTED(etm);
-	
-	return e_tree_model_initialize_value (ets->priv->source, col);
-}
-
-static gboolean
-ets_value_is_empty (ETreeModel *etm, int col, const void *value)
-{
-	ETreeSorted *ets = E_TREE_SORTED(etm);
-	
-	return e_tree_model_value_is_empty (ets->priv->source, col, value);
-}
-
-static char *
-ets_value_to_string (ETreeModel *etm, int col, const void *value)
-{
-	ETreeSorted *ets = E_TREE_SORTED(etm);
-	
-	return e_tree_model_value_to_string (ets->priv->source, col, value);
-}
-
-
-
-/* Proxy functions */
-
-static void
-ets_proxy_pre_change (ETreeModel *etm, ETreeSorted *ets)
-{
-	e_tree_model_pre_change(E_TREE_MODEL(ets));
-}
-
-static void
-ets_proxy_node_changed (ETreeModel *etm, ETreePath node, ETreeSorted *ets)
-{
-	ets->priv->last_access = NULL;
-	d(g_print("Setting last access %p. (ets_proxy_node_changed)\n", ets->priv->last_access));
-
-	if (e_tree_model_node_is_root(ets->priv->source, node)) {
-		if (ets->priv->root) {
-			free_path(ets->priv->root);
-		}
-		ets->priv->root = new_path(NULL, node);
-		e_tree_model_node_changed(E_TREE_MODEL(ets), ets->priv->root);
-	} else {
-		ETreeSortedPath *path = find_path(ets, node);
-
-		if (path) {
-			free_children(path);
-			reposition_path(ets, path);
-			e_tree_model_node_changed(E_TREE_MODEL(ets), path);
-		}
-	}
-}
-
-static void
-ets_proxy_node_data_changed (ETreeModel *etm, ETreePath node, ETreeSorted *ets)
-{
-	ETreeSortedPath *path = find_path(ets, node);
-
-	if (path) {
-		reposition_path(ets, path);
-		e_tree_model_node_data_changed(E_TREE_MODEL(ets), path);
-	}
-}
-
-static void
-ets_proxy_node_col_changed (ETreeModel *etm, ETreePath node, int col, ETreeSorted *ets)
-{
-	ETreeSortedPath *path = find_path(ets, node);
-
-	if (path) {
-		if (e_table_sorting_utils_affects_sort(ets->priv->sort_info, ets->priv->full_header, col))
-			reposition_path(ets, path);
-		e_tree_model_node_col_changed(E_TREE_MODEL(ets), path, col);
-	}
-}
-
-static void
-ets_proxy_node_inserted (ETreeModel *etm, ETreePath parent, ETreePath child, ETreeSorted *ets)
-{
-	ETreeSortedPath *parent_path = find_path(ets, parent);
-
-	if (parent_path && parent_path->num_children != -1) {
-		int i;
-		int j;
-		ETreeSortedPath *path;
-		int position = parent_path->num_children;
-		ETreePath counter;
-
-		for (counter = e_tree_model_node_get_next(etm, child);
-		     counter;
-		     counter = e_tree_model_node_get_next(etm, counter))
-			position --;
-
-		if (position != parent_path->num_children) {
-			for (i = 0; i < parent_path->num_children; i++) {
-				if (parent_path->children[i]->orig_position >= position)
-					parent_path->children[i]->orig_position++;
-			}
-		}
-
-		i = parent_path->num_children;
-		path = new_path(parent_path, child);
-		path->orig_position = position;
-		if (ets->priv->sort_idle_id == 0) {
-			ets->priv->insert_count++;
-			if (ets->priv->insert_count > ETS_INSERT_MAX) {
-				/* schedule a sort, and append instead */
-				schedule_resort(ets, parent_path, TRUE, FALSE);
-			} else {
-				/* make sure we have an idle handler to reset the count every now and then */
-				if (ets->priv->insert_idle_id == 0) {
-					ets->priv->insert_idle_id = g_idle_add_full(40, (GSourceFunc) ets_insert_idle, ets, NULL);
-				}
-				i = e_table_sorting_utils_tree_insert
-					(ets->priv->source,
-					 ets->priv->sort_info,
-					 ets->priv->full_header,
-					 (ETreePath *) parent_path->children,
-					 parent_path->num_children,
-					 path);
-			}
-		} else {
-			mark_path_needs_resort(ets, parent_path, TRUE, FALSE);
-		}
-		parent_path->num_children ++;
-		parent_path->children = g_renew(ETreeSortedPath *, parent_path->children, parent_path->num_children);
-		memmove(parent_path->children + i + 1, parent_path->children + i, (parent_path->num_children - 1 - i) * sizeof(int));
-		parent_path->children[i] = path;
-		for (j = i; j < parent_path->num_children; j++) {
-			parent_path->children[j]->position = j;
-		}
-		e_tree_model_node_inserted(E_TREE_MODEL(ets), parent_path, parent_path->children[i]);
-	} else if (ets->priv->root == NULL && parent == NULL) {
-		if (child) {
-			ets->priv->root = new_path(NULL, child);
-			e_tree_model_node_inserted(E_TREE_MODEL(ets), NULL, ets->priv->root);
-		}
-	}
-}
-
-static void
-ets_proxy_node_removed (ETreeModel *etm, ETreePath parent, ETreePath child, int old_position, ETreeSorted *ets)
-{
-	ETreeSortedPath *parent_path = find_path(ets, parent);
-	ETreeSortedPath *path;
-
-	if (parent_path)
-		path = find_child_path(ets, parent_path, child);
-	else
-		path = find_path(ets, child);
-
-	d(g_print("Setting last access %p. (ets_proxy_node_removed)\n ", ets->priv->last_access));
-	ets->priv->last_access = NULL;
-
-	if (path && parent_path && parent_path->num_children != -1) {
-		int i;
-		for (i = 0; i < parent_path->num_children; i++) {
-			if (parent_path->children[i]->orig_position > old_position)
-				parent_path->children[i]->orig_position --;
-		}
-
-		i = path->position;
-
-		parent_path->num_children --;
-		memmove(parent_path->children + i, parent_path->children + i + 1, sizeof(ETreeSortedPath *) * (parent_path->num_children - i));
-		for (; i < parent_path->num_children; i++) {
-			parent_path->children[i]->position = i;
-		}
-		e_tree_model_node_removed(E_TREE_MODEL(ets), parent_path, path, path->position);
-		free_path(path);
-	} else if (path && path == ets->priv->root) {
-		ets->priv->root = NULL;
-		e_tree_model_node_removed(E_TREE_MODEL(ets), NULL, path, -1);
-		free_path(path);
-	}
-}
-
-static void
-ets_sort_info_changed (ETableSortInfo *sort_info, ETreeSorted *ets)
-{
-	schedule_resort(ets, ets->priv->root, TRUE, TRUE);
-}
-
-
-
-/* Initialization and creation */
-
-static void
-e_tree_sorted_class_init (GtkObjectClass *klass)
-{
-	ETreeModelClass *tree_class      = (ETreeModelClass *) klass;
-
-	parent_class                     = gtk_type_class (PARENT_TYPE);
-
-	node_chunk                       = g_mem_chunk_create (ETreeSortedPath, TREEPATH_CHUNK_AREA_SIZE, G_ALLOC_AND_FREE);
-	
-	klass->destroy                   = ets_destroy;
-	klass->set_arg                   = ets_set_arg;
-	klass->get_arg                   = ets_get_arg;
-
-	tree_class->get_root             = ets_get_root;
-	tree_class->get_parent           = ets_get_parent;
-	tree_class->get_first_child      = ets_get_first_child;
-	tree_class->get_last_child       = ets_get_last_child;
-	tree_class->get_prev             = ets_get_prev;
-	tree_class->get_next             = ets_get_next;
-
-	tree_class->is_root              = ets_is_root;
-	tree_class->is_expandable        = ets_is_expandable;
-	tree_class->get_children         = ets_get_children;
-	tree_class->depth                = ets_depth;
-
-	tree_class->icon_at              = ets_icon_at;
-
-	tree_class->get_expanded_default = ets_get_expanded_default;
-	tree_class->column_count         = ets_column_count;
-
-	tree_class->has_save_id          = ets_has_save_id;
-	tree_class->get_save_id          = ets_get_save_id;
-
-	tree_class->has_get_node_by_id   = ets_has_get_node_by_id;
-	tree_class->get_node_by_id       = ets_get_node_by_id;
-
-	tree_class->has_change_pending   = ets_has_change_pending;
-
-
-
-
-	tree_class->value_at             = ets_value_at;
-	tree_class->set_value_at         = ets_set_value_at;
-	tree_class->is_editable          = ets_is_editable;
-
-	tree_class->duplicate_value      = ets_duplicate_value;
-	tree_class->free_value           = ets_free_value;
-	tree_class->initialize_value     = ets_initialize_value;
-	tree_class->value_is_empty       = ets_value_is_empty;
-	tree_class->value_to_string      = ets_value_to_string;
-
-	gtk_object_add_arg_type ("ETreeSorted::sort_info", E_TABLE_SORT_INFO_TYPE,
-				 GTK_ARG_READWRITE, ARG_SORT_INFO);
-}
-
-static void
-e_tree_sorted_init (GtkObject *object)
-{
-	ETreeSorted *ets = (ETreeSorted *)object;
-
-	ETreeSortedPriv *priv;
-
-	priv                                  = g_new0 (ETreeSortedPriv, 1);
-	ets->priv                             = priv;
-
-	priv->root                            = NULL;
-	priv->source                          = NULL;
-
-	priv->sort_info                       = NULL;
-	priv->full_header                     = NULL;
-
-	priv->last_access                     = NULL;
-
-	priv->tree_model_pre_change_id        = 0;
-	priv->tree_model_node_changed_id      = 0;
-	priv->tree_model_node_data_changed_id = 0;
-	priv->tree_model_node_col_changed_id  = 0;
-	priv->tree_model_node_inserted_id     = 0;
-	priv->tree_model_node_removed_id      = 0;
-
-	priv->sort_info_changed_id            = 0;
-	priv->sort_idle_id                    = 0;
-	priv->insert_idle_id                  = 0;
-	priv->insert_count                    = 0;
-}
-
-E_MAKE_TYPE(e_tree_sorted, "ETreeSorted", ETreeSorted, e_tree_sorted_class_init, e_tree_sorted_init, PARENT_TYPE)
-
-/**
- * e_tree_sorted_construct:
- * @etree: 
- * 
- * 
- **/
-void
-e_tree_sorted_construct (ETreeSorted *ets, ETreeModel *source, ETableHeader *full_header, ETableSortInfo *sort_info)
-{
-	ets->priv->source      = source;
-	if (source)      gtk_object_ref(GTK_OBJECT(source));
-
-	ets->priv->full_header = full_header;
-	if (full_header) gtk_object_ref(GTK_OBJECT(full_header));
-
-	ets->priv->sort_info   = sort_info;
-	if (sort_info)   gtk_object_ref(GTK_OBJECT(sort_info));
-
-	ets->priv->tree_model_pre_change_id      = gtk_signal_connect (GTK_OBJECT (source), "pre_change",
-								       GTK_SIGNAL_FUNC (ets_proxy_pre_change), ets);
-	ets->priv->tree_model_node_changed_id      = gtk_signal_connect (GTK_OBJECT (source), "node_changed",
-									 GTK_SIGNAL_FUNC (ets_proxy_node_changed), ets);
-	ets->priv->tree_model_node_data_changed_id = gtk_signal_connect (GTK_OBJECT (source), "node_data_changed",
-									 GTK_SIGNAL_FUNC (ets_proxy_node_data_changed), ets);
-	ets->priv->tree_model_node_col_changed_id  = gtk_signal_connect (GTK_OBJECT (source), "node_col_changed",
-									 GTK_SIGNAL_FUNC (ets_proxy_node_col_changed), ets);
-	ets->priv->tree_model_node_inserted_id     = gtk_signal_connect (GTK_OBJECT (source), "node_inserted",
-									 GTK_SIGNAL_FUNC (ets_proxy_node_inserted), ets);
-	ets->priv->tree_model_node_removed_id      = gtk_signal_connect (GTK_OBJECT (source), "node_removed",
-									 GTK_SIGNAL_FUNC (ets_proxy_node_removed), ets);
-
-	ets->priv->sort_info_changed_id            = gtk_signal_connect (GTK_OBJECT (sort_info), "sort_info_changed",
-									 GTK_SIGNAL_FUNC (ets_sort_info_changed), ets);
-}
-
-/**
- * e_tree_sorted_new
- *
- * FIXME docs here.
- *
- * return values: a newly constructed ETreeSorted.
- */
-ETreeSorted *
-e_tree_sorted_new (ETreeModel *source, ETableHeader *full_header, ETableSortInfo *sort_info)
-{
-	ETreeSorted *ets;
-
-	ets = gtk_type_new (e_tree_sorted_get_type ());
-
-	e_tree_sorted_construct(ets, source, full_header, sort_info);
-
-	return ets;
-}
-
-ETreePath
-e_tree_sorted_view_to_model_path  (ETreeSorted    *ets,
-				   ETreePath       view_path)
-{
-	ETreeSortedPath *path = view_path;
-	if (path) {
-		ets->priv->last_access = path;
-		d(g_print("Setting last access %p. (e_tree_sorted_view_to_model_path)\n", ets->priv->last_access));
-		return path->corresponding;
-	} else
-		return NULL;
-}
-
-ETreePath
-e_tree_sorted_model_to_view_path  (ETreeSorted    *ets,
-				   ETreePath       model_path)
-{
-	return find_or_create_path(ets, model_path);
-}
-
-int
-e_tree_sorted_orig_position       (ETreeSorted    *ets,
-				   ETreePath       path)
-{
-	ETreeSortedPath *sorted_path = path;
-	return sorted_path->orig_position;
-}
-
-int
-e_tree_sorted_node_num_children   (ETreeSorted    *ets,
-				   ETreePath       path)
-{
-	ETreeSortedPath *sorted_path = path;
-	return sorted_path->num_children;
-}
diff --git a/widgets/table/e-tree-sorted.h b/widgets/table/e-tree-sorted.h
deleted file mode 100644
index 1ad5438c29..0000000000
--- a/widgets/table/e-tree-sorted.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TREE_SORTED_H_
-#define _E_TREE_SORTED_H_
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gal/e-table/e-tree-model.h>
-#include <gal/e-table/e-table-sort-info.h>
-#include <gal/e-table/e-table-header.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-#define E_TREE_SORTED_TYPE        (e_tree_sorted_get_type ())
-#define E_TREE_SORTED(o)          (GTK_CHECK_CAST ((o), E_TREE_SORTED_TYPE, ETreeSorted))
-#define E_TREE_SORTED_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TREE_SORTED_TYPE, ETreeSortedClass))
-#define E_IS_TREE_SORTED(o)       (GTK_CHECK_TYPE ((o), E_TREE_SORTED_TYPE))
-#define E_IS_TREE_SORTED_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TREE_SORTED_TYPE))
-
-typedef struct ETreeSorted ETreeSorted;
-typedef struct ETreeSortedPriv ETreeSortedPriv;
-typedef struct ETreeSortedClass ETreeSortedClass;
-
-struct ETreeSorted {
-	ETreeModel base;
-
-	ETreeSortedPriv *priv;
-};
-
-struct ETreeSortedClass {
-	ETreeModelClass parent_class;
-};
-
-
-GtkType      e_tree_sorted_get_type            (void);
-void         e_tree_sorted_construct           (ETreeSorted    *etree,
-						ETreeModel     *source,
-						ETableHeader   *full_header,
-						ETableSortInfo *sort_info);
-ETreeSorted *e_tree_sorted_new                 (ETreeModel     *source,
-						ETableHeader   *full_header,
-						ETableSortInfo *sort_info);
-
-ETreePath    e_tree_sorted_view_to_model_path  (ETreeSorted    *ets,
-						ETreePath       view_path);
-ETreePath    e_tree_sorted_model_to_view_path  (ETreeSorted    *ets,
-						ETreePath       model_path);
-int          e_tree_sorted_orig_position       (ETreeSorted    *ets,
-						ETreePath       path);
-int          e_tree_sorted_node_num_children   (ETreeSorted    *ets,
-						ETreePath       path);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TREE_SORTED_H */
diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c
deleted file mode 100644
index 99c312c805..0000000000
--- a/widgets/table/e-tree-table-adapter.c
+++ /dev/null
@@ -1,1042 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-tree-table-adapter.c: Implements a table that contains a subset of another table.
- *
- * Author:
- *   Chris Lahey <clahey@ximian.com>
- *   Chris Toshok <toshok@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#include <config.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gtk/gtksignal.h>
-#include <gnome-xml/tree.h>
-#include <gnome-xml/parser.h>
-#include "gal/util/e-util.h"
-#include "gal/util/e-xml-utils.h"
-#include "e-tree-table-adapter.h"
-
-#define PARENT_TYPE E_TABLE_MODEL_TYPE
-#define d(x)
-
-#define INCREMENT_AMOUNT 100
-
-static ETableModelClass *parent_class;
-
-
-struct ETreeTableAdapterPriv {
-	ETreeModel  *source;
-	int    	     n_map;
-	int    	     n_vals_allocated;
-	ETreePath   *map_table;
-	GHashTable  *attributes;
-
-	guint        root_visible : 1;
-
-	int          last_access;
-
-	int          tree_model_pre_change_id;
-	int          tree_model_node_changed_id;
-	int          tree_model_node_data_changed_id;
-	int          tree_model_node_col_changed_id;
-	int          tree_model_node_inserted_id;
-	int          tree_model_node_removed_id;
-};
-
-typedef struct ETreeTableAdapterNode {
-	guint expanded : 1;
-	guint expandable : 1;
-	guint expandable_set : 1;
-
-	/* parent/child/sibling pointers */
-	guint32                num_visible_children;
-} ETreeTableAdapterNode;
-
-static ETreeTableAdapterNode *
-find_node(ETreeTableAdapter *adapter, ETreePath path)
-{
-	ETreeTableAdapterNode *node;
-
-	if (path == NULL)
-		return NULL;
-
-	if (e_tree_model_has_save_id(adapter->priv->source)) {
-		char *save_id;
-		save_id = e_tree_model_get_save_id(adapter->priv->source, path);
-		node = g_hash_table_lookup(adapter->priv->attributes, save_id);
-		g_free(save_id);
-	} else {
-		node = g_hash_table_lookup(adapter->priv->attributes, path);
-	}
-	if (node && !node->expandable_set) {
-		node->expandable = e_tree_model_node_is_expandable(adapter->priv->source, path);
-		node->expandable_set = 1;
-	}
-
-	return node;
-}
-
-static ETreeTableAdapterNode *
-find_or_create_node(ETreeTableAdapter *etta, ETreePath path)
-{
-	ETreeTableAdapterNode *node;
-
-	node = find_node(etta, path);
-
-	if (!node) {
-		node = g_new(ETreeTableAdapterNode, 1);
-		if (e_tree_model_node_is_root(etta->priv->source, path))
-			node->expanded = TRUE;
-		else
-			node->expanded = e_tree_model_get_expanded_default(etta->priv->source);
-		node->expandable = e_tree_model_node_is_expandable(etta->priv->source, path);
-		node->expandable_set = 1;
-		node->num_visible_children = 0;
-
-		if (e_tree_model_has_save_id(etta->priv->source)) {
-			char *save_id;
-			save_id = e_tree_model_get_save_id(etta->priv->source, path);
-			g_hash_table_insert(etta->priv->attributes, save_id, node);
-		} else {
-			g_hash_table_insert(etta->priv->attributes, path, node);
-		}
-	}
-
-	return node;
-}
-
-static void
-add_expanded_node(ETreeTableAdapter *etta, char *save_id, gboolean expanded)
-{
-	ETreeTableAdapterNode *node;
-
-	node = g_hash_table_lookup(etta->priv->attributes, save_id);
-
-	if (node) {
-		node->expandable_set = 0;
-		node->expanded = expanded;
-		return;
-	}
-
-	node = g_new(ETreeTableAdapterNode, 1);
-
-	node->expanded = expanded;
-	node->expandable = 0;
-	node->expandable_set = 0;
-	node->num_visible_children = 0;
-
-	g_hash_table_insert(etta->priv->attributes, save_id, node);
-}
-
-static void
-etta_expand_to(ETreeTableAdapter *etta, int size)
-{
-	if (size > etta->priv->n_vals_allocated) {
-		etta->priv->n_vals_allocated = MAX(etta->priv->n_vals_allocated + INCREMENT_AMOUNT, size);
-		etta->priv->map_table = g_renew (ETreePath, etta->priv->map_table, etta->priv->n_vals_allocated);
-	}
-
-}
-
-static void
-etta_update_parent_child_counts(ETreeTableAdapter *etta, ETreePath path, int change)
-{
-	for (path = e_tree_model_node_get_parent(etta->priv->source, path);
-	     path;
-	     path = e_tree_model_node_get_parent(etta->priv->source, path)) {
-		ETreeTableAdapterNode *node = find_or_create_node(etta, path);
-		node->num_visible_children += change;
-	}
-	etta->priv->n_map += change;
-}
-
-static int
-find_next_node_maybe_deleted(ETreeTableAdapter *adapter, int row)
-{
-	ETreePath path = adapter->priv->map_table[row];
-	if (path) {
-		ETreeTableAdapterNode *current = find_node (adapter, path);
-		return row + (current ? current->num_visible_children : 0) + 1;
-	} else
-		return -1;
-}
-
-static int
-find_first_child_node_maybe_deleted(ETreeTableAdapter *adapter, int row)
-{
-	if (row != -1) {
-		ETreePath path = adapter->priv->map_table[row];
-		ETreeTableAdapterNode *current = find_node (adapter, path);
-		if (current && current->expanded)
-			return row + 1;
-		else
-			return -1;
-	} else
-		return 0;
-}
-
-static int
-find_next_node(ETreeTableAdapter *adapter, int row)
-{
-	ETreePath path = adapter->priv->map_table[row];
-	if (path) {
-		ETreePath next_sibling = e_tree_model_node_get_next(adapter->priv->source, path);
-		ETreeTableAdapterNode *current = find_node (adapter, path);
-		if (next_sibling)
-			return row + (current ? current->num_visible_children : 0) + 1;
-		else
-			return -1;
-	} else
-		return -1;
-}
-
-static int
-find_first_child_node(ETreeTableAdapter *adapter, int row)
-{
-	if (row != -1) {
-		ETreePath path = adapter->priv->map_table[row];
-		ETreePath first_child = e_tree_model_node_get_first_child(adapter->priv->source, path);
-		ETreeTableAdapterNode *current = find_node (adapter, path);
-		if (first_child && current && current->expanded)
-			return row + 1;
-		else
-			return -1;
-	} else
-		return 0;
-}
-
-static int
-find_child_row_num_maybe_deleted(ETreeTableAdapter *etta, int row, ETreePath path)
-{
-	row = find_first_child_node_maybe_deleted(etta, row);
-
-	while (row != -1 && path != etta->priv->map_table[row]) {
-		row = find_next_node_maybe_deleted(etta, row);
-	}
-
-	return row;
-}
-
-static int
-find_row_num(ETreeTableAdapter *etta, ETreePath path)
-{
-	int depth;
-	ETreePath *sequence;
-	int i;
-	int row;
-
-	if (etta->priv->map_table == NULL)
-		return -1;
-
-	if (path == NULL)
-		return -1;
-
-	if (etta->priv->last_access != -1) {
-		int end = MIN(etta->priv->n_map, etta->priv->last_access + 10);
-		int start = MAX(0, etta->priv->last_access - 10);
-		for (i = etta->priv->last_access; i < end; i++) {
-			if(etta->priv->map_table[i] == path) {
-				d(g_print("Found last access %d at row %d. (find_row_num)\n", etta->priv->last_access, i));
-				return i;
-			}
-		}
-		for (i = etta->priv->last_access - 1; i >= start; i--) {
-			if(etta->priv->map_table[i] == path) {
-				d(g_print("Found last access %d at row %d. (find_row_num)\n", etta->priv->last_access, i));
-				return i;
-			}
-		}
-	}
-
-
-	depth = e_tree_model_node_depth(etta->priv->source, path);
-
-	sequence = g_new(ETreePath, depth + 1);
-
-	sequence[0] = path;
-
-	for (i = 0; i < depth; i++) {
-		ETreeTableAdapterNode *node;
-		
-		sequence[i + 1] = e_tree_model_node_get_parent(etta->priv->source, sequence[i]);
-
-		node = find_node(etta, sequence[i + 1]);
-		if (! ((node && node->expanded) || e_tree_model_get_expanded_default(etta->priv->source))) {
-			g_free(sequence);
-			return -1;
-		}
-	}
-
-	row = 0;
-
-	for (i = depth; i >= 0; i --) {
-		while (row != -1 && sequence[i] != etta->priv->map_table[row]) {
-			row = find_next_node(etta, row);
-		}
-		if (row == -1)
-			break;
-		if (i == 0)
-			break;
-		row = find_first_child_node(etta, row);
-	}
-	g_free (sequence);
-
-	d(g_print("Didn't find last access %d. Setting to %d. (find_row_num)\n", etta->priv->last_access, row));
-	etta->priv->last_access = row;
-	return row;
-}
-
-static int
-array_size_from_path(ETreeTableAdapter *etta, ETreePath path)
-{
-	int size = 1;
-
-	ETreeTableAdapterNode *node = NULL;
-
-	if (e_tree_model_node_is_expandable(etta->priv->source, path))
-		node = find_or_create_node(etta, path);
-
-	if (node && node->expanded) {
-		ETreePath children;
-
-		for (children = e_tree_model_node_get_first_child(etta->priv->source, path); 
-		     children; 
-		     children = e_tree_model_node_get_next(etta->priv->source, children)) {
-			size += array_size_from_path(etta, children);
-		}
-	}
-
-	return size;
-}
-
-static int
-fill_array_from_path(ETreeTableAdapter *etta, ETreePath *array, ETreePath path)
-{
-	ETreeTableAdapterNode *node = NULL;
-	int index = 0;
-
-	array[index] = path;
-
-	index ++;
-
-	if (e_tree_model_node_is_expandable(etta->priv->source, path))
-		node = find_or_create_node(etta, path);
-	else
-		node = find_node(etta, path);
-
-	if (node && node->expanded) {
-		ETreePath children;
-
-		for (children = e_tree_model_node_get_first_child(etta->priv->source, path); 
-		     children; 
-		     children = e_tree_model_node_get_next(etta->priv->source, children)) {
-			index += fill_array_from_path(etta, array + index, children);
-		}
-	}
-
-	if (node)
-		node->num_visible_children = index - 1;
-
-	return index;
-}
-
-static void
-free_string (gpointer key, gpointer value, gpointer data)
-{
-	g_free(key);
-}
-
-static void
-etta_destroy (GtkObject *object)
-{
-	ETreeTableAdapter *etta = E_TREE_TABLE_ADAPTER (object);
-
-	if (etta->priv->source && e_tree_model_has_save_id(etta->priv->source)) {
-		g_hash_table_foreach(etta->priv->attributes, free_string, NULL);
-	}
-	g_hash_table_destroy (etta->priv->attributes);
-
-	if (etta->priv->source) {
-		gtk_signal_disconnect (GTK_OBJECT (etta->priv->source),
-				       etta->priv->tree_model_pre_change_id);
-		gtk_signal_disconnect (GTK_OBJECT (etta->priv->source),
-				       etta->priv->tree_model_node_changed_id);
-		gtk_signal_disconnect (GTK_OBJECT (etta->priv->source),
-				       etta->priv->tree_model_node_data_changed_id);
-		gtk_signal_disconnect (GTK_OBJECT (etta->priv->source),
-				       etta->priv->tree_model_node_col_changed_id);
-		gtk_signal_disconnect (GTK_OBJECT (etta->priv->source),
-				       etta->priv->tree_model_node_inserted_id);
-		gtk_signal_disconnect (GTK_OBJECT (etta->priv->source),
-				       etta->priv->tree_model_node_removed_id);
-
-		gtk_object_unref (GTK_OBJECT (etta->priv->source));
-		etta->priv->source = NULL;
-
-		etta->priv->tree_model_pre_change_id = 0;
-		etta->priv->tree_model_node_changed_id = 0;
-		etta->priv->tree_model_node_data_changed_id = 0;
-		etta->priv->tree_model_node_col_changed_id = 0;
-		etta->priv->tree_model_node_inserted_id = 0;
-		etta->priv->tree_model_node_removed_id = 0;
-	}
-
-	g_free (etta->priv->map_table);
-
-	g_free (etta->priv);
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-static int
-etta_column_count (ETableModel *etm)
-{
-	ETreeTableAdapter *etta = (ETreeTableAdapter *)etm;
-
-	return e_tree_model_column_count (etta->priv->source);
-}
-
-static gboolean
-etta_has_save_id (ETableModel *etm)
-{
-	ETreeTableAdapter *etta = (ETreeTableAdapter *)etm;
-
-	return e_tree_model_has_save_id (etta->priv->source);
-}
-
-static gchar *
-etta_get_save_id (ETableModel *etm, int row)
-{
-	ETreeTableAdapter *etta = (ETreeTableAdapter *)etm;
-
-	if (etta->priv->root_visible)
-		return e_tree_model_get_save_id (etta->priv->source, etta->priv->map_table [row]);
-	else
-		return e_tree_model_get_save_id (etta->priv->source, etta->priv->map_table [row + 1]);
-}
-
-static gboolean
-etta_has_change_pending (ETableModel *etm)
-{
-	ETreeTableAdapter *etta = (ETreeTableAdapter *)etm;
-
-	return e_tree_model_has_change_pending (etta->priv->source);
-}
-
-
-static int
-etta_row_count (ETableModel *etm)
-{
-	ETreeTableAdapter *etta = (ETreeTableAdapter *)etm;
-
-	if (etta->priv->root_visible)
-		return etta->priv->n_map;
-	else {
-		if (etta->priv->n_map > 0)
-			return etta->priv->n_map - 1;
-		else
-			return 0;
-	}
-}
-
-static void *
-etta_value_at (ETableModel *etm, int col, int row)
-{
-	ETreeTableAdapter *etta = (ETreeTableAdapter *)etm;
-
-#if 0
-	etta->priv->last_access = row;
-	d(g_print("g) Setting last_access to %d\n", row));
-#endif
-
-	switch (col) {
-	case -1:
-		if (etta->priv->root_visible)
-			return etta->priv->map_table [row];
-		else
-			return etta->priv->map_table [row + 1];
-	case -2:
-		return etta->priv->source;
-	case -3:
-		return etta;
-	default:
-		if (etta->priv->root_visible)
-			return e_tree_model_value_at (etta->priv->source, etta->priv->map_table [row], col);
-		else
-			return e_tree_model_value_at (etta->priv->source, etta->priv->map_table [row + 1], col);
-	}
-}
-
-static void
-etta_set_value_at (ETableModel *etm, int col, int row, const void *val)
-{
-	ETreeTableAdapter *etta = (ETreeTableAdapter *)etm;
-
-	etta->priv->last_access = row;
-	d(g_print("h) Setting last_access to %d\n", row));
-	if (etta->priv->root_visible)
-		e_tree_model_set_value_at (etta->priv->source, etta->priv->map_table [row], col, val);
-	else
-		e_tree_model_set_value_at (etta->priv->source, etta->priv->map_table [row + 1], col, val);
-}
-
-static gboolean
-etta_is_cell_editable (ETableModel *etm, int col, int row)
-{
-	ETreeTableAdapter *etta = (ETreeTableAdapter *)etm;
-
-	if (etta->priv->root_visible)
-		return e_tree_model_node_is_editable (etta->priv->source, etta->priv->map_table [row], col);
-	else
-		return e_tree_model_node_is_editable (etta->priv->source, etta->priv->map_table [row + 1], col);
-}
-
-static void
-etta_append_row (ETableModel *etm, ETableModel *source, int row)
-{
-#if 0
-	ETreeTableAdapter *etta = (ETreeTableAdapter *)etm;
-	e_table_model_append_row (etta->priv->source, source, row);
-#endif
-}
-
-static void *
-etta_duplicate_value (ETableModel *etm, int col, const void *value)
-{
-	ETreeTableAdapter *etta = (ETreeTableAdapter *)etm;
-
-	return e_tree_model_duplicate_value (etta->priv->source, col, value);
-}
-
-static void
-etta_free_value (ETableModel *etm, int col, void *value)
-{
-	ETreeTableAdapter *etta = (ETreeTableAdapter *)etm;
-
-	e_tree_model_free_value (etta->priv->source, col, value);
-}
-
-static void *
-etta_initialize_value (ETableModel *etm, int col)
-{
-	ETreeTableAdapter *etta = (ETreeTableAdapter *)etm;
-
-	return e_tree_model_initialize_value (etta->priv->source, col);
-}
-
-static gboolean
-etta_value_is_empty (ETableModel *etm, int col, const void *value)
-{
-	ETreeTableAdapter *etta = (ETreeTableAdapter *)etm;
-
-	return e_tree_model_value_is_empty (etta->priv->source, col, value);
-}
-
-static char *
-etta_value_to_string (ETableModel *etm, int col, const void *value)
-{
-	ETreeTableAdapter *etta = (ETreeTableAdapter *)etm;
-
-	return e_tree_model_value_to_string (etta->priv->source, col, value);
-}
-
-static void
-etta_class_init (ETreeTableAdapterClass *klass)
-{
-	ETableModelClass *table_class   = (ETableModelClass *) klass;
-	GtkObjectClass *object_class    = (GtkObjectClass *) klass;
-
-	parent_class                    = gtk_type_class (PARENT_TYPE);
-	
-	object_class->destroy           = etta_destroy;
-
-	table_class->column_count       = etta_column_count;
-	table_class->has_save_id        = etta_has_save_id;
-	table_class->get_save_id        = etta_get_save_id;
-	table_class->has_change_pending = etta_has_change_pending;
-	table_class->row_count          = etta_row_count;
-	table_class->value_at           = etta_value_at;
-	table_class->set_value_at       = etta_set_value_at;
-	table_class->is_cell_editable   = etta_is_cell_editable;
-	table_class->append_row         = etta_append_row;
-	table_class->duplicate_value    = etta_duplicate_value;
-	table_class->free_value         = etta_free_value;
-	table_class->initialize_value   = etta_initialize_value;
-	table_class->value_is_empty     = etta_value_is_empty;
-	table_class->value_to_string    = etta_value_to_string;
-}
-
-static void
-etta_init (ETreeTableAdapter *etta)
-{
-	etta->priv = g_new(ETreeTableAdapterPriv, 1);
-
-	etta->priv->last_access = 0;
-	etta->priv->map_table = NULL;
-	etta->priv->n_map = 0;
-	etta->priv->n_vals_allocated = 0;
-
-	etta->priv->root_visible = TRUE;
-
-	etta->priv->attributes = NULL;
-}
-
-E_MAKE_TYPE(e_tree_table_adapter, "ETreeTableAdapter", ETreeTableAdapter, etta_class_init, etta_init, PARENT_TYPE);
-
-static void
-etta_proxy_pre_change (ETreeModel *etm, ETreeTableAdapter *etta)
-{
-	e_table_model_pre_change(E_TABLE_MODEL(etta));
-}
-
-static void
-etta_proxy_node_changed (ETreeModel *etm, ETreePath path, ETreeTableAdapter *etta)
-{
-	if (e_tree_model_node_is_root(etm, path)) {
-		int size;
-
-		size = array_size_from_path(etta, path);
-		etta_expand_to(etta, size);
-		etta->priv->n_map = size;
-		fill_array_from_path(etta, etta->priv->map_table, path);
-	} else {
-		int row = find_row_num(etta, path);
-		int size;
-		int old_size;
-
-		if (row == -1)
-			return;
-
-		size = array_size_from_path(etta, path);
-		if (e_tree_model_node_is_expandable(etta->priv->source, path)) {
-			ETreeTableAdapterNode *node = find_or_create_node(etta, path);
-			old_size = node->num_visible_children + 1;
-		} else {
-			ETreeTableAdapterNode *node = find_node(etta, path);
-			if (node)
-				old_size = node->num_visible_children + 1;
-			else
-				old_size = 1;
-		}
-
-		etta_expand_to(etta, etta->priv->n_map + size - old_size);
-
-		memmove(etta->priv->map_table + row + size,
-			etta->priv->map_table + row + old_size,
-			(etta->priv->n_map - row - old_size) * sizeof (ETreePath));
-		fill_array_from_path(etta, etta->priv->map_table + row, path);
-		etta_update_parent_child_counts(etta, path, size - old_size);
-	}
-
-	e_table_model_changed(E_TABLE_MODEL(etta));
-}
-
-static void
-etta_proxy_node_data_changed (ETreeModel *etm, ETreePath path, ETreeTableAdapter *etta)
-{
-	int row = find_row_num(etta, path);
-	if (row != -1) {
-		if (etta->priv->root_visible)
-			e_table_model_row_changed(E_TABLE_MODEL(etta), row);
-		else if (row != 0)
-			e_table_model_row_changed(E_TABLE_MODEL(etta), row - 1);
-	}
-}
-
-static void
-etta_proxy_node_col_changed (ETreeModel *etm, ETreePath path, int col, ETreeTableAdapter *etta)
-{
-	int row = find_row_num(etta, path);
-	if (row != -1) {
-		if (etta->priv->root_visible)
-			e_table_model_cell_changed(E_TABLE_MODEL(etta), col, row);
-		else if (row != 0)
-			e_table_model_cell_changed(E_TABLE_MODEL(etta), col, row - 1);
-	}
-}
-
-static void
-etta_proxy_node_inserted (ETreeModel *etm, ETreePath parent, ETreePath child, ETreeTableAdapter *etta)
-{
-	int row;
-
-	if (e_tree_model_node_is_root(etm, child)) {
-		row = 0;
-	} else {
-		ETreePath children;
-		int parent_row;
-		ETreeTableAdapterNode *parent_node;
-
-		parent_row = find_row_num(etta, parent);
-		if (parent_row == -1)
-			return;
-
-		parent_node = find_or_create_node(etta, parent);
-		if (parent_node->expandable != e_tree_model_node_is_expandable(etta->priv->source, parent)) {
-			parent_node->expandable = e_tree_model_node_is_expandable(etta->priv->source, parent);
-			if (etta->priv->root_visible)
-				e_table_model_row_changed(E_TABLE_MODEL(etta), parent_row);
-			else if (parent_row != 0)
-				e_table_model_row_changed(E_TABLE_MODEL(etta), parent_row - 1);
-		}
-		if (!parent_node->expanded)
-			return;
-
-		row = find_first_child_node(etta, parent_row);
-		children = e_tree_model_node_get_first_child(etta->priv->source, parent);
-
-		while (row != -1 &&
-		       row <= parent_row + parent_node->num_visible_children &&
-		       children != NULL &&
-		       children == etta->priv->map_table[row]) {
-			children = e_tree_model_node_get_next(etta->priv->source, children);
-			row = find_next_node(etta, row);
-		}
-	}
-
-	if (row != -1) {
-		int size;
-
-		size = array_size_from_path(etta, child);
-
-		etta_expand_to(etta, etta->priv->n_map + size);
-
-		memmove(etta->priv->map_table + row + size,
-			etta->priv->map_table + row,
-			(etta->priv->n_map - row) * sizeof (ETreePath));
-
-		fill_array_from_path(etta, etta->priv->map_table + row, child);
-		etta_update_parent_child_counts(etta, child, size);
-
-		if (etta->priv->root_visible)
-			e_table_model_rows_inserted(E_TABLE_MODEL(etta), row, size);
-		else if (row != 0)
-			e_table_model_rows_inserted(E_TABLE_MODEL(etta), row - 1, size);
-		else
-			e_table_model_rows_inserted(E_TABLE_MODEL(etta), 0, size - 1);
-	}
-}
-
-static void
-etta_proxy_node_removed (ETableModel *etm, ETreePath parent, ETreePath child, int old_position, ETreeTableAdapter *etta)
-{
-	int parent_row = find_row_num(etta, parent);
-	int row = find_child_row_num_maybe_deleted(etta, parent_row, child);
-	ETreeTableAdapterNode *parent_node = find_node(etta, parent);
-	if (parent_row != -1 && parent_node) {
-		if (parent_node->expandable != e_tree_model_node_is_expandable(etta->priv->source, parent)) {
-			parent_node->expandable = e_tree_model_node_is_expandable(etta->priv->source, parent);
-			if (etta->priv->root_visible)
-				e_table_model_row_changed(E_TABLE_MODEL(etta), parent_row);
-			else if (parent_row != 0)
-				e_table_model_row_changed(E_TABLE_MODEL(etta), parent_row - 1);
-		}
-	}
-	if (row != -1) {
-		ETreeTableAdapterNode *node = find_node(etta, child);
-		int to_remove = (node ? node->num_visible_children : 0) + 1;
-
-		memmove(etta->priv->map_table + row,
-			etta->priv->map_table + row + to_remove,
-			(etta->priv->n_map - row - to_remove) * sizeof (ETreePath));
-
-		if (parent_node)
-			parent_node->num_visible_children -= to_remove;
-		if (parent)
-			etta_update_parent_child_counts(etta, parent, - to_remove);
-
-		if (etta->priv->root_visible)
-			e_table_model_rows_deleted(E_TABLE_MODEL(etta), row, to_remove);
-		else if (row != 0)
-			e_table_model_rows_deleted(E_TABLE_MODEL(etta), row - 1, to_remove);
-		else
-			e_table_model_rows_deleted(E_TABLE_MODEL(etta), 0, to_remove - 1);
-	}
-}
-
-ETableModel *
-e_tree_table_adapter_construct (ETreeTableAdapter *etta, ETreeModel *source)
-{
-	ETreePath root;
-
-	etta->priv->source = source;
-	gtk_object_ref (GTK_OBJECT (source));
-
-	if (e_tree_model_has_save_id(source))
-		etta->priv->attributes = g_hash_table_new(g_str_hash, g_str_equal);
-	else
-		etta->priv->attributes = g_hash_table_new(NULL, NULL);
-
-	root = e_tree_model_get_root (source);
-
-	if (root) {
-		etta->priv->n_map = array_size_from_path(etta, root);
-		etta->priv->n_vals_allocated = etta->priv->n_map;
-		etta->priv->map_table = g_new(ETreePath, etta->priv->n_map);
-		fill_array_from_path(etta, etta->priv->map_table, root);
-	}
-
-	etta->priv->tree_model_pre_change_id = gtk_signal_connect (GTK_OBJECT (source), "pre_change",
-								   GTK_SIGNAL_FUNC (etta_proxy_pre_change), etta);
-	etta->priv->tree_model_node_changed_id = gtk_signal_connect (GTK_OBJECT (source), "node_changed",
-								     GTK_SIGNAL_FUNC (etta_proxy_node_changed), etta);
-	etta->priv->tree_model_node_data_changed_id = gtk_signal_connect (GTK_OBJECT (source), "node_data_changed",
-									  GTK_SIGNAL_FUNC (etta_proxy_node_data_changed), etta);
-	etta->priv->tree_model_node_col_changed_id = gtk_signal_connect (GTK_OBJECT (source), "node_col_changed",
-									 GTK_SIGNAL_FUNC (etta_proxy_node_col_changed), etta);
-	etta->priv->tree_model_node_inserted_id = gtk_signal_connect (GTK_OBJECT (source), "node_inserted",
-								      GTK_SIGNAL_FUNC (etta_proxy_node_inserted), etta);
-	etta->priv->tree_model_node_removed_id = gtk_signal_connect (GTK_OBJECT (source), "node_removed",
-								     GTK_SIGNAL_FUNC (etta_proxy_node_removed), etta);
-
-	return E_TABLE_MODEL (etta);
-}
-
-ETableModel *
-e_tree_table_adapter_new (ETreeModel *source)
-{
-	ETreeTableAdapter *etta = gtk_type_new (E_TREE_TABLE_ADAPTER_TYPE);
-
-	e_tree_table_adapter_construct (etta, source);
-
-	return (ETableModel *) etta;
-}
-
-typedef struct {
-	xmlNode *root;
-	ETreeModel *tree;
-} TreeAndRoot;
-
-static void
-save_expanded_state_func (gpointer keyp, gpointer value, gpointer data)
-{
-	gchar *key = keyp;
-	ETreeTableAdapterNode *node = value;
-	TreeAndRoot *tar = data;
-	xmlNode *root = tar->root;
-	ETreeModel *etm = tar->tree;
-	xmlNode *xmlnode;
-
-	if (node->expanded != e_tree_model_get_expanded_default(etm)) {
-		xmlnode = xmlNewChild (root, NULL, "node", NULL);
-		e_xml_set_string_prop_by_name(xmlnode, "id", key);
-	}
-}
-
-void
-e_tree_table_adapter_save_expanded_state (ETreeTableAdapter *etta, const char *filename)
-{
-	xmlDoc *doc;
-	xmlNode *root;
-	ETreeTableAdapterPriv *priv;
-	TreeAndRoot tar;
-
-	g_return_if_fail(etta != NULL);
-
-	priv = etta->priv; 
-
-	doc = xmlNewDoc ((xmlChar*) "1.0");
-	root = xmlNewDocNode (doc, NULL,
-			      (xmlChar *) "expanded_state",
-			      NULL);
-	xmlDocSetRootElement (doc, root);
-
-	e_xml_set_integer_prop_by_name(root, "vers", 1);
-
-	tar.root = root;
-	tar.tree = etta->priv->source;
-
-	g_hash_table_foreach (priv->attributes,
-			      save_expanded_state_func,
-			      &tar);
-
-	xmlSaveFile (filename, doc);
-
-	xmlFreeDoc (doc);
-}
-
-void
-e_tree_table_adapter_load_expanded_state (ETreeTableAdapter *etta, const char *filename)
-{
-	ETreeTableAdapterPriv *priv;
-	xmlDoc *doc;
-	xmlNode *root;
-	xmlNode *child;
-	int vers;
-
-	g_return_if_fail(etta != NULL);
-
-	priv = etta->priv;
-
-	doc = xmlParseFile (filename);
-	if (!doc)
-		return;
-
-	root = xmlDocGetRootElement (doc);
-	if (root == NULL || strcmp (root->name, "expanded_state")) {
-		xmlFreeDoc (doc);
-		return;
-	}
-
-	vers = e_xml_get_integer_prop_by_name_with_default(root, "vers", 0);
-	if (vers != 1) {
-		xmlFreeDoc (doc);
-		return;
-	}
-
-	for (child = root->childs; child; child = child->next) {
-		char *id;
-
-		if (strcmp (child->name, "node")) {
-			d(g_warning ("unknown node '%s' in %s", child->name, filename));
-			continue;
-		}
-
-		id = e_xml_get_string_prop_by_name_with_default (child, "id", "");
-
-		if (!strcmp(id, "")) {
-			g_free(id);
-			return;
-		}
-
-		add_expanded_node(etta, id, !e_tree_model_get_expanded_default(etta->priv->source));
-	}
-
-	xmlFreeDoc (doc);
-}
-
-void         e_tree_table_adapter_root_node_set_visible (ETreeTableAdapter *etta, gboolean visible)
-{
-	if (etta->priv->root_visible == visible)
-		return;
-
-	e_table_model_pre_change (E_TABLE_MODEL(etta));
-
-	etta->priv->root_visible = visible;
-	if (!visible) {
-		ETreePath root = e_tree_model_get_root(etta->priv->source);
-		if (root)
-			e_tree_table_adapter_node_set_expanded(etta, root, TRUE);
-	}
-	e_table_model_changed(E_TABLE_MODEL(etta));
-}
-
-void         e_tree_table_adapter_node_set_expanded (ETreeTableAdapter *etta, ETreePath path, gboolean expanded)
-{
-	ETreeTableAdapterNode *node;
-	int row;
-
-	if (e_tree_model_node_is_root (etta->priv->source, path) && !etta->priv->root_visible)
-		return;
-
-	node = find_or_create_node(etta, path);
-	row = find_row_num(etta, path);
-
-	if (expanded != node->expanded) {
-		e_table_model_pre_change (E_TABLE_MODEL(etta));
-
-		node->expanded = expanded;
-		
-		if (row != -1) {
-			if (etta->priv->root_visible)
-				e_table_model_row_changed(E_TABLE_MODEL(etta), row);
-			else if (row != 0)
-				e_table_model_row_changed(E_TABLE_MODEL(etta), row - 1);
-
-			if (expanded) {
-				int num_children = array_size_from_path(etta, path) - 1;
-				etta_expand_to(etta, etta->priv->n_map + num_children);
-				memmove(etta->priv->map_table + row + 1 + num_children,
-					etta->priv->map_table + row + 1,
-					(etta->priv->n_map - row - 1) * sizeof (ETreePath));
-				fill_array_from_path(etta, etta->priv->map_table + row, path);
-				etta_update_parent_child_counts(etta, path, num_children);
-				if (num_children != 0) {
-					if (etta->priv->root_visible)
-						e_table_model_rows_inserted(E_TABLE_MODEL(etta), row + 1, num_children);
-					else
-						e_table_model_rows_inserted(E_TABLE_MODEL(etta), row, num_children);
-				}
-			} else {
-				int num_children = node->num_visible_children;
-				memmove(etta->priv->map_table + row + 1,
-					etta->priv->map_table + row + 1 + num_children,
-					(etta->priv->n_map - row - 1 - num_children) * sizeof (ETreePath));
-				node->num_visible_children = 0;
-				etta_update_parent_child_counts(etta, path, - num_children);
-				if (num_children != 0) {
-					if (etta->priv->root_visible)
-						e_table_model_rows_deleted(E_TABLE_MODEL(etta), row + 1, num_children);
-					else
-						e_table_model_rows_deleted(E_TABLE_MODEL(etta), row, num_children);
-				}
-			}
-		}
-	}
-}
-
-void         e_tree_table_adapter_node_set_expanded_recurse (ETreeTableAdapter *etta, ETreePath path, gboolean expanded)
-{
-	ETreePath children;
-
-	e_tree_table_adapter_node_set_expanded(etta, path, expanded);
-
-	for (children = e_tree_model_node_get_first_child(etta->priv->source, path); 
-	     children; 
-	     children = e_tree_model_node_get_next(etta->priv->source, children)) {
-		e_tree_table_adapter_node_set_expanded_recurse(etta, children, expanded);
-	}
-}
-
-ETreePath    e_tree_table_adapter_node_at_row (ETreeTableAdapter *etta, int row)
-{
-	if (row < 0)
-		return NULL;
-	if (row >= etta->priv->n_map)
-		return NULL;
-	if (etta->priv->root_visible)
-		return etta->priv->map_table[row];
-	else
-		return etta->priv->map_table[row + 1];
-}
-
-int    e_tree_table_adapter_row_of_node (ETreeTableAdapter *etta, ETreePath path)
-{
-	if (etta->priv->root_visible)
-		return find_row_num(etta, path);
-	else {
-		int row_num = find_row_num (etta, path);
-		if (row_num != -1)
-			return row_num - 1;
-		else
-			return row_num;
-	}
-}
-
-gboolean     e_tree_table_adapter_root_node_is_visible(ETreeTableAdapter *etta)
-{
-	return etta->priv->root_visible;
-}
-
-void         e_tree_table_adapter_show_node (ETreeTableAdapter *etta, ETreePath path)
-{
-	ETreePath parent;
-
-	parent = e_tree_model_node_get_parent(etta->priv->source, path);
-
-	if (parent) {
-		e_tree_table_adapter_node_set_expanded(etta, parent, TRUE);
-		e_tree_table_adapter_show_node(etta, parent);
-	}
-}
-
-gboolean     e_tree_table_adapter_node_is_expanded (ETreeTableAdapter *etta, ETreePath path)
-{
-	if (e_tree_model_node_is_expandable(etta->priv->source, path)) {
-		ETreeTableAdapterNode *node = find_or_create_node(etta, path);
-		return node->expanded;
-	} else
-		return FALSE;
-}
diff --git a/widgets/table/e-tree-table-adapter.h b/widgets/table/e-tree-table-adapter.h
deleted file mode 100644
index 34e38c1fb7..0000000000
--- a/widgets/table/e-tree-table-adapter.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TREE_TABLE_ADAPTER_H_
-#define _E_TREE_TABLE_ADAPTER_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/e-table/e-table-model.h>
-#include <gal/e-table/e-tree-model.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define E_TREE_TABLE_ADAPTER_TYPE        (e_tree_table_adapter_get_type ())
-#define E_TREE_TABLE_ADAPTER(o)          (GTK_CHECK_CAST ((o), E_TREE_TABLE_ADAPTER_TYPE, ETreeTableAdapter))
-#define E_TREE_TABLE_ADAPTER_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TREE_TABLE_ADAPTER_TYPE, ETreeTableAdapterClass))
-#define E_IS_TREE_TABLE_ADAPTER(o)       (GTK_CHECK_TYPE ((o), E_TREE_TABLE_ADAPTER_TYPE))
-#define E_IS_TREE_TABLE_ADAPTER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TREE_TABLE_ADAPTER_TYPE))
-
-typedef struct ETreeTableAdapterPriv ETreeTableAdapterPriv;
-
-typedef struct {
-	ETableModel  base;
-
-	ETreeTableAdapterPriv *priv;
-} ETreeTableAdapter;
-
-typedef struct {
-	ETableModelClass parent_class;
-} ETreeTableAdapterClass;
-
-GtkType      e_tree_table_adapter_get_type                   (void);
-ETableModel *e_tree_table_adapter_new                        (ETreeModel        *source);
-ETableModel *e_tree_table_adapter_construct                  (ETreeTableAdapter *ets,
-							      ETreeModel        *source);
-
-gboolean     e_tree_table_adapter_node_is_expanded           (ETreeTableAdapter *etta,
-							      ETreePath          path);
-void         e_tree_table_adapter_node_set_expanded          (ETreeTableAdapter *etta,
-							      ETreePath          path,
-							      gboolean           expanded);
-void         e_tree_table_adapter_node_set_expanded_recurse  (ETreeTableAdapter *etta,
-							      ETreePath          path,
-							      gboolean           expanded);
-void         e_tree_table_adapter_root_node_set_visible      (ETreeTableAdapter *etta,
-							      gboolean           visible);
-ETreePath    e_tree_table_adapter_node_at_row                (ETreeTableAdapter *etta,
-							      int                row);
-int          e_tree_table_adapter_row_of_node                (ETreeTableAdapter *etta,
-							      ETreePath          path);
-gboolean     e_tree_table_adapter_root_node_is_visible       (ETreeTableAdapter *etta);
-
-void         e_tree_table_adapter_show_node                  (ETreeTableAdapter *etta,
-							      ETreePath          path);
-
-void         e_tree_table_adapter_save_expanded_state        (ETreeTableAdapter *etta,
-							      const char        *filename);
-void         e_tree_table_adapter_load_expanded_state        (ETreeTableAdapter *etta,
-							      const char        *filename);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TREE_TABLE_ADAPTER_H_ */
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
deleted file mode 100644
index 23b5cc4e04..0000000000
--- a/widgets/table/e-tree.c
+++ /dev/null
@@ -1,2347 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-tree.c: A graphical view of a tree.
- *
- * Author:
- *   Miguel de Icaza (miguel@ximian.com)
- *   Chris Lahey <clahey@ximian.com>
- *
- * Copyright 1999, 2000, 2001, Ximian, Inc
- */
-#include <config.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdio.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtksignal.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-
-#include "gal/util/e-i18n.h"
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-canvas.h>
-
-#include <gal/e-table/e-table-column-specification.h>
-#include <gal/e-table/e-table-header-item.h>
-#include <gal/e-table/e-table-header.h>
-#include <gal/e-table/e-table-item.h>
-#include <gal/e-table/e-table-sort-info.h>
-#include <gal/e-table/e-table-utils.h>
-
-#ifdef E_TREE_USE_TREE_SELECTION
-#include <gal/e-table/e-tree-selection-model.h>
-#else
-#include <gal/e-table/e-table-selection-model.h>
-#endif
-
-#include <gal/e-table/e-tree-sorted.h>
-#include <gal/e-table/e-tree-table-adapter.h>
-
-#include "e-tree.h"
-
-#define COLUMN_HEADER_HEIGHT 16
-
-#define PARENT_TYPE gtk_table_get_type ()
-
-static GtkObjectClass *parent_class;
-
-enum {
-	CURSOR_CHANGE,
-	CURSOR_ACTIVATED,
-	SELECTION_CHANGE,
-	DOUBLE_CLICK,
-	RIGHT_CLICK,
-	CLICK,
-	KEY_PRESS,
-
-	TREE_DRAG_BEGIN,
-	TREE_DRAG_END,
-	TREE_DRAG_DATA_GET,
-	TREE_DRAG_DATA_DELETE,
-
-	TREE_DRAG_LEAVE,
-	TREE_DRAG_MOTION,
-	TREE_DRAG_DROP,
-	TREE_DRAG_DATA_RECEIVED,
-
-	LAST_SIGNAL
-};
-
-enum {
-	ARG_0,
-	ARG_LENGTH_THRESHOLD,
-	ARG_HORIZONTAL_DRAW_GRID,
-	ARG_VERTICAL_DRAW_GRID,
-	ARG_DRAW_FOCUS,
-	ARG_ETTA
-};
-
-struct ETreePriv {
-	ETreeModel *model;
-	ETreeSorted *sorted;
-	ETreeTableAdapter *etta;
-
-	ETableHeader *full_header, *header;
-
-	ETableSortInfo *sort_info;
-	ESorter   *sorter;
-
-	ESelectionModel *selection;
-	ETableSpecification *spec;
-
-	int reflow_idle_id;
-
-	int table_model_change_id;
-	int table_row_change_id;
-	int table_cell_change_id;
-	int table_rows_inserted_id;
-	int table_rows_deleted_id;
-
-	GnomeCanvas *header_canvas, *table_canvas;
-
-	GnomeCanvasItem *header_item, *root;
-
-	GnomeCanvasItem *white_item;
-	GnomeCanvasItem *item;
-
-	gint length_threshold;
-
-	/*
-	 * Configuration settings
-	 */
-	guint alternating_row_colors : 1;
-	guint horizontal_draw_grid : 1;
-	guint vertical_draw_grid : 1;
-	guint draw_focus : 1;
-	guint row_selection_active : 1;
-
-	guint horizontal_scrolling : 1;
-
-	ECursorMode cursor_mode;
-
-	int drop_row;
-	ETreePath drop_path;
-	int drop_col;
-
-	int drag_row;
-	ETreePath drag_path;
-	int drag_col;
-	ETreeDragSourceSite *site;
-	
-	int drag_source_button_press_event_id;
-	int drag_source_motion_notify_event_id;
-};
-
-static gint et_signals [LAST_SIGNAL] = { 0, };
-
-static void et_grab_focus (GtkWidget *widget);
-
-static void et_drag_begin (GtkWidget *widget,
-			   GdkDragContext *context,
-			   ETree *et);
-static void et_drag_end (GtkWidget *widget,
-			 GdkDragContext *context,
-			 ETree *et);
-static void et_drag_data_get(GtkWidget *widget,
-			     GdkDragContext *context,
-			     GtkSelectionData *selection_data,
-			     guint info,
-			     guint time,
-			     ETree *et);
-static void et_drag_data_delete(GtkWidget *widget,
-				GdkDragContext *context,
-				ETree *et);
-
-static void et_drag_leave(GtkWidget *widget,
-			  GdkDragContext *context,
-			  guint time,
-			  ETree *et);
-static gboolean et_drag_motion(GtkWidget *widget,
-			       GdkDragContext *context,
-			       gint x,
-			       gint y,
-			       guint time,
-			       ETree *et);
-static gboolean et_drag_drop(GtkWidget *widget,
-			     GdkDragContext *context,
-			     gint x,
-			     gint y,
-			     guint time,
-			     ETree *et);
-static void et_drag_data_received(GtkWidget *widget,
-				  GdkDragContext *context,
-				  gint x,
-				  gint y,
-				  GtkSelectionData *selection_data,
-				  guint info,
-				  guint time,
-				  ETree *et);
-static gint e_tree_drag_source_event_cb (GtkWidget      *widget,
-					 GdkEvent       *event,
-					 ETree         *tree);
-
-static gint et_focus (GtkContainer *container, GtkDirectionType direction);
-
-static void
-et_disconnect_from_etta (ETree *et)
-{
-	if (et->priv->table_model_change_id != 0)
-		gtk_signal_disconnect (GTK_OBJECT (et->priv->etta),
-				       et->priv->table_model_change_id);
-	if (et->priv->table_row_change_id != 0)
-		gtk_signal_disconnect (GTK_OBJECT (et->priv->etta),
-				       et->priv->table_row_change_id);
-	if (et->priv->table_cell_change_id != 0)
-		gtk_signal_disconnect (GTK_OBJECT (et->priv->etta),
-				       et->priv->table_cell_change_id);
-	if (et->priv->table_rows_inserted_id != 0)
-		gtk_signal_disconnect (GTK_OBJECT (et->priv->etta),
-				       et->priv->table_rows_inserted_id);
-	if (et->priv->table_rows_deleted_id != 0)
-		gtk_signal_disconnect (GTK_OBJECT (et->priv->etta),
-				       et->priv->table_rows_deleted_id);
-
-	et->priv->table_model_change_id = 0;
-	et->priv->table_row_change_id = 0;
-	et->priv->table_cell_change_id = 0;
-	et->priv->table_rows_inserted_id = 0;
-	et->priv->table_rows_deleted_id = 0;
-}
-
-static void
-et_destroy (GtkObject *object)
-{
-	ETree *et = E_TREE (object);
-
-	if (et->priv->reflow_idle_id)
-		g_source_remove(et->priv->reflow_idle_id);
-	et->priv->reflow_idle_id = 0;
-
-	et_disconnect_from_etta (et);
-
-	gtk_object_unref (GTK_OBJECT (et->priv->etta));
-	gtk_object_unref (GTK_OBJECT (et->priv->model));
-	gtk_object_unref (GTK_OBJECT (et->priv->sorted));
-	gtk_object_unref (GTK_OBJECT (et->priv->full_header));
-	gtk_object_unref (GTK_OBJECT (et->priv->header));
-	gtk_object_unref (GTK_OBJECT (et->priv->sort_info));
-	gtk_object_unref (GTK_OBJECT (et->priv->selection));
-	if (et->priv->spec)
-		gtk_object_unref (GTK_OBJECT (et->priv->spec));
-
-	if (et->priv->sorter)
-		gtk_object_unref (GTK_OBJECT (et->priv->sorter));
-
-	if (et->priv->header_canvas)
-		gtk_widget_destroy (GTK_WIDGET (et->priv->header_canvas));
-
-	if (et->priv->site)
-		e_tree_drag_source_unset (et);
-
-	gtk_widget_destroy (GTK_WIDGET (et->priv->table_canvas));
-
-	g_free(et->priv);
-	et->priv = NULL;
-
-	(*parent_class->destroy)(object);
-}
-
-static void
-e_tree_init (GtkObject *object)
-{
-	ETree *e_tree = E_TREE (object);
-	GtkTable *gtk_table = GTK_TABLE (object);
-
-	GTK_WIDGET_SET_FLAGS (e_tree, GTK_CAN_FOCUS);
-
-	gtk_table->homogeneous                           = FALSE;
-
-	e_tree->priv                                     = g_new(ETreePriv, 1);
-
-	e_tree->priv->model                              = NULL;
-	e_tree->priv->sorted                             = NULL;
-	e_tree->priv->etta                               = NULL;
-
-	e_tree->priv->full_header                        = NULL;
-	e_tree->priv->header                             = NULL;
-
-	e_tree->priv->sort_info                          = NULL;
-	e_tree->priv->sorter                             = NULL;
-	e_tree->priv->reflow_idle_id                     = 0;
-
-	e_tree->priv->alternating_row_colors		 = 1;
-	e_tree->priv->horizontal_draw_grid               = 1;
-	e_tree->priv->vertical_draw_grid                 = 1;
-	e_tree->priv->draw_focus                         = 1;
-	e_tree->priv->cursor_mode                        = E_CURSOR_SIMPLE;
-	e_tree->priv->length_threshold                   = 200;
-
-	e_tree->priv->row_selection_active               = FALSE;
-	e_tree->priv->horizontal_scrolling               = FALSE;
-
-	e_tree->priv->drop_row                           = -1;
-	e_tree->priv->drop_path                          = NULL;
-	e_tree->priv->drop_col                           = -1;
-
-	e_tree->priv->drag_row                           = -1;
-	e_tree->priv->drag_path                          = NULL;
-	e_tree->priv->drag_col                           = -1;
-
-	e_tree->priv->site                               = NULL;
-	e_tree->priv->drag_source_button_press_event_id  = 0;
-	e_tree->priv->drag_source_motion_notify_event_id = 0;
-
-#ifdef E_TREE_USE_TREE_SELECTION
-	e_tree->priv->selection                          = E_SELECTION_MODEL(e_tree_selection_model_new());
-#else
-	e_tree->priv->selection                          = E_SELECTION_MODEL(e_table_selection_model_new());
-#endif
-	e_tree->priv->spec                               = NULL;
-
-	e_tree->priv->header_canvas                      = NULL;
-	e_tree->priv->table_canvas                       = NULL;
-
-	e_tree->priv->header_item                        = NULL;
-	e_tree->priv->root                               = NULL;
-
-	e_tree->priv->white_item                         = NULL;
-	e_tree->priv->item                               = NULL;
-}
-
-/* Grab_focus handler for the ETree */
-static void
-et_grab_focus (GtkWidget *widget)
-{
-	ETree *e_tree;
-
-	e_tree = E_TREE (widget);
-
-	gtk_widget_grab_focus (GTK_WIDGET (e_tree->priv->table_canvas));
-}
-
-/* Focus handler for the ETree */
-static gint
-et_focus (GtkContainer *container, GtkDirectionType direction)
-{
-	ETree *e_tree;
-
-	e_tree = E_TREE (container);
-
-	if (container->focus_child) {
-		gtk_container_set_focus_child (container, NULL);
-		return FALSE;
-	}
-
-	return gtk_container_focus (GTK_CONTAINER (e_tree->priv->table_canvas), direction);
-}
-
-static void
-set_header_canvas_width (ETree *e_tree)
-{
-	double oldwidth, oldheight, width;
-
-	if (!(e_tree->priv->header_item && e_tree->priv->header_canvas && e_tree->priv->table_canvas))
-		return;
-
-	gnome_canvas_get_scroll_region (GNOME_CANVAS (e_tree->priv->table_canvas),
-					NULL, NULL, &width, NULL);
-	gnome_canvas_get_scroll_region (GNOME_CANVAS (e_tree->priv->header_canvas),
-					NULL, NULL, &oldwidth, &oldheight);
-
-	if (oldwidth != width ||
-	    oldheight != E_TABLE_HEADER_ITEM (e_tree->priv->header_item)->height - 1)
-		gnome_canvas_set_scroll_region (
-						GNOME_CANVAS (e_tree->priv->header_canvas),
-						0, 0, width, /*  COLUMN_HEADER_HEIGHT - 1 */
-						E_TABLE_HEADER_ITEM (e_tree->priv->header_item)->height - 1);
-
-}
-
-static void
-header_canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc, ETree *e_tree)
-{
-	set_header_canvas_width (e_tree);
-
-	/* When the header item is created ->height == 0,
-	   as the font is only created when everything is realized.
-	   So we set the usize here as well, so that the size of the
-	   header is correct */
-	if (GTK_WIDGET (e_tree->priv->header_canvas)->allocation.height !=
-	    E_TABLE_HEADER_ITEM (e_tree->priv->header_item)->height)
-		gtk_widget_set_usize (GTK_WIDGET (e_tree->priv->header_canvas), -1,
-				      E_TABLE_HEADER_ITEM (e_tree->priv->header_item)->height);
-}
-
-static void
-e_tree_setup_header (ETree *e_tree)
-{
-	char *pointer;
-	e_tree->priv->header_canvas = GNOME_CANVAS (e_canvas_new ());
-	GTK_WIDGET_UNSET_FLAGS (e_tree->priv->header_canvas, GTK_CAN_FOCUS);
-
-	gtk_widget_show (GTK_WIDGET (e_tree->priv->header_canvas));
-
-	pointer = g_strdup_printf("%p", e_tree);
-
-	e_tree->priv->header_item = gnome_canvas_item_new (
-		gnome_canvas_root (e_tree->priv->header_canvas),
-		e_table_header_item_get_type (),
-		"ETableHeader", e_tree->priv->header,
-		"full_header", e_tree->priv->full_header,
-		"sort_info", e_tree->priv->sort_info,
-		"dnd_code", pointer,
-		/*		"table", e_tree, FIXME*/
-		NULL);
-
-	g_free(pointer);
-
-	gtk_signal_connect (
-		GTK_OBJECT (e_tree->priv->header_canvas), "size_allocate",
-		GTK_SIGNAL_FUNC (header_canvas_size_allocate), e_tree);
-
-	gtk_widget_set_usize (GTK_WIDGET (e_tree->priv->header_canvas), -1,
-			      E_TABLE_HEADER_ITEM (e_tree->priv->header_item)->height);
-}
-
-static gboolean
-tree_canvas_reflow_idle (ETree *e_tree)
-{
-	gdouble height, width;
-	gdouble item_height;
-	gdouble oldheight, oldwidth;
-	GtkAllocation *alloc = &(GTK_WIDGET (e_tree->priv->table_canvas)->allocation);
-
-	gtk_object_get (GTK_OBJECT (e_tree->priv->item),
-			"height", &height,
-			"width", &width,
-			NULL);
-	item_height = height;
-	height = MAX ((int)height, alloc->height);
-	width = MAX((int)width, alloc->width);
-	/* I have no idea why this needs to be -1, but it works. */
-	gnome_canvas_get_scroll_region (GNOME_CANVAS (e_tree->priv->table_canvas),
-					NULL, NULL, &oldwidth, &oldheight);
-
-	if (oldwidth != width - 1 ||
-	    oldheight != height - 1) {
-		gnome_canvas_set_scroll_region (GNOME_CANVAS (e_tree->priv->table_canvas),
-						0, 0, width - 1, height - 1);
-		set_header_canvas_width (e_tree);
-	}
-	gtk_object_set (GTK_OBJECT (e_tree->priv->white_item),
-			"y1", item_height,
-			"x2", width,
-			"y2", height,
-			NULL);
-	e_tree->priv->reflow_idle_id = 0;
-	return FALSE;
-}
-
-static void
-tree_canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc,
-			    ETree *e_tree)
-{
-	gdouble width;
-	gdouble height;
-	gdouble item_height;
-
-	width = alloc->width;
-	gtk_object_get (GTK_OBJECT (e_tree->priv->item),
-			"height", &height,
-			NULL);
-	item_height = height;
-	height = MAX ((int)height, alloc->height);
-
-	gtk_object_set (GTK_OBJECT (e_tree->priv->item),
-			"width", width,
-			NULL);
-	gtk_object_set (GTK_OBJECT (e_tree->priv->header),
-			"width", width,
-			NULL);
-	if (e_tree->priv->reflow_idle_id)
-		g_source_remove(e_tree->priv->reflow_idle_id);
-	tree_canvas_reflow_idle(e_tree);
-}
-
-static void
-tree_canvas_reflow (GnomeCanvas *canvas, ETree *e_tree)
-{
-	if (!e_tree->priv->reflow_idle_id)
-		e_tree->priv->reflow_idle_id = g_idle_add_full (400, (GSourceFunc) tree_canvas_reflow_idle, e_tree, NULL);
-}
-
-static void
-item_cursor_change (ETableItem *eti, int row, ETree *et)
-{
-	ETreePath path = e_tree_table_adapter_node_at_row(et->priv->etta, row);
-	path = e_tree_sorted_view_to_model_path(et->priv->sorted, path);
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [CURSOR_CHANGE],
-			 row, path);
-}
-
-static void
-item_cursor_activated (ETableItem *eti, int row, ETree *et)
-{
-	ETreePath path = e_tree_table_adapter_node_at_row(et->priv->etta, row);
-	path = e_tree_sorted_view_to_model_path(et->priv->sorted, path);
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [CURSOR_ACTIVATED],
-			 row, path);
-}
-
-static void
-item_double_click (ETableItem *eti, int row, int col, GdkEvent *event, ETree *et)
-{
-	ETreePath path = e_tree_table_adapter_node_at_row(et->priv->etta, row);
-	path = e_tree_sorted_view_to_model_path(et->priv->sorted, path);
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [DOUBLE_CLICK],
-			 row, path, col, event);
-}
-
-static gint
-item_right_click (ETableItem *eti, int row, int col, GdkEvent *event, ETree *et)
-{
-	int return_val = 0;
-	ETreePath path = e_tree_table_adapter_node_at_row(et->priv->etta, row);
-	path = e_tree_sorted_view_to_model_path(et->priv->sorted, path);
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [RIGHT_CLICK],
-			 row, path, col, event, &return_val);
-	return return_val;
-}
-
-static gint
-item_click (ETableItem *eti, int row, int col, GdkEvent *event, ETree *et)
-{
-	int return_val = 0;
-	ETreePath path = e_tree_table_adapter_node_at_row(et->priv->etta, row);
-	path = e_tree_sorted_view_to_model_path(et->priv->sorted, path);
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [CLICK],
-			 row, path, col, event, &return_val);
-	return return_val;
-}
-
-static gint
-item_key_press (ETableItem *eti, int row, int col, GdkEvent *event, ETree *et)
-{
-	int return_val = 0;
-	GdkEventKey *key = (GdkEventKey *) event;
-	ETreePath path;
-	int y, row_local, col_local;
-	GtkAdjustment *vadj;
-
-	switch (key->keyval) {
-	case GDK_Page_Down:
-		vadj = gtk_layout_get_vadjustment (GTK_LAYOUT (et->priv->table_canvas));
-		y = CLAMP(vadj->value + (2 * vadj->page_size - 50), 0, vadj->upper);
-		y -= vadj->value;
-		e_tree_get_cell_at (et, 30, y, &row_local, &col_local);
-		row_local = e_tree_view_to_model_row (et, row_local);
-		col_local = e_selection_model_cursor_col (E_SELECTION_MODEL (et->priv->selection));
-		e_selection_model_select_as_key_press (E_SELECTION_MODEL (et->priv->selection), row_local, col_local, key->state);
-		return_val = 1;
-		break;
-	case GDK_Page_Up:
-		vadj = gtk_layout_get_vadjustment (GTK_LAYOUT (et->priv->table_canvas));
-		y = CLAMP(vadj->value - (vadj->page_size - 50), 0, vadj->upper);
-		y -= vadj->value;
-		e_tree_get_cell_at (et, 30, y, &row_local, &col_local);
-		row_local = e_tree_view_to_model_row (et, row_local);
-		col_local = e_selection_model_cursor_col (E_SELECTION_MODEL (et->priv->selection));
-		e_selection_model_select_as_key_press (E_SELECTION_MODEL (et->priv->selection), row_local, col_local, key->state);
-		return_val = 1;
-		break;
-	case '=':
-	case GDK_Right:
-		if (row != -1) {
-			path = e_tree_table_adapter_node_at_row(et->priv->etta, row);
-			if (path)
-				e_tree_table_adapter_node_set_expanded (et->priv->etta, path, TRUE);
-		}
-		return_val = 1;
-		break;
-	case '-':
-	case GDK_Left:
-		if (row != -1) {
-			path = e_tree_table_adapter_node_at_row(et->priv->etta, row);
-			if (path)
-				e_tree_table_adapter_node_set_expanded (et->priv->etta, path, FALSE);
-		}
-		return_val = 1;
-		break;
-	default:
-		path = e_tree_table_adapter_node_at_row(et->priv->etta, row);
-		path = e_tree_sorted_view_to_model_path(et->priv->sorted, path);
-		gtk_signal_emit (GTK_OBJECT (et),
-				 et_signals [KEY_PRESS],
-				 row, path, col, event, &return_val);
-		break;
-	}
-	return return_val;
-}
-
-static void
-et_selection_model_selection_change (ETableSelectionModel *etsm, ETable *et)
-{
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [SELECTION_CHANGE]);
-}
-
-static void
-et_build_item (ETree *et)
-{
-	et->priv->item = gnome_canvas_item_new(GNOME_CANVAS_GROUP (gnome_canvas_root(et->priv->table_canvas)),
-					 e_table_item_get_type(),
-					 "ETableHeader", et->priv->header,
-					 "ETableModel", et->priv->etta,
-					 "selection_model", et->priv->selection,
-					 "alternating_row_colors", et->priv->alternating_row_colors,
-					 "horizontal_draw_grid", et->priv->horizontal_draw_grid,
-					 "vertical_draw_grid", et->priv->vertical_draw_grid,
-					 "drawfocus", et->priv->draw_focus,
-					 "cursor_mode", et->priv->cursor_mode,
-					 "length_threshold", et->priv->length_threshold,
-					 NULL);
-
-	gtk_signal_connect (GTK_OBJECT (et->priv->item), "cursor_change",
-			    GTK_SIGNAL_FUNC (item_cursor_change), et);
-	gtk_signal_connect (GTK_OBJECT (et->priv->item), "cursor_activated",
-			    GTK_SIGNAL_FUNC (item_cursor_activated), et);
-	gtk_signal_connect (GTK_OBJECT (et->priv->item), "double_click",
-			    GTK_SIGNAL_FUNC (item_double_click), et);
-	gtk_signal_connect (GTK_OBJECT (et->priv->item), "right_click",
-			    GTK_SIGNAL_FUNC (item_right_click), et);
-	gtk_signal_connect (GTK_OBJECT (et->priv->item), "click",
-			    GTK_SIGNAL_FUNC (item_click), et);
-	gtk_signal_connect (GTK_OBJECT (et->priv->item), "key_press",
-			    GTK_SIGNAL_FUNC (item_key_press), et);
-}
-
-static void
-et_canvas_realize (GtkWidget *canvas, ETree *e_tree)
-{
-	gnome_canvas_item_set(
-		e_tree->priv->white_item,
-		"fill_color_gdk", &GTK_WIDGET(e_tree->priv->table_canvas)->style->base[GTK_STATE_NORMAL],
-		NULL);
-}
-
-static void
-et_canvas_button_press (GtkWidget *canvas, GdkEvent *event, ETree *e_tree)
-{
-	if (GTK_WIDGET_HAS_FOCUS(canvas)) {
-		GnomeCanvasItem *item = GNOME_CANVAS(canvas)->focused_item;
-
-		if (E_IS_TABLE_ITEM(item)) {
-			e_table_item_leave_edit(E_TABLE_ITEM(item));
-		}
-	}
-}
-
-static void
-e_tree_setup_table (ETree *e_tree)
-{
-	e_tree->priv->table_canvas = GNOME_CANVAS (e_canvas_new ());
-	gtk_signal_connect (
-		GTK_OBJECT (e_tree->priv->table_canvas), "size_allocate",
-		GTK_SIGNAL_FUNC (tree_canvas_size_allocate), e_tree);
-	gtk_signal_connect (
-		GTK_OBJECT (e_tree->priv->table_canvas), "focus_in_event",
-		GTK_SIGNAL_FUNC (gtk_widget_queue_draw), e_tree);
-	gtk_signal_connect (
-		GTK_OBJECT (e_tree->priv->table_canvas), "focus_out_event",
-		GTK_SIGNAL_FUNC (gtk_widget_queue_draw), e_tree);
-
-	gtk_signal_connect (
-		GTK_OBJECT (e_tree), "drag_begin",
-		GTK_SIGNAL_FUNC (et_drag_begin), e_tree);
-	gtk_signal_connect (
-		GTK_OBJECT (e_tree), "drag_end",
-		GTK_SIGNAL_FUNC (et_drag_end), e_tree);
-	gtk_signal_connect (
-		GTK_OBJECT (e_tree), "drag_data_get",
-		GTK_SIGNAL_FUNC (et_drag_data_get), e_tree);
-	gtk_signal_connect (
-		GTK_OBJECT (e_tree), "drag_data_delete",
-		GTK_SIGNAL_FUNC (et_drag_data_delete), e_tree);
-	gtk_signal_connect (
-		GTK_OBJECT (e_tree), "drag_motion",
-		GTK_SIGNAL_FUNC (et_drag_motion), e_tree);
-	gtk_signal_connect (
-		GTK_OBJECT (e_tree), "drag_leave",
-		GTK_SIGNAL_FUNC (et_drag_leave), e_tree);
-	gtk_signal_connect (
-		GTK_OBJECT (e_tree), "drag_drop",
-		GTK_SIGNAL_FUNC (et_drag_drop), e_tree);
-	gtk_signal_connect (
-		GTK_OBJECT (e_tree), "drag_data_received",
-		GTK_SIGNAL_FUNC (et_drag_data_received), e_tree);
-
-	gtk_signal_connect (GTK_OBJECT(e_tree->priv->table_canvas), "reflow",
-			    GTK_SIGNAL_FUNC (tree_canvas_reflow), e_tree);
-
-	gtk_widget_show (GTK_WIDGET (e_tree->priv->table_canvas));
-
-	e_tree->priv->white_item = gnome_canvas_item_new(
-		gnome_canvas_root(e_tree->priv->table_canvas),
-		gnome_canvas_rect_get_type(),
-		"x1", (double) 0,
-		"y1", (double) 0,
-		"x2", (double) 100,
-		"y2", (double) 100,
-		"fill_color_gdk", &GTK_WIDGET(e_tree->priv->table_canvas)->style->base[GTK_STATE_NORMAL],
-		NULL);
-
-	gtk_signal_connect (
-		GTK_OBJECT(e_tree->priv->table_canvas), "realize",
-		GTK_SIGNAL_FUNC(et_canvas_realize), e_tree);
-	gtk_signal_connect (
-		GTK_OBJECT(e_tree->priv->table_canvas), "button_press_event",
-		GTK_SIGNAL_FUNC(et_canvas_button_press), e_tree);
-
-	et_build_item(e_tree);
-}
-
-void
-e_tree_set_state_object(ETree *e_tree, ETableState *state)
-{
-	if (e_tree->priv->header)
-		gtk_object_unref(GTK_OBJECT(e_tree->priv->header));
-	e_tree->priv->header = e_table_state_to_header (GTK_WIDGET(e_tree), e_tree->priv->full_header, state);
-
-	gtk_object_set (GTK_OBJECT (e_tree->priv->header),
-			"width", (double) (GTK_WIDGET(e_tree->priv->table_canvas)->allocation.width),
-			NULL);
-
-	if (e_tree->priv->sort_info)
-		gtk_object_unref(GTK_OBJECT(e_tree->priv->sort_info));
-
-	if (state->sort_info)
-		e_tree->priv->sort_info = e_table_sort_info_duplicate(state->sort_info);
-	else
-		e_tree->priv->sort_info = NULL;
-
-	if (e_tree->priv->header_item)
-		gtk_object_set(GTK_OBJECT(e_tree->priv->header_item),
-			       "ETableHeader", e_tree->priv->header,
-			       "sort_info", e_tree->priv->sort_info,
-			       NULL);
-
-	if (e_tree->priv->item)
-		gtk_object_set(GTK_OBJECT(e_tree->priv->item),
-			       "ETableHeader", e_tree->priv->header,
-			       NULL);
-
-	if (e_tree->priv->sorted)
-		gtk_object_set(GTK_OBJECT(e_tree->priv->sorted),
-			       "sort_info", e_tree->priv->sort_info,
-			       NULL);
-}
-
-/**
- * e_tree_set_state:
- * @e_tree: %ETree object that will be modified
- * @state_str: a string with the XML representation of the ETableState.
- *
- * This routine sets the state (as described by %ETableState) of the
- * %ETree object.
- */
-void
-e_tree_set_state (ETree      *e_tree,
-		   const gchar *state_str)
-{
-	ETableState *state;
-
-	g_return_if_fail(e_tree != NULL);
-	g_return_if_fail(E_IS_TREE(e_tree));
-	g_return_if_fail(state_str != NULL);
-
-	state = e_table_state_new();
-	e_table_state_load_from_string(state, state_str);
-
-	if (state->col_count > 0)
-		e_tree_set_state_object(e_tree, state);
-
-	gtk_object_unref(GTK_OBJECT(state));
-}
-
-/**
- * e_tree_load_state:
- * @e_tree: %ETree object that will be modified
- * @filename: name of the file containing the state to be loaded into the %ETree
- *
- * An %ETableState will be loaded form the file pointed by @filename into the
- * @e_tree object.
- */
-void
-e_tree_load_state (ETree      *e_tree,
-		    const gchar *filename)
-{
-	ETableState *state;
-
-	g_return_if_fail(e_tree != NULL);
-	g_return_if_fail(E_IS_TREE(e_tree));
-	g_return_if_fail(filename != NULL);
-
-	state = e_table_state_new();
-	e_table_state_load_from_file(state, filename);
-
-	if (state->col_count > 0)
-		e_tree_set_state_object(e_tree, state);
-
-	gtk_object_unref(GTK_OBJECT(state));
-}
-
-/**
- * e_tree_get_state_object:
- * @e_tree: %ETree object that will be modified
- *
- * Returns: the %ETreeState object that encapsulates the current
- * state of the @e_tree object
- */
-ETableState *
-e_tree_get_state_object (ETree *e_tree)
-{
-	ETableState *state;
-	int full_col_count;
-	int i, j;
-
-	state = e_table_state_new();
-	state->sort_info = e_tree->priv->sort_info;
-	gtk_object_ref(GTK_OBJECT(state->sort_info));
-
-	state->col_count = e_table_header_count (e_tree->priv->header);
-	full_col_count = e_table_header_count (e_tree->priv->full_header);
-	state->columns = g_new(int, state->col_count);
-	state->expansions = g_new(double, state->col_count);
-	for (i = 0; i < state->col_count; i++) {
-		ETableCol *col = e_table_header_get_column(e_tree->priv->header, i);
-		state->columns[i] = -1;
-		for (j = 0; j < full_col_count; j++) {
-			if (col->col_idx == e_table_header_index(e_tree->priv->full_header, j)) {
-				state->columns[i] = j;
-				break;
-			}
-		}
-		state->expansions[i] = col->expansion;
-	}
-
-	return state;
-}
-
-gchar          *e_tree_get_state                 (ETree               *e_tree)
-{
-	ETableState *state;
-	gchar *string;
-
-	state = e_tree_get_state_object(e_tree);
-	string = e_table_state_save_to_string(state);
-	gtk_object_unref(GTK_OBJECT(state));
-	return string;
-}
-
-/**
- * e_tree_save_state:
- * @e_tree: %ETree object that will be modified
- * @filename: name of the file containing the state to be loaded into the %ETree
- *
- * This routine saves the state of the @e_tree object into the file pointed
- * by @filename
- */
-void
-e_tree_save_state (ETree      *e_tree,
-		   const gchar *filename)
-{
-	ETableState *state;
-
-	state = e_tree_get_state_object(e_tree);
-	e_table_state_save_to_file(state, filename);
-	gtk_object_unref(GTK_OBJECT(state));
-}
-
-static void
-et_table_model_changed (ETableModel *model, ETree *et)
-{
-	if (et->priv->horizontal_scrolling)
-		e_table_header_update_horizontal(et->priv->header);
-}
-
-static void
-et_table_row_changed (ETableModel *table_model, int row, ETree *et)
-{
-	et_table_model_changed (table_model, et);
-}
-
-static void
-et_table_cell_changed (ETableModel *table_model, int view_col, int row, ETree *et)
-{
-	et_table_model_changed (table_model, et);
-}
-
-static void
-et_table_rows_inserted (ETableModel *table_model, int row, int count, ETree *et)
-{
-	et_table_model_changed (table_model, et);
-}
-
-static void
-et_table_rows_deleted (ETableModel *table_model, int row, int count, ETree *et)
-{
-	et_table_model_changed (table_model, et);
-}
-
-static void
-et_connect_to_etta (ETree *et)
-{
-	et->priv->table_model_change_id = gtk_signal_connect (GTK_OBJECT (et->priv->etta), "model_changed",
-							      GTK_SIGNAL_FUNC (et_table_model_changed), et);
-
-	et->priv->table_row_change_id = gtk_signal_connect (GTK_OBJECT (et->priv->etta), "model_row_changed",
-							    GTK_SIGNAL_FUNC (et_table_row_changed), et);
-
-	et->priv->table_cell_change_id = gtk_signal_connect (GTK_OBJECT (et->priv->etta), "model_cell_changed",
-							     GTK_SIGNAL_FUNC (et_table_cell_changed), et);
-
-	et->priv->table_rows_inserted_id = gtk_signal_connect (GTK_OBJECT (et->priv->etta), "model_rows_inserted",
-							       GTK_SIGNAL_FUNC (et_table_rows_inserted), et);
-
-	et->priv->table_rows_deleted_id = gtk_signal_connect (GTK_OBJECT (et->priv->etta), "model_rows_deleted",
-							      GTK_SIGNAL_FUNC (et_table_rows_deleted), et);
-
-}
-
-static ETree *
-et_real_construct (ETree *e_tree, ETreeModel *etm, ETableExtras *ete,
-		   ETableSpecification *specification, ETableState *state)
-{
-	int row = 0;
-
-	if (ete)
-		gtk_object_ref(GTK_OBJECT(ete));
-	else
-		ete = e_table_extras_new();
-
-	e_tree->priv->alternating_row_colors = specification->alternating_row_colors;
-	e_tree->priv->horizontal_draw_grid = specification->horizontal_draw_grid;
-	e_tree->priv->vertical_draw_grid = specification->vertical_draw_grid;
-	e_tree->priv->draw_focus = specification->draw_focus;
-	e_tree->priv->cursor_mode = specification->cursor_mode;
-	e_tree->priv->full_header = e_table_spec_to_full_header(specification, ete);
-
-	e_tree->priv->header = e_table_state_to_header (GTK_WIDGET(e_tree), e_tree->priv->full_header, state);
-	e_tree->priv->horizontal_scrolling = specification->horizontal_scrolling;
-
-	e_tree->priv->sort_info = state->sort_info;
-	gtk_object_ref (GTK_OBJECT (e_tree->priv->sort_info));
-
-	gtk_object_set(GTK_OBJECT(e_tree->priv->header),
-		       "sort_info", e_tree->priv->sort_info,
-		       NULL);
-
-	e_tree->priv->model = etm;
-	gtk_object_ref (GTK_OBJECT (etm));
-
-	e_tree->priv->sorted = e_tree_sorted_new(etm, e_tree->priv->full_header, e_tree->priv->sort_info);
-
-	e_tree->priv->etta = E_TREE_TABLE_ADAPTER(e_tree_table_adapter_new(E_TREE_MODEL(e_tree->priv->sorted)));
-
-	et_connect_to_etta (e_tree);
-
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-
-	e_tree->priv->sorter = e_sorter_new();
-
-	gtk_object_set (GTK_OBJECT (e_tree->priv->selection),
-			"sorter", e_tree->priv->sorter,
-#ifdef E_TREE_USE_TREE_SELECTION
-			"model", e_tree->priv->model,
-			"ets", e_tree->priv->sorted,
-			"etta", e_tree->priv->etta,
-#else
-			"model", e_tree->priv->etta,
-#endif
-			"selection_mode", specification->selection_mode,
-			"cursor_mode", specification->cursor_mode,
-			NULL);
-
-	gtk_signal_connect(GTK_OBJECT(e_tree->priv->selection), "selection_changed",
-			   GTK_SIGNAL_FUNC(et_selection_model_selection_change), e_tree);
-
-	if (!specification->no_headers) {
-		e_tree_setup_header (e_tree);
-	}
-	e_tree_setup_table (e_tree);
-
-	gtk_layout_get_vadjustment (GTK_LAYOUT (e_tree->priv->table_canvas))->step_increment = 20;
-	gtk_adjustment_changed(gtk_layout_get_vadjustment (GTK_LAYOUT (e_tree->priv->table_canvas)));
-
-	if (!specification->no_headers) {
-		/*
-		 * The header
-		 */
-		gtk_table_attach (GTK_TABLE (e_tree), GTK_WIDGET (e_tree->priv->header_canvas),
-				  0, 1, 0 + row, 1 + row,
-				  GTK_FILL | GTK_EXPAND,
-				  GTK_FILL, 0, 0);
-		row ++;
-	}
-	gtk_table_attach (GTK_TABLE (e_tree), GTK_WIDGET (e_tree->priv->table_canvas),
-			  0, 1, 0 + row, 1 + row,
-			  GTK_FILL | GTK_EXPAND,
-			  GTK_FILL | GTK_EXPAND,
-			  0, 0);
-
-	gtk_widget_pop_colormap ();
-	gtk_widget_pop_visual ();
-
-	gtk_object_unref(GTK_OBJECT(ete));
-
-	return e_tree;
-}
-
-ETree *
-e_tree_construct (ETree *e_tree, ETreeModel *etm, ETableExtras *ete,
-		   const char *spec_str, const char *state_str)
-{
-	ETableSpecification *specification;
-	ETableState *state;
-
-	g_return_val_if_fail(e_tree != NULL, NULL);
-	g_return_val_if_fail(E_IS_TREE(e_tree), NULL);
-	g_return_val_if_fail(etm != NULL, NULL);
-	g_return_val_if_fail(E_IS_TREE_MODEL(etm), NULL);
-	g_return_val_if_fail(ete == NULL || E_IS_TABLE_EXTRAS(ete), NULL);
-	g_return_val_if_fail(spec_str != NULL, NULL);
-
-	specification = e_table_specification_new();
-	e_table_specification_load_from_string(specification, spec_str);
-	if (state_str) {
-		state = e_table_state_new();
-		e_table_state_load_from_string(state, state_str);
-		if (state->col_count <= 0) {
-			gtk_object_unref(GTK_OBJECT(state));
-			state = specification->state;
-			gtk_object_ref(GTK_OBJECT(state));
-		}
-	} else {
-		state = specification->state;
-		gtk_object_ref(GTK_OBJECT(state));
-	}
-
-	e_tree = et_real_construct (e_tree, etm, ete, specification, state);
-
-	e_tree->priv->spec = specification;
-	gtk_object_unref(GTK_OBJECT(state));
-
-	return e_tree;
-}
-
-ETree *
-e_tree_construct_from_spec_file (ETree *e_tree, ETreeModel *etm, ETableExtras *ete,
-				  const char *spec_fn, const char *state_fn)
-{
-	ETableSpecification *specification;
-	ETableState *state;
-
-	g_return_val_if_fail(e_tree != NULL, NULL);
-	g_return_val_if_fail(E_IS_TREE(e_tree), NULL);
-	g_return_val_if_fail(etm != NULL, NULL);
-	g_return_val_if_fail(E_IS_TREE_MODEL(etm), NULL);
-	g_return_val_if_fail(ete == NULL || E_IS_TABLE_EXTRAS(ete), NULL);
-	g_return_val_if_fail(spec_fn != NULL, NULL);
-
-	specification = e_table_specification_new();
-	if (!e_table_specification_load_from_file(specification, spec_fn)) {
-		gtk_object_unref(GTK_OBJECT(specification));
-		return NULL;
-	}
-
-	if (state_fn) {
-		state = e_table_state_new();
-		if (!e_table_state_load_from_file(state, state_fn)) {
-			gtk_object_unref(GTK_OBJECT(state));
-			state = specification->state;
-			gtk_object_ref(GTK_OBJECT(state));
-		}
-		if (state->col_count <= 0) {
-			gtk_object_unref(GTK_OBJECT(state));
-			state = specification->state;
-			gtk_object_ref(GTK_OBJECT(state));
-		}
-	} else {
-		state = specification->state;
-		gtk_object_ref(GTK_OBJECT(state));
-	}
-
-	e_tree = et_real_construct (e_tree, etm, ete, specification, state);
-
-	e_tree->priv->spec = specification;
-	gtk_object_unref(GTK_OBJECT(state));
-
-	return e_tree;
-}
-
-GtkWidget *
-e_tree_new (ETreeModel *etm, ETableExtras *ete, const char *spec, const char *state)
-{
-	ETree *e_tree, *ret_val;
-
-	g_return_val_if_fail(etm != NULL, NULL);
-	g_return_val_if_fail(E_IS_TREE_MODEL(etm), NULL);
-	g_return_val_if_fail(ete == NULL || E_IS_TABLE_EXTRAS(ete), NULL);
-	g_return_val_if_fail(spec != NULL, NULL);
-
-	e_tree = gtk_type_new (e_tree_get_type ());
-
-	ret_val = e_tree_construct (e_tree, etm, ete, spec, state);
-
-	if (ret_val == NULL) {
-		gtk_object_unref (GTK_OBJECT (e_tree));
-	}
-
-	return (GtkWidget *) ret_val;
-}
-
-GtkWidget *
-e_tree_new_from_spec_file (ETreeModel *etm, ETableExtras *ete, const char *spec_fn, const char *state_fn)
-{
-	ETree *e_tree, *ret_val;
-
-	g_return_val_if_fail(etm != NULL, NULL);
-	g_return_val_if_fail(E_IS_TREE_MODEL(etm), NULL);
-	g_return_val_if_fail(ete == NULL || E_IS_TABLE_EXTRAS(ete), NULL);
-	g_return_val_if_fail(spec_fn != NULL, NULL);
-
-	e_tree = gtk_type_new (e_tree_get_type ());
-
-	ret_val = e_tree_construct_from_spec_file (e_tree, etm, ete, spec_fn, state_fn);
-
-	if (ret_val == NULL) {
-		gtk_object_unref (GTK_OBJECT (e_tree));
-	}
-
-	return (GtkWidget *) ret_val;
-}
-
-void
-e_tree_set_cursor (ETree *e_tree, ETreePath path)
-{
-#ifndef E_TREE_USE_TREE_SELECTION
-	int row;
-#endif
-	g_return_if_fail(e_tree != NULL);
-	g_return_if_fail(E_IS_TREE(e_tree));
-	g_return_if_fail(path != NULL);
-
-#ifdef E_TREE_USE_TREE_SELECTION
-	e_tree_selection_model_select_single_path (E_TREE_SELECTION_MODEL(e_tree->priv->selection), path);
-	e_tree_selection_model_change_cursor (E_TREE_SELECTION_MODEL(e_tree->priv->selection), path);
-#else
-	path = e_tree_sorted_model_to_view_path(e_tree->priv->sorted, path);
-
-	row = e_tree_table_adapter_row_of_node(E_TREE_TABLE_ADAPTER(e_tree->priv->etta), path);
-
-	if (row == -1)
-		return;
-
-	gtk_object_set(GTK_OBJECT(e_tree->priv->selection),
-		       "cursor_row", row,
-		       NULL);
-#endif
-}
-
-ETreePath
-e_tree_get_cursor (ETree *e_tree)
-{
-	int row;
-	ETreePath path;
-	g_return_val_if_fail(e_tree != NULL, NULL);
-	g_return_val_if_fail(E_IS_TREE(e_tree), NULL);
-
-	gtk_object_get(GTK_OBJECT(e_tree->priv->selection),
-		       "cursor_row", &row,
-		       NULL);
-	if (row == -1)
-		return NULL;
-	path = e_tree_table_adapter_node_at_row(E_TREE_TABLE_ADAPTER(e_tree->priv->etta), row);
-	path = e_tree_sorted_view_to_model_path(e_tree->priv->sorted, path);
-	return path;
-}
-
-void
-e_tree_selected_row_foreach     (ETree *e_tree,
-				  EForeachFunc callback,
-				  gpointer closure)
-{
-	g_return_if_fail(e_tree != NULL);
-	g_return_if_fail(E_IS_TREE(e_tree));
-
-	e_selection_model_foreach(e_tree->priv->selection,
-				  callback,
-				  closure);
-}
-
-#ifdef E_TREE_USE_TREE_SELECTION
-void
-e_tree_selected_path_foreach     (ETree *e_tree,
-				 ETreeForeachFunc callback,
-				 gpointer closure)
-{
-	g_return_if_fail(e_tree != NULL);
-	g_return_if_fail(E_IS_TREE(e_tree));
-
-	e_tree_selection_model_foreach(E_TREE_SELECTION_MODEL (e_tree->priv->selection),
-				       callback,
-				       closure);
-}
-#endif
-
-EPrintable *
-e_tree_get_printable (ETree *e_tree)
-{
-	g_return_val_if_fail(e_tree != NULL, NULL);
-	g_return_val_if_fail(E_IS_TREE(e_tree), NULL);
-
-	return e_table_item_get_printable(E_TABLE_ITEM(e_tree->priv->item));
-}
-
-static void
-et_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ETree *etree = E_TREE (o);
-
-	switch (arg_id){
-	case ARG_ETTA:
-		if (etree->priv->item) {
-			GTK_VALUE_OBJECT (*arg) = GTK_OBJECT (etree->priv->etta);
-		}
-		break;
-
-	default:
-		break;
-	}
-}
-
-typedef struct {
-	char     *arg;
-	gboolean  setting;
-} bool_closure;
-
-static void
-et_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ETree *etree = E_TREE (o);
-
-	switch (arg_id){
-	case ARG_LENGTH_THRESHOLD:
-		etree->priv->length_threshold = GTK_VALUE_INT (*arg);
-		if (etree->priv->item) {
-			gnome_canvas_item_set (GNOME_CANVAS_ITEM(etree->priv->item),
-					       "length_threshold", GTK_VALUE_INT (*arg),
-					       NULL);
-		}
-		break;
-
-	case ARG_HORIZONTAL_DRAW_GRID:
-		etree->priv->horizontal_draw_grid = GTK_VALUE_BOOL (*arg);
-		if (etree->priv->item) {
-			gnome_canvas_item_set (GNOME_CANVAS_ITEM(etree->priv->item),
-					       "horizontal_draw_grid", GTK_VALUE_BOOL (*arg),
-					       NULL);
-		}
-		break;
-
-	case ARG_VERTICAL_DRAW_GRID:
-		etree->priv->vertical_draw_grid = GTK_VALUE_BOOL (*arg);
-		if (etree->priv->item) {
-			gnome_canvas_item_set (GNOME_CANVAS_ITEM(etree->priv->item),
-					       "vertical_draw_grid", GTK_VALUE_BOOL (*arg),
-					       NULL);
-		}
-		break;
-		
-	case ARG_DRAW_FOCUS:
-		etree->priv->draw_focus = GTK_VALUE_BOOL (*arg);
-		if (etree->priv->item) {
-			gnome_canvas_item_set (GNOME_CANVAS_ITEM(etree->priv->item),
-					       "draw_focus", GTK_VALUE_BOOL (*arg),
-					       NULL);
-		}
-		break;
-	}
-}
-
-static void
-set_scroll_adjustments   (ETree *tree,
-			  GtkAdjustment *hadjustment,
-			  GtkAdjustment *vadjustment)
-{
-	if (vadjustment != NULL) {
-		vadjustment->step_increment = 20;
-		gtk_adjustment_changed(vadjustment);
-	}
-
-	gtk_layout_set_hadjustment (GTK_LAYOUT(tree->priv->table_canvas),
-				    hadjustment);
-	gtk_layout_set_vadjustment (GTK_LAYOUT(tree->priv->table_canvas),
-				    vadjustment);
-
-	if (tree->priv->header_canvas != NULL)
-		gtk_layout_set_hadjustment (GTK_LAYOUT(tree->priv->header_canvas),
-					    hadjustment);
-}
-
-gint
-e_tree_get_next_row      (ETree *e_tree,
-			   gint    model_row)
-{
-	g_return_val_if_fail(e_tree != NULL, -1);
-	g_return_val_if_fail(E_IS_TREE(e_tree), -1);
-
-	if (e_tree->priv->sorter) {
-		int i;
-		i = e_sorter_model_to_sorted(E_SORTER (e_tree->priv->sorter), model_row);
-		i++;
-		if (i < e_table_model_row_count(E_TABLE_MODEL(e_tree->priv->etta))) {
-			return e_sorter_sorted_to_model(E_SORTER (e_tree->priv->sorter), i);
-		} else
-			return -1;
-	} else
-		if (model_row < e_table_model_row_count(E_TABLE_MODEL(e_tree->priv->etta)) - 1)
-			return model_row + 1;
-		else
-			return -1;
-}
-
-gint
-e_tree_get_prev_row      (ETree *e_tree,
-			  gint    model_row)
-{
-	g_return_val_if_fail(e_tree != NULL, -1);
-	g_return_val_if_fail(E_IS_TREE(e_tree), -1);
-
-	if (e_tree->priv->sorter) {
-		int i;
-		i = e_sorter_model_to_sorted(E_SORTER (e_tree->priv->sorter), model_row);
-		i--;
-		if (i >= 0)
-			return e_sorter_sorted_to_model(E_SORTER (e_tree->priv->sorter), i);
-		else
-			return -1;
-	} else
-		return model_row - 1;
-}
-
-gint
-e_tree_model_to_view_row        (ETree *e_tree,
-				  gint    model_row)
-{
-	g_return_val_if_fail(e_tree != NULL, -1);
-	g_return_val_if_fail(E_IS_TREE(e_tree), -1);
-
-	if (e_tree->priv->sorter)
-		return e_sorter_model_to_sorted(E_SORTER (e_tree->priv->sorter), model_row);
-	else
-		return model_row;
-}
-
-gint
-e_tree_view_to_model_row        (ETree *e_tree,
-				  gint    view_row)
-{
-	g_return_val_if_fail(e_tree != NULL, -1);
-	g_return_val_if_fail(E_IS_TREE(e_tree), -1);
-
-	if (e_tree->priv->sorter)
-		return e_sorter_sorted_to_model (E_SORTER (e_tree->priv->sorter), view_row);
-	else
-		return view_row;
-}
-
-
-gboolean
-e_tree_node_is_expanded (ETree *et, ETreePath path)
-{
-	path = e_tree_sorted_model_to_view_path(et->priv->sorted, path);
-
-	g_return_val_if_fail(path, FALSE);
-
-	return e_tree_table_adapter_node_is_expanded (et->priv->etta, path);
-}
-
-void
-e_tree_node_set_expanded (ETree *et, ETreePath path, gboolean expanded)
-{
-	g_return_if_fail (et != NULL);
-	g_return_if_fail (E_IS_TREE(et));
-
-	path = e_tree_sorted_model_to_view_path(et->priv->sorted, path);
-
-	e_tree_table_adapter_node_set_expanded (et->priv->etta, path, expanded);
-}
-
-void
-e_tree_node_set_expanded_recurse (ETree *et, ETreePath path, gboolean expanded)
-{
-	g_return_if_fail (et != NULL);
-	g_return_if_fail (E_IS_TREE(et));
-
-	path = e_tree_sorted_model_to_view_path(et->priv->sorted, path);
-
-	e_tree_table_adapter_node_set_expanded_recurse (et->priv->etta, path, expanded);
-}
-
-void
-e_tree_root_node_set_visible (ETree *et, gboolean visible)
-{
-	g_return_if_fail (et != NULL);
-	g_return_if_fail (E_IS_TREE(et));
-
-	e_tree_table_adapter_root_node_set_visible (et->priv->etta, visible);
-}
-
-ETreePath
-e_tree_node_at_row (ETree *et, int row)
-{
-	ETreePath path;
-
-	path = e_tree_table_adapter_node_at_row (et->priv->etta, row);
-	path = e_tree_sorted_view_to_model_path(et->priv->sorted, path);
-
-	return path;
-}
-
-int
-e_tree_row_of_node (ETree *et, ETreePath path)
-{
-	path = e_tree_sorted_model_to_view_path(et->priv->sorted, path);
-	return e_tree_table_adapter_row_of_node (et->priv->etta, path);
-}
-
-gboolean
-e_tree_root_node_is_visible(ETree *et)
-{
-	return e_tree_table_adapter_root_node_is_visible (et->priv->etta);
-}
-
-void
-e_tree_show_node (ETree *et, ETreePath path)
-{
-	g_return_if_fail (et != NULL);
-	g_return_if_fail (E_IS_TREE(et));
-
-	path = e_tree_sorted_model_to_view_path(et->priv->sorted, path);
-
-	e_tree_table_adapter_show_node (et->priv->etta, path);
-}
-
-void
-e_tree_save_expanded_state (ETree *et, char *filename)
-{
-	g_return_if_fail (et != NULL);
-	g_return_if_fail (E_IS_TREE(et));
-
-	e_tree_table_adapter_save_expanded_state (et->priv->etta, filename);
-}
-
-void
-e_tree_load_expanded_state (ETree *et, char *filename)
-{
-	e_tree_table_adapter_load_expanded_state (et->priv->etta, filename);
-}
-
-gint
-e_tree_row_count (ETree *et)
-{
-	return e_table_model_row_count (E_TABLE_MODEL(et->priv->etta));
-}
-
-GtkWidget *
-e_tree_get_tooltip (ETree *et)
-{
-	return E_CANVAS(et->priv->table_canvas)->tooltip_window;
-}
-
-/**
- * e_tree_get_model:
- * @et: the ETree
- *
- * Returns the model upon which this ETree is based.
- *
- * Returns: the model
- **/
-ETreeModel *
-e_tree_get_model (ETree *et)
-{
-	g_return_val_if_fail (et != NULL, NULL);
-	g_return_val_if_fail (E_IS_TREE (et), NULL);
-
-	return et->priv->model;
-}
-
-/**
- * e_tree_get_selection_model:
- * @et: the ETree
- *
- * Returns the selection model of this ETree.
- *
- * Returns: the selection model
- **/
-ESelectionModel *
-e_tree_get_selection_model (ETree *et)
-{
-	g_return_val_if_fail (et != NULL, NULL);
-	g_return_val_if_fail (E_IS_TREE (et), NULL);
-
-	return et->priv->selection;
-}
-
-
-struct _ETreeDragSourceSite
-{
-	GdkModifierType    start_button_mask;
-	GtkTargetList     *target_list;        /* Targets for drag data */
-	GdkDragAction      actions;            /* Possible actions */
-	GdkColormap       *colormap;	         /* Colormap for drag icon */
-	GdkPixmap         *pixmap;             /* Icon for drag data */
-	GdkBitmap         *mask;
-
-	/* Stored button press information to detect drag beginning */
-	gint               state;
-	gint               x, y;
-	gint               row, col;
-};
-
-typedef enum
-{
-  GTK_DRAG_STATUS_DRAG,
-  GTK_DRAG_STATUS_WAIT,
-  GTK_DRAG_STATUS_DROP
-} GtkDragStatus;
-
-typedef struct _GtkDragDestInfo GtkDragDestInfo;
-typedef struct _GtkDragSourceInfo GtkDragSourceInfo;
-
-struct _GtkDragDestInfo
-{
-  GtkWidget         *widget;	   /* Widget in which drag is in */
-  GdkDragContext    *context;	   /* Drag context */
-  GtkDragSourceInfo *proxy_source; /* Set if this is a proxy drag */
-  GtkSelectionData  *proxy_data;   /* Set while retrieving proxied data */
-  gboolean           dropped : 1;     /* Set after we receive a drop */
-  guint32            proxy_drop_time; /* Timestamp for proxied drop */
-  gboolean           proxy_drop_wait : 1; /* Set if we are waiting for a
-					   * status reply before sending
-					   * a proxied drop on.
-					   */
-  gint               drop_x, drop_y; /* Position of drop */
-};
-
-struct _GtkDragSourceInfo
-{
-  GtkWidget         *widget;
-  GtkTargetList     *target_list; /* Targets for drag data */
-  GdkDragAction      possible_actions; /* Actions allowed by source */
-  GdkDragContext    *context;	  /* drag context */
-  GtkWidget         *icon_window; /* Window for drag */
-  GtkWidget         *ipc_widget;  /* GtkInvisible for grab, message passing */
-  GdkCursor         *cursor;	  /* Cursor for drag */
-  gint hot_x, hot_y;		  /* Hot spot for drag */
-  gint button;			  /* mouse button starting drag */
-
-  GtkDragStatus      status;	  /* drag status */
-  GdkEvent          *last_event;  /* motion event waiting for response */
-
-  gint               start_x, start_y; /* Initial position */
-  gint               cur_x, cur_y;     /* Current Position */
-
-  GList             *selections;  /* selections we've claimed */
-
-  GtkDragDestInfo   *proxy_dest;  /* Set if this is a proxy drag */
-
-  guint              drop_timeout;     /* Timeout for aborting drop */
-  guint              destroy_icon : 1; /* If true, destroy icon_window
-					*/
-};
-
-/* Drag & drop stuff. */
-/* Target */
-void
-e_tree_drag_get_data (ETree         *tree,
-		      int             row,
-		      int             col,
-		      GdkDragContext *context,
-		      GdkAtom         target,
-		      guint32         time)
-{
-	ETreePath path;
-	g_return_if_fail(tree != NULL);
-	g_return_if_fail(E_IS_TREE(tree));
-
-	path = e_tree_table_adapter_node_at_row(tree->priv->etta, row);
-	path = e_tree_sorted_view_to_model_path(tree->priv->sorted, path);
-
-	gtk_drag_get_data(GTK_WIDGET(tree),
-			  context,
-			  target,
-			  time);
-
-}
-
-/**
- * e_tree_drag_highlight:
- * @tree:
- * @row:
- * @col:
- *
- * Set col to -1 to highlight the entire row.
- */
-void
-e_tree_drag_highlight (ETree *tree,
-			int     row,
-			int     col)
-{
-	g_return_if_fail(tree != NULL);
-	g_return_if_fail(E_IS_TREE(tree));
-}
-
-void
-e_tree_drag_unhighlight (ETree *tree)
-{
-	g_return_if_fail(tree != NULL);
-	g_return_if_fail(E_IS_TREE(tree));
-}
-
-void e_tree_drag_dest_set   (ETree               *tree,
-			     GtkDestDefaults       flags,
-			     const GtkTargetEntry *targets,
-			     gint                  n_targets,
-			     GdkDragAction         actions)
-{
-	g_return_if_fail(tree != NULL);
-	g_return_if_fail(E_IS_TREE(tree));
-
-	gtk_drag_dest_set(GTK_WIDGET(tree),
-			  flags,
-			  targets,
-			  n_targets,
-			  actions);
-}
-
-void e_tree_drag_dest_set_proxy (ETree         *tree,
-				 GdkWindow      *proxy_window,
-				 GdkDragProtocol protocol,
-				 gboolean        use_coordinates)
-{
-	g_return_if_fail(tree != NULL);
-	g_return_if_fail(E_IS_TREE(tree));
-
-	gtk_drag_dest_set_proxy(GTK_WIDGET(tree),
-				proxy_window,
-				protocol,
-				use_coordinates);
-}
-
-/*
- * There probably should be functions for setting the targets
- * as a GtkTargetList
- */
-
-void
-e_tree_drag_dest_unset (GtkWidget *widget)
-{
-	g_return_if_fail(widget != NULL);
-	g_return_if_fail(E_IS_TREE(widget));
-
-	gtk_drag_dest_unset(widget);
-}
-
-/* Source side */
-
-void
-e_tree_drag_source_set  (ETree               *tree,
-			 GdkModifierType       start_button_mask,
-			 const GtkTargetEntry *targets,
-			 gint                  n_targets,
-			 GdkDragAction         actions)
-{
-	ETreeDragSourceSite *site;
-	GtkWidget *canvas;
-
-	g_return_if_fail(tree != NULL);
-	g_return_if_fail(E_IS_TREE(tree));
-
-	canvas = GTK_WIDGET(tree->priv->table_canvas);
-	site = tree->priv->site;
-
-	gtk_widget_add_events (canvas,
-			       gtk_widget_get_events (canvas) |
-			       GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
-			       GDK_BUTTON_MOTION_MASK | GDK_STRUCTURE_MASK);
-
-	if (site) {
-		if (site->target_list)
-			gtk_target_list_unref (site->target_list);
-	} else {
-		site = g_new0 (ETreeDragSourceSite, 1);
-
-		tree->priv->drag_source_button_press_event_id =
-			gtk_signal_connect (GTK_OBJECT (canvas), "button_press_event",
-					    GTK_SIGNAL_FUNC (e_tree_drag_source_event_cb),
-					    tree);
-		tree->priv->drag_source_motion_notify_event_id =
-			gtk_signal_connect (GTK_OBJECT (canvas), "motion_notify_event",
-					    GTK_SIGNAL_FUNC (e_tree_drag_source_event_cb),
-					    tree);
-
-		tree->priv->site = site;
-	}
-
-	site->start_button_mask = start_button_mask;
-
-	if (targets)
-		site->target_list = gtk_target_list_new (targets, n_targets);
-	else
-		site->target_list = NULL;
-
-	site->actions = actions;
-}
-
-void
-e_tree_drag_source_unset (ETree *tree)
-{
-	ETreeDragSourceSite *site;
-
-	g_return_if_fail (tree != NULL);
-	g_return_if_fail (E_IS_TREE(tree));
-
-	site = tree->priv->site;
-
-	if (site) {
-		gtk_signal_disconnect (
-			GTK_OBJECT (tree->priv->table_canvas),
-			tree->priv->drag_source_button_press_event_id);
-		gtk_signal_disconnect (
-			GTK_OBJECT (tree->priv->table_canvas),
-			tree->priv->drag_source_motion_notify_event_id);
-		g_free (site);
-		tree->priv->site = NULL;
-	}
-}
-
-/* There probably should be functions for setting the targets
- * as a GtkTargetList
- */
-
-GdkDragContext *
-e_tree_drag_begin (ETree            *tree,
-		   int     	       row,
-		   int     	       col,
-		   GtkTargetList     *targets,
-		   GdkDragAction      actions,
-		   gint               button,
-		   GdkEvent          *event)
-{
-	ETreePath path;
-	g_return_val_if_fail (tree != NULL, NULL);
-	g_return_val_if_fail (E_IS_TREE(tree), NULL);
-
-	path = e_tree_table_adapter_node_at_row(tree->priv->etta, row);
-	path = e_tree_sorted_view_to_model_path(tree->priv->sorted, path);
-
-	tree->priv->drag_row = row;
-	tree->priv->drag_path = path;
-	tree->priv->drag_col = col;
-
-	return gtk_drag_begin(GTK_WIDGET(tree),
-			      targets,
-			      actions,
-			      button,
-			      event);
-}
-
-/**
- * e_tree_get_cell_at:
- * @tree: An ETree widget
- * @x: X coordinate for the pixel
- * @y: Y coordinate for the pixel
- * @row_return: Pointer to return the row value
- * @col_return: Pointer to return the column value
- * 
- * Return the row and column for the cell in which the pixel at (@x, @y) is
- * contained.
- **/
-void
-e_tree_get_cell_at (ETree *tree,
-		     int x, int y,
-		     int *row_return, int *col_return)
-{
-	g_return_if_fail (tree != NULL);
-	g_return_if_fail (E_IS_TREE (tree));
-	g_return_if_fail (row_return != NULL);
-	g_return_if_fail (col_return != NULL);
-
-	/* FIXME it would be nice if it could handle a NULL row_return or
-	 * col_return gracefully.  */
-
-	if (row_return)
-		*row_return = -1;
-	if (col_return)
-		*col_return = -1;
-
-	x += GTK_LAYOUT(tree->priv->table_canvas)->hadjustment->value;
-	y += GTK_LAYOUT(tree->priv->table_canvas)->vadjustment->value;
-	e_table_item_compute_location(E_TABLE_ITEM(tree->priv->item), &x, &y, row_return, col_return);
-}
-
-/**
- * e_tree_get_cell_geometry:
- * @tree: The tree.
- * @row: The row to get the geometry of.
- * @col: The col to get the geometry of.
- * @x_return: Returns the x coordinate of the upper right hand corner of the cell with respect to the widget.
- * @y_return: Returns the y coordinate of the upper right hand corner of the cell with respect to the widget.
- * @width_return: Returns the width of the cell.
- * @height_return: Returns the height of the cell.
- * 
- * Computes the data about this cell.
- **/
-void
-e_tree_get_cell_geometry (ETree *tree,
-			  int row, int col,
-			  int *x_return, int *y_return,
-			  int *width_return, int *height_return)
-{
-	g_return_if_fail (tree != NULL);
-	g_return_if_fail (E_IS_TREE (tree));
-	g_return_if_fail (row >= 0);
-	g_return_if_fail (col >= 0);
-
-	/* FIXME it would be nice if it could handle a NULL row_return or
-	 * col_return gracefully.  */
-
-	e_table_item_get_cell_geometry(E_TABLE_ITEM(tree->priv->item), &row, &col, x_return, y_return, width_return, height_return);
-
-	if (x_return)
-		(*x_return) -= GTK_LAYOUT(tree->priv->table_canvas)->hadjustment->value;
-	if (y_return)
-		(*y_return) -= GTK_LAYOUT(tree->priv->table_canvas)->vadjustment->value;
-}
-
-static void
-et_drag_begin (GtkWidget *widget,
-	       GdkDragContext *context,
-	       ETree *et)
-{
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [TREE_DRAG_BEGIN],
-			 et->priv->drag_row,
-			 et->priv->drag_path,
-			 et->priv->drag_col,
-			 context);
-}
-
-static void
-et_drag_end (GtkWidget *widget,
-	     GdkDragContext *context,
-	     ETree *et)
-{
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [TREE_DRAG_END],
-			 et->priv->drag_row,
-			 et->priv->drag_path,
-			 et->priv->drag_col,
-			 context);
-}
-
-static void
-et_drag_data_get(GtkWidget *widget,
-		 GdkDragContext *context,
-		 GtkSelectionData *selection_data,
-		 guint info,
-		 guint time,
-		 ETree *et)
-{
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [TREE_DRAG_DATA_GET],
-			 et->priv->drag_row,
-			 et->priv->drag_path,
-			 et->priv->drag_col,
-			 context,
-			 selection_data,
-			 info,
-			 time);
-}
-
-static void
-et_drag_data_delete(GtkWidget *widget,
-		    GdkDragContext *context,
-		    ETree *et)
-{
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [TREE_DRAG_DATA_DELETE],
-			 et->priv->drag_row,
-			 et->priv->drag_path,
-			 et->priv->drag_col,
-			 context);
-}
-
-static void
-et_drag_leave(GtkWidget *widget,
-	      GdkDragContext *context,
-	      guint time,
-	      ETree *et)
-{
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [TREE_DRAG_LEAVE],
-			 et->priv->drop_row,
-			 et->priv->drop_path,
-			 et->priv->drop_col,
-			 context,
-			 time);
-	et->priv->drop_row = -1;
-	et->priv->drop_col = -1;
-}
-
-static gboolean
-et_drag_motion(GtkWidget *widget,
-	       GdkDragContext *context,
-	       gint x,
-	       gint y,
-	       guint time,
-	       ETree *et)
-{
-	gboolean ret_val;
-	int row, col;
-	ETreePath path;
-	y -= 27;
-	e_tree_get_cell_at (et,
-			    x,
-			    y,
-			    &row,
-			    &col);
-	if (row != et->priv->drop_row && col != et->priv->drop_row) {
-		gtk_signal_emit (GTK_OBJECT (et),
-				 et_signals [TREE_DRAG_LEAVE],
-				 et->priv->drop_row,
-				 et->priv->drop_path,
-				 et->priv->drop_col,
-				 context,
-				 time);
-	}
-
-	path = e_tree_table_adapter_node_at_row(et->priv->etta, row);
-	path = e_tree_sorted_view_to_model_path(et->priv->sorted, path);
-
-	et->priv->drop_row = row;
-	et->priv->drop_path = path;
-	et->priv->drop_col = col;
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [TREE_DRAG_MOTION],
-			 et->priv->drop_row,
-			 et->priv->drop_path,
-			 et->priv->drop_col,
-			 context,
-			 x,
-			 y,
-			 time,
-			 &ret_val);
-	return ret_val;
-}
-
-static gboolean
-et_drag_drop(GtkWidget *widget,
-	     GdkDragContext *context,
-	     gint x,
-	     gint y,
-	     guint time,
-	     ETree *et)
-{
-	gboolean ret_val;
-	int row, col;
-	ETreePath path;
-	y -= 27;
-	e_tree_get_cell_at(et,
-			   x,
-			   y,
-			   &row,
-			   &col);
-	path = e_tree_table_adapter_node_at_row(et->priv->etta, row);
-	path = e_tree_sorted_view_to_model_path(et->priv->sorted, path);
-
-	if (row != et->priv->drop_row && col != et->priv->drop_row) {
-		gtk_signal_emit (GTK_OBJECT (et),
-				 et_signals [TREE_DRAG_LEAVE],
-				 et->priv->drop_row,
-				 et->priv->drop_path,
-				 et->priv->drop_col,
-				 context,
-				 time);
-		gtk_signal_emit (GTK_OBJECT (et),
-				 et_signals [TREE_DRAG_MOTION],
-				 row,
-				 path,
-				 col,
-				 context,
-				 x,
-				 y,
-				 time,
-				 &ret_val);
-	}
-	et->priv->drop_row = row;
-	et->priv->drop_path = path;
-	et->priv->drop_col = col;
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [TREE_DRAG_DROP],
-			 et->priv->drop_row,
-			 et->priv->drop_path,
-			 et->priv->drop_col,
-			 context,
-			 x,
-			 y,
-			 time,
-			 &ret_val);
-	et->priv->drop_row = -1;
-	et->priv->drop_path = NULL;
-	et->priv->drop_col = -1;
-	return ret_val;
-}
-
-static void
-et_drag_data_received(GtkWidget *widget,
-		      GdkDragContext *context,
-		      gint x,
-		      gint y,
-		      GtkSelectionData *selection_data,
-		      guint info,
-		      guint time,
-		      ETree *et)
-{
-	int row, col;
-	ETreePath path;
-	y -= 27;
-	e_tree_get_cell_at(et,
-			   x,
-			   y,
-			   &row,
-			   &col);
-	path = e_tree_table_adapter_node_at_row(et->priv->etta, row);
-	path = e_tree_sorted_view_to_model_path(et->priv->sorted, path);
-	gtk_signal_emit (GTK_OBJECT (et),
-			 et_signals [TREE_DRAG_DATA_RECEIVED],
-			 row,
-			 path,
-			 col,
-			 context,
-			 x,
-			 y,
-			 selection_data,
-			 info,
-			 time);
-}
-
-static gint
-e_tree_drag_source_event_cb (GtkWidget      *widget,
-			      GdkEvent       *event,
-			      ETree         *tree)
-{
-	ETreeDragSourceSite *site;
-	site = tree->priv->site;
-
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-		if ((GDK_BUTTON1_MASK << (event->button.button - 1)) & site->start_button_mask) {
-			int row, col;
-			e_tree_get_cell_at(tree, event->button.x, event->button.y, &row, &col);
-			if (row >= 0 && col >= 0) {
-				site->state |= (GDK_BUTTON1_MASK << (event->button.button - 1));
-				site->x = event->button.x;
-				site->y = event->button.y;
-				site->row = row;
-				site->col = col;
-			}
-		}
-		break;
-
-	case GDK_BUTTON_RELEASE:
-		if ((GDK_BUTTON1_MASK << (event->button.button - 1)) & site->start_button_mask) {
-			site->state &= ~(GDK_BUTTON1_MASK << (event->button.button - 1));
-		}
-		break;
-
-	case GDK_MOTION_NOTIFY:
-		if (site->state & event->motion.state & site->start_button_mask) {
-			/* FIXME: This is really broken and can leave us
-			 * with a stuck grab
-			 */
-			int i;
-			for (i=1; i<6; i++) {
-				if (site->state & event->motion.state &
-				    GDK_BUTTON1_MASK << (i - 1))
-					break;
-			}
-
-			if (MAX (abs (site->x - event->motion.x),
-				 abs (site->y - event->motion.y)) > 3) {
-				GtkDragSourceInfo *info;
-				GdkDragContext *context;
-
-				site->state = 0;
-				context = e_tree_drag_begin (tree, site->row, site->col,
-							     site->target_list,
-							     site->actions,
-							     i, event);
-
-
-				info = g_dataset_get_data (context, "gtk-info");
-
-				if (!info->icon_window) {
-					if (site->pixmap)
-						gtk_drag_set_icon_pixmap (context,
-									  site->colormap,
-									  site->pixmap,
-									  site->mask, -2, -2);
-					else
-						gtk_drag_set_icon_default (context);
-				}
-
-				return TRUE;
-			}
-		}
-		break;
-
-	default:			/* hit for 2/3BUTTON_PRESS */
-		break;
-	}
-	return FALSE;
-}
-
-static void
-e_tree_class_init (ETreeClass *class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	GtkContainerClass *container_class;
-
-	object_class = (GtkObjectClass *) class;
-	widget_class = (GtkWidgetClass *) class;
-	container_class = (GtkContainerClass *) class;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->destroy           = et_destroy;
-	object_class->set_arg           = et_set_arg;
-	object_class->get_arg           = et_get_arg;
-
-	widget_class->grab_focus = et_grab_focus;
-
-	container_class->focus = et_focus;
-
-	class->cursor_change            = NULL;
-	class->cursor_activated            = NULL;
-	class->selection_change         = NULL;
-	class->double_click             = NULL;
-	class->right_click              = NULL;
-	class->click                    = NULL;
-	class->key_press                = NULL;
-
-	class->tree_drag_begin         = NULL;
-	class->tree_drag_end           = NULL;
-	class->tree_drag_data_get      = NULL;
-	class->tree_drag_data_delete   = NULL;
-
-	class->tree_drag_leave         = NULL;
-	class->tree_drag_motion        = NULL;
-	class->tree_drag_drop          = NULL;
-	class->tree_drag_data_received = NULL;
-
-	et_signals [CURSOR_CHANGE] =
-		gtk_signal_new ("cursor_change",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETreeClass, cursor_change),
-				gtk_marshal_NONE__INT_POINTER,
-				GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_POINTER);
-
-	et_signals [CURSOR_ACTIVATED] =
-		gtk_signal_new ("cursor_activated",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETreeClass, cursor_activated),
-				gtk_marshal_NONE__INT_POINTER,
-				GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_POINTER);
-
-	et_signals [SELECTION_CHANGE] =
-		gtk_signal_new ("selection_change",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETreeClass, selection_change),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	et_signals [DOUBLE_CLICK] =
-		gtk_signal_new ("double_click",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETreeClass, double_click),
-				e_marshal_NONE__INT_POINTER_INT_POINTER,
-				GTK_TYPE_NONE, 4, GTK_TYPE_INT, GTK_TYPE_POINTER, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
-
-	et_signals [RIGHT_CLICK] =
-		gtk_signal_new ("right_click",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETreeClass, right_click),
-				e_marshal_INT__INT_POINTER_INT_POINTER,
-				GTK_TYPE_INT, 4, GTK_TYPE_INT, GTK_TYPE_POINTER, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
-
-	et_signals [CLICK] =
-		gtk_signal_new ("click",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETreeClass, click),
-				e_marshal_INT__INT_POINTER_INT_POINTER,
-				GTK_TYPE_INT, 4, GTK_TYPE_INT, GTK_TYPE_POINTER, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
-
-	et_signals [KEY_PRESS] =
-		gtk_signal_new ("key_press",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETreeClass, key_press),
-				e_marshal_INT__INT_POINTER_INT_POINTER,
-				GTK_TYPE_INT, 4, GTK_TYPE_INT, GTK_TYPE_POINTER, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
-
-	et_signals[TREE_DRAG_BEGIN] =
-		gtk_signal_new ("tree_drag_begin",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETreeClass, tree_drag_begin),
-				e_marshal_NONE__INT_POINTER_INT_POINTER,
-				GTK_TYPE_NONE, 4,
-				GTK_TYPE_INT,
-				GTK_TYPE_POINTER,
-				GTK_TYPE_INT,
-				GTK_TYPE_GDK_DRAG_CONTEXT);
-	et_signals[TREE_DRAG_END] =
-		gtk_signal_new ("tree_drag_end",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETreeClass, tree_drag_end),
-				e_marshal_NONE__INT_POINTER_INT_POINTER,
-				GTK_TYPE_NONE, 4,
-				GTK_TYPE_INT,
-				GTK_TYPE_POINTER,
-				GTK_TYPE_INT,
-				GTK_TYPE_GDK_DRAG_CONTEXT);
-	et_signals[TREE_DRAG_DATA_GET] =
-		gtk_signal_new ("tree_drag_data_get",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETreeClass, tree_drag_data_get),
-				e_marshal_NONE__INT_POINTER_INT_POINTER_POINTER_UINT_UINT,
-				GTK_TYPE_NONE, 7,
-				GTK_TYPE_INT,
-				GTK_TYPE_POINTER,
-				GTK_TYPE_INT,
-				GTK_TYPE_GDK_DRAG_CONTEXT,
-				GTK_TYPE_SELECTION_DATA,
-				GTK_TYPE_UINT,
-				GTK_TYPE_UINT);
-	et_signals[TREE_DRAG_DATA_DELETE] =
-		gtk_signal_new ("tree_drag_data_delete",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETreeClass, tree_drag_data_delete),
-				e_marshal_NONE__INT_POINTER_INT_POINTER,
-				GTK_TYPE_NONE, 4,
-				GTK_TYPE_INT,
-				GTK_TYPE_POINTER,
-				GTK_TYPE_INT,
-				GTK_TYPE_GDK_DRAG_CONTEXT);
-
-	et_signals[TREE_DRAG_LEAVE] =
-		gtk_signal_new ("tree_drag_leave",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETreeClass, tree_drag_leave),
-				e_marshal_NONE__INT_POINTER_INT_POINTER_UINT,
-				GTK_TYPE_NONE, 5,
-				GTK_TYPE_INT,
-				GTK_TYPE_POINTER,
-				GTK_TYPE_INT,
-				GTK_TYPE_GDK_DRAG_CONTEXT,
-				GTK_TYPE_UINT);
-	et_signals[TREE_DRAG_MOTION] =
-		gtk_signal_new ("tree_drag_motion",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETreeClass, tree_drag_motion),
-				e_marshal_BOOL__INT_POINTER_INT_POINTER_INT_INT_UINT,
-				GTK_TYPE_BOOL, 7,
-				GTK_TYPE_INT,
-				GTK_TYPE_POINTER,
-				GTK_TYPE_INT,
-				GTK_TYPE_GDK_DRAG_CONTEXT,
-				GTK_TYPE_INT,
-				GTK_TYPE_INT,
-				GTK_TYPE_UINT);
-	et_signals[TREE_DRAG_DROP] =
-		gtk_signal_new ("tree_drag_drop",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETreeClass, tree_drag_drop),
-				e_marshal_BOOL__INT_POINTER_INT_POINTER_INT_INT_UINT,
-				GTK_TYPE_BOOL, 7,
-				GTK_TYPE_INT,
-				GTK_TYPE_POINTER,
-				GTK_TYPE_INT,
-				GTK_TYPE_GDK_DRAG_CONTEXT,
-				GTK_TYPE_INT,
-				GTK_TYPE_INT,
-				GTK_TYPE_UINT);
-	et_signals[TREE_DRAG_DATA_RECEIVED] =
-		gtk_signal_new ("tree_drag_data_received",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETreeClass, tree_drag_data_received),
-				e_marshal_NONE__INT_POINTER_INT_POINTER_INT_INT_POINTER_UINT_UINT,
-				GTK_TYPE_NONE, 9,
-				GTK_TYPE_INT,
-				GTK_TYPE_POINTER,
-				GTK_TYPE_INT,
-				GTK_TYPE_GDK_DRAG_CONTEXT,
-				GTK_TYPE_INT,
-				GTK_TYPE_INT,
-				GTK_TYPE_SELECTION_DATA,
-				GTK_TYPE_UINT,
-				GTK_TYPE_UINT);
-
-	gtk_object_class_add_signals (object_class, et_signals, LAST_SIGNAL);
-
-	class->set_scroll_adjustments = set_scroll_adjustments;
-
-	widget_class->set_scroll_adjustments_signal =
-		gtk_signal_new ("set_scroll_adjustments",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETreeClass, set_scroll_adjustments),
-				gtk_marshal_NONE__POINTER_POINTER,
-				GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
-
-	gtk_object_add_arg_type ("ETree::length_threshold", GTK_TYPE_INT,
-				 GTK_ARG_WRITABLE, ARG_LENGTH_THRESHOLD);
-	gtk_object_add_arg_type ("ETree::horizontal_draw_grid", GTK_TYPE_BOOL,
-				 GTK_ARG_WRITABLE, ARG_HORIZONTAL_DRAW_GRID);
-	gtk_object_add_arg_type ("ETree::vertical_draw_grid", GTK_TYPE_BOOL,
-				 GTK_ARG_WRITABLE, ARG_VERTICAL_DRAW_GRID);
-	gtk_object_add_arg_type ("ETree::draw_focus", GTK_TYPE_BOOL,
-				 GTK_ARG_WRITABLE, ARG_DRAW_FOCUS);
-	gtk_object_add_arg_type ("ETree::ETreeTableAdapter", GTK_TYPE_OBJECT,
-				 GTK_ARG_READABLE, ARG_ETTA);
-}
-
-E_MAKE_TYPE(e_tree, "ETree", ETree, e_tree_class_init, e_tree_init, PARENT_TYPE);
diff --git a/widgets/table/e-tree.h b/widgets/table/e-tree.h
deleted file mode 100644
index 8034d43c95..0000000000
--- a/widgets/table/e-tree.h
+++ /dev/null
@@ -1,262 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_TREE_H_
-#define _E_TREE_H_
-
-#include <gtk/gtktable.h>
-#include <gnome-xml/tree.h>
-#include <libgnomeui/gnome-canvas.h>
-
-#include <gal/widgets/e-printable.h>
-
-#include <gal/e-table/e-table-extras.h>
-#include <gal/e-table/e-table-state.h>
-#include <gal/e-table/e-tree-model.h>
-
-#define E_TREE_USE_TREE_SELECTION
-
-#ifdef E_TREE_USE_TREE_SELECTION
-#include <gal/e-table/e-tree-selection-model.h>
-#endif
-
-BEGIN_GNOME_DECLS
-
-#define E_TREE_TYPE        (e_tree_get_type ())
-#define E_TREE(o)          (GTK_CHECK_CAST ((o), E_TREE_TYPE, ETree))
-#define E_TREE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_TREE_TYPE, ETreeClass))
-#define E_IS_TREE(o)       (GTK_CHECK_TYPE ((o), E_TREE_TYPE))
-#define E_IS_TREE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TREE_TYPE))
-
-typedef struct _ETreeDragSourceSite ETreeDragSourceSite;
-typedef struct ETreePriv ETreePriv;
-
-typedef struct {
-	GtkTable parent;
-
-	ETreePriv *priv;
-} ETree;
-
-typedef struct {
-	GtkTableClass parent_class;
-
-	void        (*cursor_change)      (ETree *et, int row, ETreePath path);
-	void        (*cursor_activated)   (ETree *et, int row, ETreePath path);
-	void        (*selection_change)   (ETree *et);
-	void        (*double_click)       (ETree *et, int row, ETreePath path, int col, GdkEvent *event);
-	gint        (*right_click)        (ETree *et, int row, ETreePath path, int col, GdkEvent *event);
-	gint        (*click)              (ETree *et, int row, ETreePath path, int col, GdkEvent *event);
-	gint        (*key_press)          (ETree *et, int row, ETreePath path, int col, GdkEvent *event);
-
-	void  (*set_scroll_adjustments)   (ETree	 *tree,
-					   GtkAdjustment *hadjustment,
-					   GtkAdjustment *vadjustment);
-
-	/* Source side drag signals */
-	void (* tree_drag_begin)	           (ETree	       *tree,
-						    int                 row,
-						    ETreePath           path,
-						    int                 col,
-						    GdkDragContext     *context);
-	void (* tree_drag_end)	           (ETree	       *tree,
-					    int                 row,
-					    ETreePath           path,
-					    int                 col,
-					    GdkDragContext     *context);
-	void (* tree_drag_data_get)             (ETree             *tree,
-						 int                 row,
-						 ETreePath           path,
-						 int                 col,
-						 GdkDragContext     *context,
-						 GtkSelectionData   *selection_data,
-						 guint               info,
-						 guint               time);
-	void (* tree_drag_data_delete)          (ETree	       *tree,
-						 int                 row,
-						 ETreePath           path,
-						 int                 col,
-						 GdkDragContext     *context);
-	
-	/* Target side drag signals */	   
-	void (* tree_drag_leave)	           (ETree	       *tree,
-						    int                 row,
-						    ETreePath           path,
-						    int                 col,
-						    GdkDragContext     *context,
-						    guint               time);
-	gboolean (* tree_drag_motion)           (ETree	       *tree,
-						 int                 row,
-						 ETreePath           path,
-						 int                 col,
-						 GdkDragContext     *context,
-						 gint                x,
-						 gint                y,
-						 guint               time);
-	gboolean (* tree_drag_drop)             (ETree	       *tree,
-						 int                 row,
-						 ETreePath           path,
-						 int                 col,
-						 GdkDragContext     *context,
-						 gint                x,
-						 gint                y,
-						 guint               time);
-	void (* tree_drag_data_received)        (ETree             *tree,
-						 int                 row,
-						 ETreePath           path,
-						 int                 col,
-						 GdkDragContext     *context,
-						 gint                x,
-						 gint                y,
-						 GtkSelectionData   *selection_data,
-						 guint               info,
-						 guint               time);
-} ETreeClass;
-
-GtkType         e_tree_get_type                   (void);
-ETree          *e_tree_construct                  (ETree                *e_tree,
-						   ETreeModel           *etm,
-						   ETableExtras         *ete,
-						   const char           *spec,
-						   const char           *state);
-GtkWidget      *e_tree_new                        (ETreeModel           *etm,
-						   ETableExtras         *ete,
-						   const char           *spec,
-						   const char           *state);
-
-/* Create an ETree using files. */
-ETree          *e_tree_construct_from_spec_file   (ETree                *e_tree,
-						   ETreeModel           *etm,
-						   ETableExtras         *ete,
-						   const char           *spec_fn,
-						   const char           *state_fn);
-GtkWidget      *e_tree_new_from_spec_file         (ETreeModel           *etm,
-						   ETableExtras         *ete,
-						   const char           *spec_fn,
-						   const char           *state_fn);
-
-/* To save the state */
-gchar          *e_tree_get_state                  (ETree                *e_tree);
-void            e_tree_save_state                 (ETree                *e_tree,
-						   const gchar          *filename);
-ETableState    *e_tree_get_state_object           (ETree                *e_tree);
-
-/* note that it is more efficient to provide the state at creation time */
-void            e_tree_set_state                  (ETree                *e_tree,
-						   const gchar          *state);
-void            e_tree_set_state_object           (ETree                *e_tree,
-						   ETableState          *state);
-void            e_tree_load_state                 (ETree                *e_tree,
-						   const gchar          *filename);
-void            e_tree_set_cursor                 (ETree                *e_tree,
-						   ETreePath             path);
-
-/* NULL means we don't have the cursor. */
-ETreePath       e_tree_get_cursor                 (ETree                *e_tree);
-void            e_tree_selected_row_foreach       (ETree                *e_tree,
-						   EForeachFunc          callback,
-						   gpointer              closure);
-#ifdef E_TREE_USE_TREE_SELECTION
-void            e_tree_selected_path_foreach      (ETree                *e_tree,
-						   ETreeForeachFunc      callback,
-						   gpointer              closure);
-#endif
-gint            e_tree_selected_count             (ETree                *e_tree);
-EPrintable     *e_tree_get_printable              (ETree                *e_tree);
-gint            e_tree_get_next_row               (ETree                *e_tree,
-						   gint                  model_row);
-gint            e_tree_get_prev_row               (ETree                *e_tree,
-						   gint                  model_row);
-gint            e_tree_model_to_view_row          (ETree                *e_tree,
-						   gint                  model_row);
-gint            e_tree_view_to_model_row          (ETree                *e_tree,
-						   gint                  view_row);
-void            e_tree_get_cell_at                (ETree                *tree,
-						   int                   x,
-						   int                   y,
-						   int                  *row_return,
-						   int                  *col_return);
-void            e_tree_get_cell_geometry          (ETree                *tree,
-						   int                   row,
-						   int                   col,
-						   int                  *x_return,
-						   int                  *y_return,
-						   int                  *width_return,
-						   int                  *height_return);
-
-/* Useful accessors */
-ETreeModel *    e_tree_get_model                  (ETree *et);
-ESelectionModel *e_tree_get_selection_model       (ETree *et);
-
-/* Drag & drop stuff. */
-/* Target */
-void            e_tree_drag_get_data              (ETree                *tree,
-						   int                   row,
-						   int                   col,
-						   GdkDragContext       *context,
-						   GdkAtom               target,
-						   guint32               time);
-void            e_tree_drag_highlight             (ETree                *tree,
-						   int                   row,
-						   int                   col); /* col == -1 to highlight entire row. */
-void            e_tree_drag_unhighlight           (ETree                *tree);
-void            e_tree_drag_dest_set              (ETree                *tree,
-						   GtkDestDefaults       flags,
-						   const GtkTargetEntry *targets,
-						   gint                  n_targets,
-						   GdkDragAction         actions);
-void            e_tree_drag_dest_set_proxy        (ETree                *tree,
-						   GdkWindow            *proxy_window,
-						   GdkDragProtocol       protocol,
-						   gboolean              use_coordinates);
-
-/* There probably should be functions for setting the targets
- * as a GtkTargetList
- */
-void            e_tree_drag_dest_unset            (GtkWidget            *widget);
-
-/* Source side */
-void            e_tree_drag_source_set            (ETree                *tree,
-						   GdkModifierType       start_button_mask,
-						   const GtkTargetEntry *targets,
-						   gint                  n_targets,
-						   GdkDragAction         actions);
-void            e_tree_drag_source_unset          (ETree                *tree);
-
-/* There probably should be functions for setting the targets
- * as a GtkTargetList
- */
-GdkDragContext *e_tree_drag_begin                 (ETree                *tree,
-						   int                   row,
-						   int                   col,
-						   GtkTargetList        *targets,
-						   GdkDragAction         actions,
-						   gint                  button,
-                                                   GdkEvent             *event);
-
-/* Adapter functions */
-gboolean        e_tree_node_is_expanded           (ETree                *et,
-						   ETreePath             path);
-void            e_tree_node_set_expanded          (ETree                *et,
-						   ETreePath             path,
-						   gboolean              expanded);
-void            e_tree_node_set_expanded_recurse  (ETree                *et,
-						   ETreePath             path,
-						   gboolean              expanded);
-void            e_tree_root_node_set_visible      (ETree                *et,
-						   gboolean              visible);
-ETreePath       e_tree_node_at_row                (ETree                *et,
-						   int                   row);
-int             e_tree_row_of_node                (ETree                *et,
-						   ETreePath             path);
-gboolean        e_tree_root_node_is_visible       (ETree                *et);
-void            e_tree_show_node                  (ETree                *et,
-						   ETreePath             path);
-void            e_tree_save_expanded_state        (ETree                *et,
-						   char                 *filename);
-void            e_tree_load_expanded_state        (ETree                *et,
-						   char                 *filename);
-int             e_tree_row_count                  (ETree                *et);
-GtkWidget      *e_tree_get_tooltip                (ETree                *et);
-
-END_GNOME_DECLS
-
-#endif /* _E_TREE_H_ */
-
diff --git a/widgets/table/image1.png b/widgets/table/image1.png
deleted file mode 100644
index 8326ac241f..0000000000
--- a/widgets/table/image1.png
+++ /dev/null
diff --git a/widgets/table/image2.png b/widgets/table/image2.png
deleted file mode 100644
index e6a4c75dbe..0000000000
--- a/widgets/table/image2.png
+++ /dev/null
diff --git a/widgets/table/image3.png b/widgets/table/image3.png
deleted file mode 100644
index 50e16e8620..0000000000
--- a/widgets/table/image3.png
+++ /dev/null
diff --git a/widgets/table/remove-col.xpm b/widgets/table/remove-col.xpm
deleted file mode 100644
index ff1024f0c9..0000000000
--- a/widgets/table/remove-col.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * remove_col_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000",
-"+	c #FF0000",
-"...          ...",
-".++.        .++.",
-".+++.      .+++.",
-" .+++.    .+++. ",
-"  .+++.  .+++.  ",
-"   .+++..+++.   ",
-"    .++++++.    ",
-"     .++++.     ",
-"     .++++.     ",
-"    .++++++.    ",
-"   .+++..+++.   ",
-"  .+++.  .+++.  ",
-" .+++.    .+++. ",
-".+++.      .+++.",
-".++.        .++.",
-"...          ..."};
diff --git a/widgets/table/sample.table b/widgets/table/sample.table
deleted file mode 100644
index 45c8ff0691..0000000000
--- a/widgets/table/sample.table
+++ /dev/null
@@ -1,11 +0,0 @@
-Col1	Col2	Address		Title	Dorks
-c1.a	c2.a	a.a		tit-1	DorkA
-c1.b	c2.b	a.b		tit-2	DDork
-c1.c	c2.c	a.c		tit-1	DorkB
-c1.d	c2.d	a.d		tit-2	ADork
-c1.e	c2.e	a.e		tit-1	DorkC
-c1.f	c2.f	a.f		tit-2	UDork
-c1.g	c2.g	a.g		tit-3	Dork---
-j	k	k		tit-1	DorkA
-
-
diff --git a/widgets/table/spec.xml b/widgets/table/spec.xml
deleted file mode 100644
index a8e524484c..0000000000
--- a/widgets/table/spec.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<ETableSpecification no-headers="false" click-to-add="false"
-		     draw-grid="true" cursor-mode="simple"
-		     _click-to-add-message="">
-  <ETableColumn model_col="0" _title="Email"     expansion="1.0" minimum_width="20" resizable="true" cell="cell_left_just" compare="string"/>
-  <ETableColumn model_col="1" _title="Full Name" expansion="1.0" minimum_width="20" resizable="true" cell="cell_left_just" compare="string"/>
-  <ETableColumn model_col="2" _title="Address"   expansion="1.0" minimum_width="20" resizable="true" cell="cell_left_just" compare="string"/>
-  <ETableColumn model_col="3" _title="Phone"     expansion="1.0" minimum_width="20" resizable="true" cell="cell_left_just" compare="string"/>
-  <ETableState>
-    <column source="0"/>
-    <column source="3"/>
-    <column source="1"/>
-    <column source="2"/>
-    <grouping>
-      <group column="2" ascending="true">
-	<leaf column="1" ascending="true"/>
-      </group>
-    </grouping>
-    <!-- Column that's been added by hand.  Not implemented yet.
-  <ETableColumn model_col="custom-string" _title="Custom" expansion="1.0" minimum_widgth="20" resizable="true" cell="string" compare="string"/> -->
-  </ETableState>
-</ETableSpecification>
diff --git a/widgets/table/table-test.c b/widgets/table/table-test.c
deleted file mode 100644
index dd0dee4d24..0000000000
--- a/widgets/table/table-test.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Test code for the ETable package
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- */
-#include <config.h>
-#include <stdio.h>
-#include <string.h>
-#include <fcntl.h>
-#include <gnome.h>
-#include "gal/e-util/e-cursors.h"
-#include "table-test.h"
-
-int
-main (int argc, char *argv [])
-{
-
-	if (isatty (0)){
-		int fd;
-		
-		close (0);
-		fd = open ("sample.table", O_RDONLY);
-		if (fd == -1){
-			fprintf (stderr, "Could not find sample.table, try feeding a table on stdin");
-			exit (1);
-		}
-		dup2 (fd, 0);
-	}
-	
-	gnome_init ("TableTest", "TableTest", argc, argv);
-	e_cursors_init ();
-
-
-/*  	table_browser_test (); */
-/*  	multi_cols_test (); */
-/*  	check_test (); */
-
-	e_table_test ();
-	
-	gtk_main ();
-
-	e_cursors_shutdown ();
-	return 0;
-}
diff --git a/widgets/table/table-test.h b/widgets/table/table-test.h
deleted file mode 100644
index ad8cfcc083..0000000000
--- a/widgets/table/table-test.h
+++ /dev/null
@@ -1,4 +0,0 @@
-void table_browser_test (void);
-void multi_cols_test    (void);
-void check_test         (void);
-void e_table_test       (void);
diff --git a/widgets/table/test-check.c b/widgets/table/test-check.c
deleted file mode 100644
index 0cf1baf48a..0000000000
--- a/widgets/table/test-check.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Test code for the ETable package
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- */
-#include <config.h>
-#include <stdio.h>
-#include <string.h>
-#include <gnome.h>
-#include "e-table-simple.h"
-#include "e-table-header.h"
-#include "e-table-header-item.h"
-#include "e-table-item.h"
-#include "gal/widgets/e-cursors.h"
-#include "gal/widgets/e-canvas-utils.h"
-#include "gal/widgets/e-canvas.h"
-#include "gal/util/e-util.h"
-#include "e-cell-text.h"
-#include "e-cell-checkbox.h"
-
-#include "table-test.h"
-
-#define LINES 4
-
-static struct {
-	int   value;
-	char *string;
-} my_table [LINES] = {
-	{ 0, "Buy food" },
-	{ 1, "Breathe " },
-	{ 0, "Cancel gdb session with shrink" },
-	{ 1, "Make screenshots" },
-};
-/*
- * ETableSimple callbacks
- */
-static int
-col_count (ETableModel *etc, void *data)
-{
-	return 2;
-}
-
-static int
-row_count (ETableModel *etc, void *data)
-{
-	return LINES;
-}
-
-static void *
-value_at (ETableModel *etc, int col, int row, void *data)
-{
-	g_assert (col < 2);
-	g_assert (row < LINES);
-
-	if (col == 0)
-		return GINT_TO_POINTER (my_table [row].value);
-	else
-		return my_table [row].string;
-	
-}
-
-static void
-set_value_at (ETableModel *etc, int col, int row, const void *val, void *data)
-{
-	g_assert (col < 2);
-	g_assert (row < LINES);
-
-	if (col == 0) {
-		my_table [row].value = GPOINTER_TO_INT (val);
-		printf ("Value at %d,%d set to %d\n", col, row, GPOINTER_TO_INT (val));
-	} else {
-		my_table [row].string = g_strdup (val);
-		printf ("Value at %d,%d set to %s\n", col, row, (char *) val);
-	}
-}
-
-static gboolean
-is_cell_editable (ETableModel *etc, int col, int row, void *data)
-{
-	return TRUE;
-}
-
-static void *
-duplicate_value (ETableModel *etc, int col, const void *value, void *data)
-{
-	if (col == 0) {
-		return (void *) value;
-	} else {
-		return g_strdup (value);
-	}
-}
-
-static void
-free_value (ETableModel *etc, int col, void *value, void *data)
-{
-	if (col != 0) {
-		g_free (value);
-	}
-}
-
-static void *
-initialize_value (ETableModel *etc, int col, void *data)
-{
-	if (col == 0)
-		return NULL;
-	else
-		return g_strdup ("");
-}
-
-static gboolean
-value_is_empty (ETableModel *etc, int col, const void *value, void *data)
-{
-	if (col == 0)
-		return value == NULL;
-	else
-		return !(value && *(char *)value);
-}
-
-static char *
-value_to_string (ETableModel *etc, int col, const void *value, void *data)
-{
-	if (col == 0)
-		return g_strdup_printf("%d", (int) value);
-	else
-		return g_strdup(value);
-}
-
-static void
-set_canvas_size (GnomeCanvas *canvas, GtkAllocation *alloc)
-{
-	gnome_canvas_set_scroll_region (canvas, 0, 0, alloc->width, alloc->height);
-}
-
-void
-check_test (void)
-{
-	GtkWidget *canvas, *window;
-	ETableModel *e_table_model;
-	ETableHeader *e_table_header;
-	ETableCol *col_0, *col_1;
-	ECell *cell_left_just, *cell_image_check;
-	GdkPixbuf *pixbuf;
-	GnomeCanvasItem *item;
-
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-	
-	e_table_model = e_table_simple_new (
-		col_count, row_count, value_at,
-		set_value_at, is_cell_editable, 
-		duplicate_value, free_value, 
-		initialize_value, value_is_empty,
-		value_to_string,
-		NULL);
-
-	/*
-	 * Header
-	 */
-	e_table_header = e_table_header_new ();
-
-	cell_left_just = e_cell_text_new (e_table_model, NULL, GTK_JUSTIFY_LEFT);
-
-	cell_image_check = e_cell_checkbox_new ();
-	pixbuf = gdk_pixbuf_new_from_file ("clip.png");
-	col_0 = e_table_col_new_with_pixbuf (0, pixbuf, 0.0, 18, cell_image_check, g_int_compare, TRUE);
-	gdk_pixbuf_unref (pixbuf);
-	e_table_header_add_column (e_table_header, col_0, 0);
-	
-	col_1 = e_table_col_new (1, "Item Name", 1.0, 20, cell_left_just, g_str_compare, TRUE);
-	e_table_header_add_column (e_table_header, col_1, 1);
-	e_table_col_set_arrow (col_1, E_TABLE_COL_ARROW_DOWN);
-
-	/*
-	 * GUI
-	 */
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	canvas = e_canvas_new ();
-
-	gtk_signal_connect (GTK_OBJECT (canvas), "size_allocate",
-			    GTK_SIGNAL_FUNC (set_canvas_size), NULL);
-	
-	gtk_container_add (GTK_CONTAINER (window), canvas);
-	gtk_widget_show_all (window);
-	gnome_canvas_item_new (
-		gnome_canvas_root (GNOME_CANVAS (canvas)),
-		e_table_header_item_get_type (),
-		"ETableHeader", e_table_header,
-		NULL);
-
-	item = gnome_canvas_item_new (
-		gnome_canvas_root (GNOME_CANVAS (canvas)),
-		e_table_item_get_type (),
-		"ETableHeader", e_table_header,
-		"ETableModel", e_table_model,
-		"drawgrid", TRUE,
-		"drawfocus", TRUE,
-#if 0
-		"spreadsheet", TRUE,
-#endif
-		"cursor_mode", E_TABLE_CURSOR_SIMPLE,
-		NULL);
-	e_canvas_item_move_absolute (item, 0, 30);
-}
-
diff --git a/widgets/table/test-cols.c b/widgets/table/test-cols.c
deleted file mode 100644
index a82dae639a..0000000000
--- a/widgets/table/test-cols.c
+++ /dev/null
@@ -1,250 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Test code for the ETable package
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- */
-#include <config.h>
-#include <stdio.h>
-#include <string.h>
-#include <gnome.h>
-#include "gal/widgets/e-canvas-utils.h"
-#include "gal/widgets/e-canvas.h"
-#include "gal/widgets/e-cursors.h"
-#include "gal/util/e-util.h"
-#include "e-table-simple.h"
-#include "e-table-header.h"
-#include "e-table-header-item.h"
-#include "e-table-item.h"
-#include "e-cell-text.h"
-#include "e-cell-toggle.h"
-
-#include "table-test.h"
-
-#define LINES 4
-
-static struct {
-	int   value;
-	char *string;
-} my_table [LINES] = {
-	{ 0, "You are not" },
-	{ 1, "A beautiful and unique " },
-	{ 0, "Snowflake" },
-	{ 2, "You are not your wallet" },
-};
-/*
- * ETableSimple callbacks
- */
-static int
-col_count (ETableModel *etc, void *data)
-{
-	return 2;
-}
-
-static int
-row_count (ETableModel *etc, void *data)
-{
-	return LINES;
-}
-
-static void *
-value_at (ETableModel *etc, int col, int row, void *data)
-{
-	g_assert (col < 2);
-	g_assert (row < LINES);
-
-	if (col == 0)
-		return GINT_TO_POINTER (my_table [row].value);
-	else
-		return my_table [row].string;
-	
-}
-
-static void
-set_value_at (ETableModel *etc, int col, int row, const void *val, void *data)
-{
-	g_assert (col < 2);
-	g_assert (row < LINES);
-
-	if (col == 0){
-		my_table [row].value = GPOINTER_TO_INT (val);
-		printf ("Value at %d,%d set to %d\n", col, row, GPOINTER_TO_INT (val));
-	} else {
-		my_table [row].string = g_strdup (val);
-		printf ("Value at %d,%d set to %s\n", col, row, (char *) val);
-	}
-}
-
-static gboolean
-is_cell_editable (ETableModel *etc, int col, int row, void *data)
-{
-	return TRUE;
-}
-
-static void *
-duplicate_value (ETableModel *etc, int col, const void *value, void *data)
-{
-	if (col == 0){
-		return (void *)value;
-	} else {
-		return g_strdup (value);
-	}
-}
-
-static void
-free_value (ETableModel *etc, int col, void *value, void *data)
-{
-	if (col != 0){
-		g_free (value);
-	}
-}
-
-static void *
-initialize_value (ETableModel *etc, int col, void *data)
-{
-	if (col == 0)
-		return NULL;
-	else
-		return g_strdup ("");
-}
-
-static gboolean
-value_is_empty (ETableModel *etc, int col, const void *value, void *data)
-{
-	if (col == 0)
-		return value == NULL;
-	else
-		return !(value && *(char *)value);
-}
-
-static char *
-value_to_string (ETableModel *etc, int col, const void *value, void *data)
-{
-	if (col == 0)
-		return g_strdup_printf("%d", (int) value);
-	else
-		return g_strdup(value);
-}
-
-static void
-set_canvas_size (GnomeCanvas *canvas, GtkAllocation *alloc)
-{
-	gnome_canvas_set_scroll_region (canvas, 0, 0, alloc->width, alloc->height);
-}
-
-void
-multi_cols_test (void)
-{
-	GtkWidget *canvas, *window;
-	ETableModel *e_table_model;
-	ETableHeader *e_table_header, *e_table_header_multiple;
-	ETableCol *col_0, *col_1;
-	ECell *cell_left_just, *cell_image_toggle;
-	GnomeCanvasItem *item;
-
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-	
-	e_table_model = e_table_simple_new (
-		col_count, row_count, value_at,
-		set_value_at, is_cell_editable,
-		duplicate_value, free_value,
-		initialize_value, value_is_empty,
-		value_to_string,
-		NULL);
-
-	/*
-	 * Header
-	 */
-	e_table_header = e_table_header_new ();
-
-	cell_left_just = e_cell_text_new (e_table_model, NULL, GTK_JUSTIFY_LEFT);
-
-	{
-		GdkPixbuf **images = g_new (GdkPixbuf *, 3);
-		int i;
-		
-		images [0] = gdk_pixbuf_new_from_file ("image1.png");
-		images [1] = gdk_pixbuf_new_from_file ("image2.png");
-		images [2] = gdk_pixbuf_new_from_file ("image3.png");
-
-		cell_image_toggle = e_cell_toggle_new (0, 3, images);
-
-		for (i = 0; i < 3; i++)
-			gdk_pixbuf_unref (images [i]);
-		
-		g_free (images);
-	} 
-					       
-	col_1 = e_table_col_new (1, "Item Name", 1.0, 20, cell_left_just, g_str_compare, TRUE);
-	e_table_header_add_column (e_table_header, col_1, 0);
-
-	col_0 = e_table_col_new (0, "A", 0.0, 48, cell_image_toggle, g_int_compare, TRUE);
-	e_table_header_add_column (e_table_header, col_0, 1);
-
-	/*
-	 * Second test
-	 */
-	e_table_header_multiple = e_table_header_new ();
-	e_table_header_add_column (e_table_header_multiple, col_0, 0);
-	e_table_header_add_column (e_table_header_multiple, col_1, 1);
-	e_table_header_add_column (e_table_header_multiple, col_1, 2);
-	
-	/*
-	 * GUI
-	 */
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	canvas = e_canvas_new ();
-
-	gtk_signal_connect (GTK_OBJECT (canvas), "size_allocate",
-			    GTK_SIGNAL_FUNC (set_canvas_size), NULL);
-	
-	gtk_container_add (GTK_CONTAINER (window), canvas);
-	gtk_widget_show_all (window);
-
-	gnome_canvas_item_new (
-		gnome_canvas_root (GNOME_CANVAS (canvas)),
-		e_table_header_item_get_type (),
-		"ETableHeader", e_table_header,
-		NULL);
-
-	item = gnome_canvas_item_new (
-		gnome_canvas_root (GNOME_CANVAS (canvas)),
-		e_table_item_get_type (),
-		"ETableHeader", e_table_header,
-		"ETableModel", e_table_model,
-		"drawgrid", TRUE,
-		"drawfocus", TRUE,
-		"cursor_mode", E_TABLE_CURSOR_SIMPLE,
-#if 0
-		"spreadsheet", TRUE,
-#endif
-		NULL);
-
-	e_canvas_item_move_absolute (item, 0, 30);
-	
-	gnome_canvas_item_new (
-		gnome_canvas_root (GNOME_CANVAS (canvas)),
-		e_table_header_item_get_type (),
-		"ETableHeader", e_table_header_multiple,
-		NULL);
-	item = gnome_canvas_item_new (
-		gnome_canvas_root (GNOME_CANVAS (canvas)),
-		e_table_item_get_type (),
-		"ETableHeader", e_table_header_multiple,
-		"ETableModel", e_table_model,
-		"drawgrid", TRUE,
-		"drawfocus", TRUE,
-#if 0
-		"spreadsheet", TRUE,
-#endif
-		"cursor_mode", E_TABLE_CURSOR_SIMPLE,
-		NULL);
-	e_canvas_item_move_absolute (item, 300, 30);
-}
-
-
-
-
-
diff --git a/widgets/table/test-table.c b/widgets/table/test-table.c
deleted file mode 100644
index 314df1000e..0000000000
--- a/widgets/table/test-table.c
+++ /dev/null
@@ -1,394 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Test code for the ETable package
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- */
-#include <config.h>
-#include <stdio.h>
-#include <string.h>
-#include <gnome.h>
-#include "gal/widgets/e-cursors.h"
-#include "gal/widgets/e-canvas.h"
-#include "e-table-simple.h"
-#include "e-table-header.h"
-#include "e-table-header-item.h"
-#include "e-table-item.h"
-#include "e-cell-text.h"
-#include "e-table.h"
-#include "e-table-config.h"
-
-#include "table-test.h"
-
-char buffer [1024];
-char **column_labels;
-char ***table_data;
-int cols = 0;
-int lines = 0;
-int lines_alloc = 0;
-
-static void
-parse_headers ()
-{
-	char *p, *s;
-	int in_value = 0, i;
-	
-	fgets (buffer, sizeof (buffer)-1, stdin);
-
-	for (p = buffer; *p; p++){
-		if (*p == ' ' || *p == '\t'){
-			if (in_value){
-				cols++;
-				in_value = 0;
-			}
-		} else
-			in_value = 1;
-	}
-	if (in_value)
-		cols++;
-	
-	if (!cols){
-		fprintf (stderr, "No columns in first row\n");
-		exit (1);
-	}
-
-	column_labels = g_new0 (char *, cols);
-
-	p = buffer;
-	for (i = 0; (s = strtok (p, " \t")) != NULL; i++){
-		column_labels [i] = g_strdup (s);
-		if (strchr (column_labels [i], '\n'))
-			*strchr (column_labels [i], '\n') = 0;
-		p = NULL;
-	}
-
-	printf ("%d headers:\n", cols);
-	for (i = 0; i < cols; i++){
-		printf ("header %d: %s\n", i, column_labels [i]);
-	}
-}
-
-static char **
-load_line (char *buffer, int cols)
-{
-	char **line = g_new0 (char *, cols);
-	char *p;
-	int i;
-	
-	for (i = 0; i < cols; i++){
-		p = strtok (buffer, " \t\n");
-		if (p == NULL){
-			for (; i < cols; i++)
-				line [i] = g_strdup ("");
-			return line;
-		} else
-			line [i] = g_strdup (p);
-		buffer = NULL;
-	}
-	return line;
-}
-
-static void
-append_line (char **line)
-{
-	if (lines <= lines_alloc){
-		lines_alloc = lines + 50;
-		table_data = g_renew (char **, table_data, lines_alloc);
-	}
-	table_data [lines] = line;
-	lines++;
-}
-
-static void
-load_data ()
-{
-	int i;
-
-	{
-		static int loaded;
-
-		if (loaded)
-			return;
-		
-		loaded = TRUE;
-	}
-	
-
-	parse_headers ();
-
-	while (fgets (buffer, sizeof (buffer)-1, stdin) != NULL){
-		char **line;
-
-		if (buffer [0] == '\n')
-			continue;
-		line = load_line (buffer, cols);
-		append_line (line);
-	}
-
-	for (i = 0; i < lines; i++){
-		int j;
-
-		printf ("Line %d: ", i);
-		for (j = 0; j < cols; j++)
-			printf ("[%s] ", table_data [i][j]);
-		printf ("\n");
-	}
-}
-
-/*
- * ETableSimple callbacks
- */
-static int
-col_count (ETableModel *etc, void *data)
-{
-	return cols;
-}
-
-static int
-row_count (ETableModel *etc, void *data)
-{
-	return lines;
-}
-
-static void *
-value_at (ETableModel *etc, int col, int row, void *data)
-{
-	g_assert (col < cols);
-	g_assert (row < lines);
-
-	return (void *) table_data [row][col];
-}
-
-static void
-set_value_at (ETableModel *etc, int col, int row, const void *val, void *data)
-{
-	g_assert (col < cols);
-	g_assert (row < lines);
-
-	g_free (table_data [row][col]);
-	table_data [row][col] = g_strdup (val);
-
-	printf ("Value at %d,%d set to %s\n", col, row, (char *) val);
-}
-
-static gboolean
-is_cell_editable (ETableModel *etc, int col, int row, void *data)
-{
-	return TRUE;
-}
-
-static void *
-duplicate_value (ETableModel *etc, int col, const void *value, void *data)
-{
-	return g_strdup (value);
-}
-
-static void
-free_value (ETableModel *etc, int col, void *value, void *data)
-{
-	g_free (value);
-}
-
-static void *
-initialize_value (ETableModel *etc, int col, void *data)
-{
-	return g_strdup ("");
-}
-
-static gboolean
-value_is_empty (ETableModel *etc, int col, const void *value, void *data)
-{
-	return !(value && *(char *)value);
-}
-
-static char *
-value_to_string (ETableModel *etc, int col, const void *value, void *data)
-{
-	return g_strdup(value);
-}
-
-static void
-set_canvas_size (GnomeCanvas *canvas, GtkAllocation *alloc)
-{
-	gnome_canvas_set_scroll_region (canvas, 0, 0, alloc->width, alloc->height);
-}
-
-void
-table_browser_test (void)
-{
-	GtkWidget *canvas, *window;
-	ETableModel *e_table_model;
-	ETableHeader *e_table_header;
-	ECell *cell_left_just;
-	GnomeCanvasItem *group;
-	int i;	
-
-	load_data ();
-
-	/*
-	 * Data model
-	 */
-	e_table_model = e_table_simple_new (
-		col_count, row_count, value_at,
-		set_value_at, is_cell_editable,
-		duplicate_value, free_value,
-		initialize_value, value_is_empty,
-		value_to_string,
-		NULL);
-
-	/*
-	 * Header
-	 */
-	e_table_header = e_table_header_new ();
-	cell_left_just = e_cell_text_new (e_table_model, NULL, GTK_JUSTIFY_LEFT);
-	
-	for (i = 0; i < cols; i++){
-		ETableCol *ecol = e_table_col_new (
-			i, column_labels [i],
-			1.0, 20, cell_left_just,
-			g_str_compare, TRUE);
-
-		e_table_header_add_column (e_table_header, ecol, i);
-	}
-
-	/*
-	 * Setup GUI
-	 */
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	canvas = e_canvas_new ();
-
-	gtk_signal_connect (GTK_OBJECT (canvas), "size_allocate",
-			    GTK_SIGNAL_FUNC (set_canvas_size), NULL);
-	
-	gtk_container_add (GTK_CONTAINER (window), canvas);
-	gtk_widget_show_all (window);
-	gnome_canvas_item_new (
-		gnome_canvas_root (GNOME_CANVAS (canvas)),
-		e_table_header_item_get_type (),
-		"ETableHeader", e_table_header,
-		NULL);
-
-	group = gnome_canvas_item_new (
-		gnome_canvas_root (GNOME_CANVAS (canvas)),
-		gnome_canvas_group_get_type (),
-		"x", 30.0,
-		"y", 30.0,
-		NULL);
-	
-	gnome_canvas_item_new (
-		GNOME_CANVAS_GROUP (group),
-		e_table_item_get_type (),
-		"ETableHeader", e_table_header,
-		"ETableModel", e_table_model,
-		"drawgrid", TRUE,
-		"drawfocus", TRUE,
-#if 0
-		"spreadsheet", TRUE,
-#endif
-		NULL);
-}
-
-static void
-save_spec (GtkWidget *button, ETable *e_table)
-{
-	e_table_save_specification (e_table, "e-table-test.xml");
-}
-
-static void
-row_selection_test (ETable *table, int row, gboolean selected)
-{
-	if (selected)
-		g_print ("Row %d selected\n", row);
-	else
-		g_print ("Row %d unselected\n", row);
-}
-
-static void
-toggle_grid (void *nothing, ETable *etable)
-{
-	static gboolean shown;
-
-	gtk_object_get (GTK_OBJECT (etable), "drawgrid", &shown, NULL);
-	gtk_object_set (GTK_OBJECT (etable), "drawgrid", !shown, NULL);
-}
-
-static void
-do_e_table_demo (const char *spec)
-{
-	GtkWidget *e_table, *window, *frame, *vbox, *button, *bhide;
-	ECell *cell_left_just;
-	ETableHeader *full_header;
-	int i;
-	
-	/*
-	 * Data model
-	 */
-	static ETableModel *e_table_model = NULL;
-
-	if (e_table_model == NULL)
-		e_table_model = 
-			e_table_simple_new (col_count, row_count, value_at,
-					    set_value_at, is_cell_editable,
-					    duplicate_value, free_value,
-					    initialize_value, value_is_empty,
-					    value_to_string,
-					    NULL);
-
-	full_header = e_table_header_new ();
-	cell_left_just = e_cell_text_new (e_table_model, NULL, GTK_JUSTIFY_LEFT);
-
-	for (i = 0; i < cols; i++){
-		ETableCol *ecol = e_table_col_new (
-			i, column_labels [i],
-			1.0, 20, cell_left_just,
-			g_str_compare, TRUE);
-
-		e_table_header_add_column (full_header, ecol, i);
-	}
-	
-	
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	frame = gtk_frame_new (NULL);
-	e_table = e_table_new (full_header, e_table_model, spec);
-	gtk_signal_connect (GTK_OBJECT(e_table), "row_selection",
-			   GTK_SIGNAL_FUNC(row_selection_test), NULL);
-
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), e_table, TRUE, TRUE, 0);
-	gtk_container_add (GTK_CONTAINER (frame), vbox);
-	gtk_container_add (GTK_CONTAINER (window), frame);
-
-	/*
-	 * gadgets
-	 */
-	button = gtk_button_new_with_label ("Save spec");
-	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			    GTK_SIGNAL_FUNC (save_spec), e_table);
-	gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
-
-	bhide = gtk_button_new_with_label ("Toggle Grid");
-	gtk_signal_connect (GTK_OBJECT (bhide), "clicked",
-			    GTK_SIGNAL_FUNC (toggle_grid), e_table);
-	gtk_box_pack_start (GTK_BOX (vbox), bhide, FALSE, FALSE, 0);
-
-	gtk_widget_set_usize (window, 200, 200);
-	gtk_widget_show_all (window);
-
-	if (getenv ("TEST")){
-		e_table_do_gui_config (NULL, E_TABLE(e_table));
-	}
-}
-
-void
-e_table_test (void)
-{
-	load_data ();
-
-	if (1){/*getenv ("DO")){*/
-	  do_e_table_demo ("<ETableSpecification> <columns-shown> <column> 0 </column> <column> 1 </column> <column> 2 </column> <column> 3 </column> <column> 4 </column> </columns-shown> <grouping> <leaf column=\"3\" ascending=\"true\"/> </grouping> </ETableSpecification>");
-	  do_e_table_demo ("<ETableSpecification> <columns-shown> <column> 0 </column> <column> 0 </column> <column> 1 </column> <column> 2 </column> <column> 3 </column> <column> 4 </column> </columns-shown> <grouping> <group column=\"3\" ascending=\"true\"> <group column=\"4\" ascending=\"false\"> <leaf column=\"2\" ascending=\"true\"/> </group> </group> </grouping> </ETableSpecification>");
-	}
-	  do_e_table_demo ("<ETableSpecification> <columns-shown> <column> 0 </column> <column> 1 </column> <column> 2 </column> <column> 3 </column> <column> 4 </column> </columns-shown> <grouping> <group column=\"4\" ascending=\"true\"> <leaf column=\"2\" ascending=\"true\"/> </group> </grouping> </ETableSpecification>");
-	  do_e_table_demo ("<ETableSpecification> <columns-shown> <column> 0 </column> <column> 1 </column> <column> 2 </column> <column> 3 </column> <column> 4 </column> </columns-shown> <grouping> <group column=\"3\" ascending=\"true\"> <leaf column=\"2\" ascending=\"true\"/> </group> </grouping> </ETableSpecification>");
-}
diff --git a/widgets/table/tree-expanded.xpm b/widgets/table/tree-expanded.xpm
deleted file mode 100644
index d9bda3694d..0000000000
--- a/widgets/table/tree-expanded.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * tree_expanded_xpm[] = {
-"16 16 4 1",
-" 	c None",
-".	c #FFFFFF",
-"*      c #000000",
-"+	c #666666",
-"                ",
-"                ",
-"                ",
-"                ",
-"    +++++++++   ",
-"    +.......+   ",
-"    +.......+   ",
-"    +.......+   ",
-"    +.*****.+   ",
-"    +.......+   ",
-"    +.......+   ",
-"    +.......+   ",
-"    +++++++++   ",
-"                ",
-"                ",
-"                "};
diff --git a/widgets/table/tree-unexpanded.xpm b/widgets/table/tree-unexpanded.xpm
deleted file mode 100644
index e1b48448ba..0000000000
--- a/widgets/table/tree-unexpanded.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * tree_unexpanded_xpm[] = {
-"16 16 4 1",
-" 	c None",
-".	c #FFFFFF",
-"*      c #000000",
-"+	c #666666",
-"                ",
-"                ",
-"                ",
-"                ",
-"    +++++++++   ",
-"    +.......+   ",
-"    +...*...+   ",
-"    +...*...+   ",
-"    +.*****.+   ",
-"    +...*...+   ",
-"    +...*...+   ",
-"    +.......+   ",
-"    +++++++++   ",
-"                ",
-"                ",
-"                "};
diff --git a/widgets/text/.cvsignore b/widgets/text/.cvsignore
deleted file mode 100644
index 792b9f5af2..0000000000
--- a/widgets/text/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-e-text-test
-e-entry-test
-e-text-model-test
-e-completion-test
\ No newline at end of file
diff --git a/widgets/text/e-completion-match.c b/widgets/text/e-completion-match.c
deleted file mode 100644
index 6e7863f887..0000000000
--- a/widgets/text/e-completion-match.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-completion-match.c
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- * 
- * 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.
- */
-
-#include <config.h>
-#include <gal/unicode/gunicode.h>
-#include <gal/widgets/e-unicode.h>
-#include "e-completion-match.h"
-
-static void
-e_completion_match_destroy (ECompletionMatch *match)
-{
-	if (match) {
-		g_free (match->match_text);
-		g_free (match->menu_text);
-		if (match->destroy)
-			match->destroy (match);
-		g_free (match);
-	}
-}
-
-void
-e_completion_match_construct (ECompletionMatch *match)
-{
-	g_return_if_fail (match != NULL);
-	
-	match->match_text = NULL;
-	match->menu_text = NULL;
-	match->score = 0;
-	match->sort_major = 0;
-	match->sort_minor = 0;
-	match->user_data = NULL;
-	match->ref = 1;
-	match->destroy = NULL;
-}
-
-void
-e_completion_match_ref (ECompletionMatch *match)
-{
-	g_return_if_fail (match != NULL);
-	g_return_if_fail (match->ref > 0);
-
-	++match->ref;
-}
-
-void
-e_completion_match_unref (ECompletionMatch *match)
-{
-	if (match) {
-		g_return_if_fail (match->ref > 0);
-
-		--match->ref;
-		if (match->ref == 0) {
-			e_completion_match_destroy (match);
-		}
-	}
-}
-
-void
-e_completion_match_set_text (ECompletionMatch *match,
-			     const gchar *match_text,
-			     const gchar *menu_text)
-{
-	gchar *to_be_freed_match_text;
-	gchar *to_be_freed_menu_text;
-
-	g_return_if_fail (match != NULL);
-
-	to_be_freed_match_text = match->match_text;
-	to_be_freed_menu_text  = match->menu_text;
-
-	if (match_text == NULL) {
-		match_text = "Unknown_Match";
-	} else if (! g_utf8_validate (match_text, 0, NULL)) {
-		match_text = "Invalid_UTF8";
-	}
-
-	if (menu_text == NULL) {
-		menu_text = match_text;
-	} else if (! g_utf8_validate (menu_text, 0, NULL)) {
-		menu_text = "Invalid_UTF8";
-	}
-
-	match->match_text = g_strdup (match_text);
-	match->menu_text  = g_strdup (menu_text);
-
-	g_free (to_be_freed_match_text);
-	g_free (to_be_freed_menu_text);
-}
-
-const gchar *
-e_completion_match_get_match_text (ECompletionMatch *match)
-{
-	return match ? match->match_text : "NULL_Match";
-}
-
-const gchar *
-e_completion_match_get_menu_text (ECompletionMatch *match)
-{
-	return match ? match->menu_text : "NULL_Match";
-}
-
-gint
-e_completion_match_compare (const ECompletionMatch *a, const ECompletionMatch *b)
-{
-	gint rv;
-
-	/* Deal with NULL arguments. */
-	if (!(a || b)) {
-		if (!(a && b))
-			return 0;
-		return a ? -1 : 1;
-	}
-
-	if ( (rv = (b->sort_major < a->sort_major) - (a->sort_major < b->sort_major)) )
-		return rv;
-
-	/* Sort the scores high->low. */
-	if ( (rv = (b->score > a->score) - (a->score > b->score)) )
-		return rv;
-
-	if ( (rv = (b->sort_minor < a->sort_minor) - (a->sort_minor < b->sort_minor)) )
-		return rv;
-
-	return 0;
-}
-
-gint
-e_completion_match_compare_alpha (const ECompletionMatch *a, const ECompletionMatch *b)
-{
-	gint rv, rv2;
-
-	/* Deal with NULL arguments. */
-	if (!(a || b)) {
-		if (!(a && b))
-			return 0;
-		return a ? -1 : 1;
-	}
-
-	/* The sort_major trumps everything. */
-	if ( (rv = (b->sort_major < a->sort_major) - (a->sort_major < b->sort_major)) )
-		return rv;
-
-	/* Sort the scores high->low. */
-	if ( (rv = (b->score > a->score) - (a->score > b->score)) )
-		return rv;
-
-	/* When the match text is the same, we use the minor fields */
-	rv2 = strcmp (a->match_text, b->match_text);
-	if ( !rv2 && (rv = (b->sort_minor < a->sort_minor) - (a->sort_minor < b->sort_minor)) )
-		return rv;
-
-	return strcmp (a->menu_text, b->menu_text);
-}
-
-ECompletionMatch *
-e_completion_match_new (const gchar *match_text, const gchar *menu_text, double score)
-{
-	ECompletionMatch *match = g_new0 (ECompletionMatch, 1);
-
-	e_completion_match_construct (match);
-	e_completion_match_set_text (match, match_text, menu_text);
-	match->score = score;
-
-	return match;
-}
diff --git a/widgets/text/e-completion-match.h b/widgets/text/e-completion-match.h
deleted file mode 100644
index 4ec1733aca..0000000000
--- a/widgets/text/e-completion-match.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-completion-match.h
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- * 
- * 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.
- */
-
-#ifndef __E_COMPLETION_MATCH_H__
-#define __E_COMPLETION_MATCH_H__
-
-#include <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <gtk/gtkwidget.h>
-
-BEGIN_GNOME_DECLS
-
-typedef struct _ECompletionMatch ECompletionMatch;
-
-struct _ECompletionMatch {
-	gchar *match_text; /* in utf8 */
-	gchar *menu_text;  /* in utf8 */
-	double score;
-	gint sort_major;
-	gint sort_minor;
-	gpointer user_data;
-
-	gint ref;
-	void (*destroy) (ECompletionMatch *);
-};
-
-typedef void (*ECompletionMatchFn) (ECompletionMatch *, gpointer closure);
-
-void              e_completion_match_construct     (ECompletionMatch *);
-void              e_completion_match_ref           (ECompletionMatch *);
-void              e_completion_match_unref         (ECompletionMatch *);
-
-void              e_completion_match_set_text       (ECompletionMatch *, const gchar *match_text, const gchar *label_text);
-const gchar      *e_completion_match_get_match_text (ECompletionMatch *);
-const gchar      *e_completion_match_get_menu_text  (ECompletionMatch *);
-
-gint              e_completion_match_compare        (const ECompletionMatch *, const ECompletionMatch *);
-gint              e_completion_match_compare_alpha  (const ECompletionMatch *, const ECompletionMatch *);
-
-ECompletionMatch *e_completion_match_new            (const gchar *match_text, const gchar *menu_text, double score);
-
-
-
-
-END_GNOME_DECLS
-
-#endif /* __E_COMPLETION_MATCH_H__ */
-
diff --git a/widgets/text/e-completion-test.c b/widgets/text/e-completion-test.c
deleted file mode 100644
index 7a5ed920cd..0000000000
--- a/widgets/text/e-completion-test.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
-  ECompleteTest
-*/
-
-#include <gnome.h>
-#include "e-completion.h"
-#include "e-entry.h"
-
-#define TIMEOUT 10
-
-/* Dictionary Lookup test */
-
-static gint word_count = 0;
-static gchar **word_array = NULL;
-
-static void
-read_dict (void)
-{
-  FILE *in = fopen ("/usr/share/dict/words", "r");
-  gchar buffer[128];
-  GList *word_list = NULL, *iter;
-  gint i;
-
-  while (fgets (buffer, 128, in)) {
-    gint len = strlen (buffer);
-    if (len > 0 && buffer[len-1] == '\n')
-      buffer[len-1] = '\0';
-    word_list = g_list_prepend (word_list, g_strdup (buffer));
-    ++word_count;
-  }
-  fclose (in);
-
-  word_array = g_new (gchar *, word_count);
-  i = word_count-1;
-  for (iter = word_list; iter != NULL; iter = g_list_next (iter)) {
-    word_array[i] = (gchar *)iter->data;
-    --i;
-  }
-}
-
-static gint
-find_word (const gchar *str)
-{
-  gint a, b;
-
-  if (word_array == NULL)
-    read_dict ();
-
-  a = 0;
-  b = word_count-1;
-
-  while (b-a > 1) {
-    gint m = (a+b)/2;
-    gint cmp = g_strcasecmp (str, word_array[m]);
-
-    if (cmp < 0)
-      b = m;
-    else if (cmp > 0)
-      a = m;
-    else
-      return m;
-  }
-
-  return b;
-}
-
-struct {
-  ECompletion *complete;
-  const gchar *txt;
-  gint start;
-  gint current;
-  gint len;
-  gint limit;
-  gint count;
-} dict_info;
-static guint dict_tag = 0;
-
-static gboolean
-dict_check (gpointer ptr)
-{
-  gint limit = dict_info.limit;
-  gint i;
-
-  /* If this is the first iteration, do the binary search in our word list to figure out
-     where to start.  We do less work on the first iteration, to give more of a sense of
-     immediate feedback. */
-  if (dict_info.start < 0) {
-    dict_info.start = dict_info.current = find_word (dict_info.txt);
-  }
-
-  i = dict_info.current;
-  while (limit > 0
-	 && i < word_count
-	 && dict_info.count < 50
-	 && g_strncasecmp (dict_info.txt, word_array[i], dict_info.len) == 0) {
-    
-    ECompletionMatch *match = g_new (ECompletionMatch, 1);
-    e_completion_match_construct (match);
-    e_completion_match_set_text (match, word_array[i], NULL);
-    match->score = dict_info.len / (double)strlen (word_array[i]);
-    e_completion_found_match (dict_info.complete, match);
-
-    ++i;
-    --limit;
-    ++dict_info.count;
-  }
-  dict_info.current = i;
-  dict_info.limit = MIN (dict_info.limit*2, 400);
-  
-  if (limit != 0) {
-    dict_tag = 0;
-    e_completion_end_search (dict_info.complete);
-    return FALSE;
-  }
-
-
-
-  return TRUE;
-}
-
-static void
-begin_dict_search (ECompletion *complete, const gchar *txt, gint pos, gint limit, gpointer user_data)
-{
-  gint len = strlen (txt);
-
-  if (dict_tag != 0) {
-    gtk_timeout_remove (dict_tag);
-    dict_tag = 0;
-  }
-
-  if (len > 0) {
-    dict_info.complete = complete;
-    dict_info.txt = txt;
-    dict_info.start = -1;
-    dict_info.current = -1;
-    dict_info.len = len;
-    dict_info.limit = 100;
-    dict_info.count = 0;
-    dict_tag = gtk_timeout_add (TIMEOUT, dict_check, NULL);
-  } else {
-    e_completion_end_search (complete);
-  }
-}
-
-static void
-end_dict_search (ECompletion *complete, gpointer user_data)
-{
-  if (dict_tag != 0) {
-    gtk_timeout_remove (dict_tag);
-    dict_tag = 0;
-  }
-}
-
-static void
-popup_cb (EEntry *popup, GdkEventButton *ev, gint pos, gpointer user_data)
-{
-  g_print ("popup at pos %d\n", pos);
-}
-
-int
-main (int argc, gchar **argv)
-{
-  ECompletion* complete;
-  GtkWidget *entry;
-  GtkWidget *win;
-
-  gnome_init ("ETextModelTest", "0.0", argc, argv);
-
-  read_dict ();
-
-  complete = e_completion_new ();
-  gtk_signal_connect (GTK_OBJECT (complete),
-		      "begin_completion",
-		      GTK_SIGNAL_FUNC (begin_dict_search),
-		      NULL);
-  gtk_signal_connect (GTK_OBJECT (complete),
-		      "end_completion",
-		      GTK_SIGNAL_FUNC (end_dict_search),
-		      NULL);
-  gtk_signal_connect (GTK_OBJECT (complete),
-		      "cancel_completion",
-		      GTK_SIGNAL_FUNC (end_dict_search),
-		      NULL);
-
-  win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  entry = e_entry_new ();
-  e_entry_enable_completion_full (E_ENTRY (entry), complete, 0, NULL);
-  e_entry_set_editable (E_ENTRY (entry), TRUE);
-
-  gtk_signal_connect (GTK_OBJECT (entry),
-		      "popup",
-		      GTK_SIGNAL_FUNC (popup_cb),
-		      NULL);
-
-  gtk_container_add (GTK_CONTAINER (win), entry);
-  gtk_widget_show_all (win);
-
-  gtk_main ();
-
-  return 0;
-}
diff --git a/widgets/text/e-completion-view.c b/widgets/text/e-completion-view.c
deleted file mode 100644
index 464b52c8a0..0000000000
--- a/widgets/text/e-completion-view.c
+++ /dev/null
@@ -1,825 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * ECompletionView - A text completion selection widget
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * Author: Jon Trowbridge <trow@ximian.com>
- * Adapted from code by Miguel de Icaza <miguel@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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
- */
-
-
-#include <config.h>
-#include <math.h>
-#include <gdk/gdkkeysyms.h>
-#include <gal/e-table/e-table-simple.h>
-#include <gal/e-table/e-table-scrolled.h>
-#include "e-completion-view.h"
-
-enum {
-	E_COMPLETION_VIEW_NONEMPTY,
-	E_COMPLETION_VIEW_ADDED,
-	E_COMPLETION_VIEW_FULL,
-	E_COMPLETION_VIEW_BROWSE,
-	E_COMPLETION_VIEW_UNBROWSE,
-	E_COMPLETION_VIEW_ACTIVATE,
-	E_COMPLETION_VIEW_LAST_SIGNAL
-};
-
-static guint e_completion_view_signals[E_COMPLETION_VIEW_LAST_SIGNAL] = { 0 };
-
-static void    e_completion_view_disconnect     (ECompletionView *cv);
-static ETable *e_completion_view_table          (ECompletionView *cv);
-static void    e_completion_view_clear_choices  (ECompletionView *cv);
-static void    e_completion_view_set_cursor_row (ECompletionView *cv, gint r);
-static void    e_completion_view_select         (ECompletionView *cv, gint r);
-
-static gint    e_completion_view_key_press_handler (GtkWidget *w, GdkEventKey *key_event, gpointer user_data);
-
-static void    e_completion_view_class_init (ECompletionViewClass *klass);
-static void    e_completion_view_init       (ECompletionView *completion);
-static void    e_completion_view_destroy    (GtkObject *object);
-
-static GtkObjectClass *parent_class;
-
-
-
-static gint
-e_completion_view_local_key_press_handler (GtkWidget *w, GdkEventKey *ev)
-{
-	return e_completion_view_key_press_handler (w, ev, w);
-}
-
-static void
-e_completion_view_paint (GtkWidget *widget, GdkRectangle *area)
-{
-	gint i;
-
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (E_IS_COMPLETION_VIEW (widget));
-	g_return_if_fail (area != NULL);
-
-	if (!GTK_WIDGET_DRAWABLE (widget))
-		return;
-
-	for (i = 0; i < E_COMPLETION_VIEW (widget)->border_width; ++i) {
-
-		gdk_draw_rectangle (widget->window,
-				    widget->style->black_gc,
-				    FALSE, i, i, 
-				    widget->allocation.width-1-2*i,
-				    widget->allocation.height-1-2*i);
-
-	}
-	
-}
-
-static void
-e_completion_view_draw (GtkWidget *widget, GdkRectangle *area)
-{
-	GtkBin *bin;
-	GdkRectangle child_area;
-
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (E_IS_COMPLETION_VIEW (widget));
-	g_return_if_fail (area != NULL);
-
-	if (GTK_WIDGET_DRAWABLE (widget)) {
-		bin = GTK_BIN (widget);
-
-		e_completion_view_paint (widget, area);
-
-		if (bin->child && gtk_widget_intersect (bin->child, area, &child_area))
-			gtk_widget_draw (bin->child, &child_area);
-	}
-}
-
-static gint
-e_completion_view_expose_event (GtkWidget *widget, GdkEventExpose *event)			  
-{
-	GtkBin *bin;
-	GdkEventExpose child_event;
-
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (E_IS_COMPLETION_VIEW (widget), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	if (GTK_WIDGET_DRAWABLE (widget)) {
-		bin = GTK_BIN (widget);
-
-		e_completion_view_paint (widget, &event->area);
-
-		child_event = *event;
-		if (bin->child &&
-		    GTK_WIDGET_NO_WINDOW (bin->child) &&
-		    gtk_widget_intersect (bin->child, &event->area, &child_event.area))
-			gtk_widget_event (bin->child, (GdkEvent*) &child_event);
-	}
-
-	return FALSE;
-}
-
-static void
-e_completion_view_size_request (GtkWidget *widget, GtkRequisition *requisition)
-{
-	GtkBin *bin;
-
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (E_IS_COMPLETION_VIEW (widget));
-	g_return_if_fail (requisition != NULL);
-
-	bin = GTK_BIN (widget);
-	
-	requisition->width  = 2 * E_COMPLETION_VIEW (widget)->border_width;
-	requisition->height = 2 * E_COMPLETION_VIEW (widget)->border_width;
-
-	if (bin->child && GTK_WIDGET_VISIBLE (bin->child)) {
-		GtkRequisition child_requisition;
-		
-		gtk_widget_size_request (bin->child, &child_requisition);
-		
-		requisition->width += child_requisition.width;
-		requisition->height += child_requisition.height;
-	}
-}
-
-static void
-e_completion_view_size_allocate (GtkWidget *widget, GtkAllocation *allocation)				 
-{
-	GtkBin *bin;
-	GtkAllocation child_allocation;
-
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (E_IS_COMPLETION_VIEW (widget));
-	g_return_if_fail (allocation != NULL);
-
-	bin = GTK_BIN (widget);
-	widget->allocation = *allocation;
-
-	child_allocation.x = E_COMPLETION_VIEW (widget)->border_width;
-	child_allocation.width = MAX(0, (gint)allocation->width - child_allocation.x * 2);
-
-	child_allocation.y = E_COMPLETION_VIEW (widget)->border_width;
-	child_allocation.height = MAX (0, (gint)allocation->height - child_allocation.y * 2);
-
-	if (GTK_WIDGET_REALIZED (widget)) {
-		gdk_window_move_resize (widget->window,
-					allocation->x,
-					allocation->y,
-					allocation->width,
-					allocation->height);
-	}
-	
-	if (bin->child) {
-		gtk_widget_size_allocate (bin->child, &child_allocation);
-	}
-}
-
-GtkType
-e_completion_view_get_type (void)
-{
-	static GtkType completion_view_type = 0;
-  
-	if (!completion_view_type) {
-		GtkTypeInfo completion_view_info = {
-			"ECompletionView",
-			sizeof (ECompletionView),
-			sizeof (ECompletionViewClass),
-			(GtkClassInitFunc) e_completion_view_class_init,
-			(GtkObjectInitFunc) e_completion_view_init,
-			NULL, NULL, /* reserved */
-			(GtkClassInitFunc) NULL
-		};
-
-		completion_view_type = gtk_type_unique (gtk_event_box_get_type (), &completion_view_info);
-	}
-
-	return completion_view_type;
-}
-
-static void
-e_completion_view_class_init (ECompletionViewClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-	parent_class = GTK_OBJECT_CLASS (gtk_type_class (gtk_event_box_get_type ()));
-
-	e_completion_view_signals[E_COMPLETION_VIEW_NONEMPTY] =
-		gtk_signal_new ("nonempty",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ECompletionViewClass, nonempty),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_completion_view_signals[E_COMPLETION_VIEW_ADDED] =
-		gtk_signal_new ("added",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ECompletionViewClass, added),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_completion_view_signals[E_COMPLETION_VIEW_FULL] =
-		gtk_signal_new ("full",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ECompletionViewClass, full),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_completion_view_signals[E_COMPLETION_VIEW_BROWSE] =
-		gtk_signal_new ("browse",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ECompletionViewClass, browse),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_POINTER);
-
-	e_completion_view_signals[E_COMPLETION_VIEW_UNBROWSE] =
-		gtk_signal_new ("unbrowse",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ECompletionViewClass, unbrowse),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_completion_view_signals[E_COMPLETION_VIEW_ACTIVATE] =
-		gtk_signal_new ("activate",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ECompletionViewClass, activate),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_POINTER);
-
-	gtk_object_class_add_signals (object_class, e_completion_view_signals, E_COMPLETION_VIEW_LAST_SIGNAL);
-
-	object_class->destroy = e_completion_view_destroy;
-
-	widget_class->key_press_event = e_completion_view_local_key_press_handler;
-	widget_class->draw = e_completion_view_draw;
-	widget_class->expose_event = e_completion_view_expose_event;
-	widget_class->size_request = e_completion_view_size_request;
-	widget_class->size_allocate = e_completion_view_size_allocate;
-}
-
-static void
-e_completion_view_init (ECompletionView *completion)
-{
-	completion->border_width = 2;
-}
-
-static void
-e_completion_view_destroy (GtkObject *object)
-{
-	ECompletionView *cv = E_COMPLETION_VIEW (object);
-
-	e_completion_view_disconnect (cv);
-	e_completion_view_clear_choices (cv);
-
-	if (cv->key_widget) {
-		gtk_signal_disconnect (GTK_OBJECT (cv->key_widget), cv->key_signal_id);
-		gtk_object_unref (GTK_OBJECT (cv->key_widget));
-	}
-
-	if (cv->completion)
-		gtk_object_unref (GTK_OBJECT (cv->completion));
-
-
-	if (parent_class->destroy)
-		(parent_class->destroy) (object);
-}
-
-static void
-e_completion_view_disconnect (ECompletionView *cv)
-{
-	g_return_if_fail (cv != NULL);
-	g_return_if_fail (E_IS_COMPLETION_VIEW (cv));
-
-	if (cv->begin_signal_id)
-		gtk_signal_disconnect (GTK_OBJECT (cv->completion), cv->begin_signal_id);
-	if (cv->comp_signal_id)
-		gtk_signal_disconnect (GTK_OBJECT (cv->completion), cv->comp_signal_id);
-	if (cv->restart_signal_id)
-		gtk_signal_disconnect (GTK_OBJECT (cv->completion), cv->restart_signal_id);
-	if (cv->cancel_signal_id)
-		gtk_signal_disconnect (GTK_OBJECT (cv->completion), cv->cancel_signal_id);
-	if (cv->end_signal_id)
-		gtk_signal_disconnect (GTK_OBJECT (cv->completion), cv->end_signal_id);
-	
-	cv->begin_signal_id   = 0;
-	cv->comp_signal_id    = 0;
-	cv->restart_signal_id = 0;
-	cv->end_signal_id     = 0;
-}
-
-static ETable *
-e_completion_view_table (ECompletionView *cv)
-{
-	return e_table_scrolled_get_table (E_TABLE_SCROLLED (cv->table));
-}
-
-static void
-e_completion_view_clear_choices (ECompletionView *cv)
-{
-	GList *i;
-
-	g_return_if_fail (cv != NULL);
-	g_return_if_fail (E_IS_COMPLETION_VIEW (cv));
-
-	for (i = cv->choices; i != NULL; i = g_list_next (i)) {
-		e_completion_match_unref ((ECompletionMatch *) i->data);
-	}
-
-	g_list_free (cv->choices);
-	cv->choices = NULL;
-
-	cv->choice_count = 0;
-}
-
-static void
-e_completion_view_set_cursor_row (ECompletionView *cv, gint r)
-{
-	ETable *table;
-	GtkAdjustment *adj;
-	gint x, y1, y2, r1, r2, c;
-	double fracline;
-	gint iteration_count=0;
-
-	g_return_if_fail (cv != NULL);
-	g_return_if_fail (E_IS_COMPLETION_VIEW (cv));
-	g_return_if_fail (r < cv->choice_count);
-
-	adj = e_scroll_frame_get_vadjustment (E_SCROLL_FRAME (cv->table));	
-
-	table = e_completion_view_table (cv);
-
-	if (r < 0) {
-		e_selection_model_clear (E_SELECTION_MODEL(table->selection));
-		
-		/* Move back to the top when we clear the selection */
-		gtk_adjustment_set_value (adj, adj->lower);
-		return;
-	}
-
-	e_table_set_cursor_row (table, r);
-
-	/* OK, now the tricky bit.  We try to insure that this row is
-	   visible. */
-	
-	/* If we are selecting the first or last row, then it is easy.  We just
-	   cram the vadjustment all the way up/down. */
-	if (r == 0) {
-		gtk_adjustment_set_value (adj, adj->lower);
-		return;
-	} else if (r == cv->choice_count - 1) {		
-		gtk_adjustment_set_value (adj, adj->upper - adj->page_size);
-		return;
-	}
-	
-	fracline = ((adj->upper - adj->lower - adj->page_size) / cv->choice_count) / 4;
-
-	while (iteration_count < 100) {
-		x = GTK_LAYOUT(table->table_canvas)->hadjustment->value;
-		y1 = GTK_LAYOUT(table->table_canvas)->vadjustment->value;
-		
-		y2 = y1 + cv->table->allocation.height;
-		
-		e_table_group_compute_location (e_completion_view_table (cv)->group, &x, &y1, &r1, &c);
-		e_table_group_compute_location (e_completion_view_table (cv)->group, &x, &y2, &r2, &c);
-	
-		if (r <= r1) {
-			gtk_adjustment_set_value (adj, adj->value - fracline);
-		} else if (r >= r2) {
-			gtk_adjustment_set_value (adj, adj->value + fracline);
-		} else 
-			return;
-
-		++iteration_count;
-	}
-
-	g_assert_not_reached ();
-}
-
-static void
-e_completion_view_select (ECompletionView *cv, gint r)
-{
-	ECompletionMatch *match = (ECompletionMatch *) g_list_nth_data (cv->choices, r);
-
-	cv->selection = r;
-	e_completion_view_set_cursor_row (cv, r);
-	gtk_signal_emit (GTK_OBJECT (cv), e_completion_view_signals[E_COMPLETION_VIEW_ACTIVATE], match);
-}
-
-static gint
-e_completion_view_key_press_handler (GtkWidget *w, GdkEventKey *key_event, gpointer user_data)
-{
-	ECompletionView *cv = E_COMPLETION_VIEW (user_data);
-	gint dir = 0;
-	gboolean key_handled = TRUE;
-	
-	/* Start up a completion.*/
-	if (cv->complete_key && key_event->keyval == cv->complete_key && !cv->editable) {
-		gtk_signal_emit (GTK_OBJECT (cv), e_completion_view_signals[E_COMPLETION_VIEW_BROWSE], NULL);
-		goto stop_emission;
-	}
-
-	/* Stop our completion. */
-	if (cv->uncomplete_key && key_event->keyval == cv->uncomplete_key && cv->editable && cv->selection < 0) {
-		e_completion_view_set_cursor_row (cv, -1);
-		gtk_signal_emit (GTK_OBJECT (cv), e_completion_view_signals[E_COMPLETION_VIEW_UNBROWSE]);
-		goto stop_emission;
-	}
-
-	if (!cv->editable)
-		return FALSE;
-
-	switch (key_event->keyval) {
-	case GDK_Down:
-	case GDK_KP_Down:
-		dir = 1;
-		break;
-
-	case GDK_Up:
-	case GDK_KP_Up:
-		dir = -1;
-		break;
-		
-	case GDK_Tab:
-		/* Unbrowse, unhandled. */
-		cv->selection = -1;
-		dir = 0;
-		key_handled = FALSE;
-		break;
-
-	case GDK_Return:
-	case GDK_KP_Enter:
-	case GDK_space:
-	case GDK_KP_Space:
-		/* Only handle these key presses if we have an active selection;
-		   otherwise, pass them on. */
-		if (cv->selection >= 0) {
-			e_completion_view_select (cv, cv->selection);
-			goto stop_emission;
-		}
-		return FALSE;
-
-	case GDK_Escape:
-		/* Unbrowse hack */
-		cv->selection = -1;
-		dir = 0;
-		break;
-
-	default:
-		return FALSE;
-	}
-
-	cv->selection += dir;
-
-	if (cv->selection >= cv->choice_count) {
-		cv->selection = cv->choice_count - 1;
-		/* Don't re-emit the browse signal */
-		goto stop_emission;
-	}
-
-	e_completion_view_set_cursor_row (cv, cv->selection);
-
-	if (cv->selection >= 0)
-		gtk_signal_emit (GTK_OBJECT (cv), e_completion_view_signals[E_COMPLETION_VIEW_BROWSE], 
-				 g_list_nth_data (cv->choices, cv->selection));
-	else
-		gtk_signal_emit (GTK_OBJECT (cv), e_completion_view_signals[E_COMPLETION_VIEW_UNBROWSE]);
-
- stop_emission:
-	
-	if (key_handled)
-		gtk_signal_emit_stop_by_name (GTK_OBJECT (w), "key_press_event");
-
-	return key_handled;
-}
-
-static void
-begin_completion_cb (ECompletion *completion, const gchar *txt, gint pos, gint limit, gpointer user_data)
-{
-	ECompletionView *cv = E_COMPLETION_VIEW (user_data);
-
-	e_completion_view_clear_choices (cv);
-	cv->have_all_choices = FALSE;
-
-	e_table_model_changed (cv->model);
-}
-
-static void
-restart_completion_cb (ECompletion *completion, gpointer user_data)
-{
-	/* For now, handle restarts like the beginning of a new completion. */
-	begin_completion_cb (completion, NULL, 0, 0, user_data);
-}
-
-static void
-cancel_completion_cb (ECompletion *completion, gpointer user_data)
-{
-	ECompletionView *cv = E_COMPLETION_VIEW (user_data);
-
-	/* On a cancel, clear our choices and issue an "unbrowse" signal. */
-	e_completion_view_clear_choices (cv);
-	cv->have_all_choices = TRUE;
-	e_completion_view_set_cursor_row (cv, -1);
-	e_table_model_changed (cv->model);
-
-	gtk_signal_emit (GTK_OBJECT (cv), e_completion_view_signals[E_COMPLETION_VIEW_UNBROWSE]);
-}
-
-static void
-completion_cb (ECompletion *completion, ECompletionMatch *match, gpointer user_data)
-{
-	ECompletionView *cv = E_COMPLETION_VIEW (user_data);
-	gint r = cv->choice_count;
-	gboolean first = (cv->choices == NULL);
-
-	cv->choices = g_list_append (cv->choices, match);
-	e_completion_match_ref (match);
-	++cv->choice_count;
-
-	e_table_model_row_inserted (cv->model, r);
-
-	if (first)
-		gtk_signal_emit (GTK_OBJECT (cv), e_completion_view_signals[E_COMPLETION_VIEW_NONEMPTY]);
-
-	gtk_signal_emit (GTK_OBJECT (cv), e_completion_view_signals[E_COMPLETION_VIEW_ADDED]);
-}
-
-static void
-end_completion_cb (ECompletion *completion, gpointer user_data)
-{
-	ECompletionView *cv = E_COMPLETION_VIEW (user_data);
-
-	/* Do a final refresh of the table. */
-	e_table_model_changed (cv->model);
-
-	cv->have_all_choices = TRUE;
-	gtk_signal_emit (GTK_OBJECT (cv), e_completion_view_signals[E_COMPLETION_VIEW_FULL]);
-}
-
-/*** Table Callbacks ***/
-
-static char *simple_spec = 
-"<ETableSpecification no-headers=\"true\" draw-grid=\"false\" cursor-mode=\"line\" alternating-row-colors=\"false\">"
-"  <ETableColumn model_col=\"0\" _title=\"Node\" expansion=\"1.0\" "
-"         minimum_width=\"16\" resizable=\"true\" cell=\"string\" "
-"         compare=\"string\"/> "
-"       <ETableState>                  "
-"	        <column source=\"0\"/> "
-"	        <grouping></grouping>  "
-"        </ETableState>                "
-"</ETableSpecification>";
-
-static gint
-table_col_count (ETableModel *etm, gpointer data)
-{
-	return 1;
-}
-
-static gint
-table_row_count (ETableModel *etm, gpointer data)
-{
-	ECompletionView *cv = E_COMPLETION_VIEW (data);
-	return cv->choice_count;
-}
-
-static gboolean
-table_is_cell_editable (ETableModel *etm, gint c, gint r, gpointer data)
-{
-	return FALSE;
-}
-
-static gpointer
-table_value_at (ETableModel *etm, gint c, gint r, gpointer data)
-{
-	ECompletionView *cv = E_COMPLETION_VIEW (data);
-	ECompletionMatch *match;
-
-	match = (ECompletionMatch *) g_list_nth_data (cv->choices, r);
-
-	return (gpointer) e_completion_match_get_menu_text (match);
-}
-
-static gchar *
-table_value_to_string (ETableModel *em, gint col, gconstpointer val, gpointer data)
-{
-	return (gchar *) val;
-}
-
-static void
-table_click_cb (ETable *et, gint r, gint c, GdkEvent *ev, gpointer data)
-{
-	ECompletionView *cv = E_COMPLETION_VIEW (data);
-
-	e_completion_view_select (cv, r);
-}
-
-void
-e_completion_view_construct (ECompletionView *cv, ECompletion *completion)
-{
-	g_return_if_fail (cv != NULL);
-	g_return_if_fail (E_IS_COMPLETION_VIEW (cv));
-	g_return_if_fail (completion != NULL);
-	g_return_if_fail (E_IS_COMPLETION (completion));
-
-	/* Make sure we don't call construct twice. */
-	g_return_if_fail (cv->completion == NULL);
-
-	GTK_WIDGET_SET_FLAGS (GTK_WIDGET (cv), GTK_CAN_FOCUS);
-
-	cv->completion = completion;
-	gtk_object_ref (GTK_OBJECT (completion));
-
-	cv->begin_signal_id   = gtk_signal_connect (GTK_OBJECT (completion),
-						    "begin_completion",
-						    GTK_SIGNAL_FUNC (begin_completion_cb),
-						    cv);
-	cv->comp_signal_id    = gtk_signal_connect (GTK_OBJECT (completion),
-						    "completion",
-						    GTK_SIGNAL_FUNC (completion_cb),
-						    cv);
-	cv->restart_signal_id = gtk_signal_connect (GTK_OBJECT (completion),
-						    "restart_completion",
-						    GTK_SIGNAL_FUNC (restart_completion_cb),
-						    cv);
-	cv->cancel_signal_id  = gtk_signal_connect (GTK_OBJECT (completion),
-						    "cancel_completion",
-						    GTK_SIGNAL_FUNC (cancel_completion_cb),
-						    cv);
-	cv->end_signal_id     = gtk_signal_connect (GTK_OBJECT (completion),
-						    "end_completion",
-						    GTK_SIGNAL_FUNC (end_completion_cb),
-						    cv);
-
-	cv->model = e_table_simple_new (table_col_count,
-					table_row_count,
-					table_value_at,
-					NULL,
-					table_is_cell_editable,
-					NULL, NULL, NULL, NULL,
-					table_value_to_string,
-					cv);
-
-	cv->table = e_table_scrolled_new (cv->model, NULL, simple_spec, NULL);
-
-	e_scroll_frame_set_shadow_type (E_SCROLL_FRAME (cv->table), GTK_SHADOW_NONE);
-	e_scroll_frame_set_scrollbar_spacing (E_SCROLL_FRAME (cv->table), 0);
-	e_scroll_frame_set_policy (E_SCROLL_FRAME (cv->table), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-
-	gtk_container_add (GTK_CONTAINER (cv), cv->table);
-	gtk_widget_show_all (cv->table);
-
-	gtk_signal_connect (GTK_OBJECT (e_completion_view_table (cv)),
-			    "click",
-			    GTK_SIGNAL_FUNC (table_click_cb),
-			    cv);
-
-	cv->selection = -1;
-}
-
-GtkWidget *
-e_completion_view_new (ECompletion *completion)
-{
-	gpointer p;
-
-	g_return_val_if_fail (completion != NULL, NULL);
-	g_return_val_if_fail (E_IS_COMPLETION (completion), NULL);
-
-	p = gtk_type_new (e_completion_view_get_type ());
-
-	e_completion_view_construct (E_COMPLETION_VIEW (p), completion);
-
-	return GTK_WIDGET (p);
-}
-
-void
-e_completion_view_connect_keys (ECompletionView *cv, GtkWidget *w)
-{
-	g_return_if_fail (cv != NULL);
-	g_return_if_fail (E_IS_COMPLETION_VIEW (cv));
-	g_return_if_fail (w == NULL || GTK_IS_WIDGET (w));
-
-	if (cv->key_widget) {
-		gtk_signal_disconnect (GTK_OBJECT (cv->key_widget), cv->key_signal_id);
-		gtk_object_unref (GTK_OBJECT (cv->key_widget));
-	}
-
-	if (w) {
-		cv->key_widget = w;
-		gtk_object_ref (GTK_OBJECT (w));
-
-		cv->key_signal_id = gtk_signal_connect (GTK_OBJECT (w),
-							"key_press_event",
-							GTK_SIGNAL_FUNC (e_completion_view_key_press_handler),
-							cv);
-	} else {
-		cv->key_widget = NULL;
-		cv->key_signal_id = 0;
-	}
-}
-
-void
-e_completion_view_set_complete_key (ECompletionView *cv, gint keyval)
-{
-	g_return_if_fail (cv != NULL);
-	g_return_if_fail (E_IS_COMPLETION_VIEW (cv));
-
-	cv->complete_key = keyval;
-}
-
-void
-e_completion_view_set_uncomplete_key (ECompletionView *cv, gint keyval)
-{
-	g_return_if_fail (cv != NULL);
-	g_return_if_fail (E_IS_COMPLETION_VIEW (cv));
-
-	cv->uncomplete_key = keyval;
-}
-
-void
-e_completion_view_set_width (ECompletionView *cv, gint width)
-{
-	GtkWidget *w;
-	gint y, r, dummy, line_height, final_height;
-	double drop_room, lines;
-
-	g_return_if_fail (cv != NULL);
-	g_return_if_fail (E_IS_COMPLETION_VIEW (cv));
-	g_return_if_fail (width > 0);
-
-	w = GTK_WIDGET (cv);
-
-	if (! GTK_WIDGET_REALIZED (w)) {
-		gtk_widget_set_usize (w, width, -1);
-		return;
-	}
-
-	/* A Horrible Hack(tm) to figure out the height of a single table row */
-	
-	for (line_height=5, r=0; r == 0 && line_height < 1000; line_height += 2) {
-		dummy = 0;
-		e_table_group_compute_location (e_completion_view_table (cv)->group,
-						&dummy, &line_height, &r, &dummy);
-	}
-
-	if (line_height >= 1000) {
-		/* Something went wrong, so we make a (possibly very lame) guess */
-		line_height = 30;
-	}
-
-
-	gdk_window_get_origin (w->window, NULL, &y);
-	y += w->allocation.y;
-
-	lines = 5; /* default maximum */
-	lines = MIN (lines, cv->choice_count);
-	
-	drop_room = (gdk_screen_height () - y) / (double)line_height;
-	drop_room = MAX (drop_room, 1);
-
-	lines = MIN (lines, drop_room);
-
-	/* We reduce the total height by a bit; in practice, this seems to work out well. */
-	final_height = (gint) floor (line_height * (0.5 + (float)lines) * 0.97);
-	gtk_widget_set_usize (w, width, final_height);
-}
-
-void
-e_completion_view_set_editable (ECompletionView *cv, gboolean x)
-{
-	g_return_if_fail (cv != NULL);
-	g_return_if_fail (E_IS_COMPLETION_VIEW (cv));
-
-	if (x == cv->editable)
-		return;
-
-	cv->editable = x;
-	cv->selection = -1;
-	e_completion_view_set_cursor_row (cv, -1);
-}
-
-
diff --git a/widgets/text/e-completion-view.h b/widgets/text/e-completion-view.h
deleted file mode 100644
index ee18420fef..0000000000
--- a/widgets/text/e-completion-view.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * ECompletionView - A text completion selection widget
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * Author: Jon Trowbridge <trow@ximian.com>
- * Adapted from code by Miguel de Icaza <miguel@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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
- */
-
-
-#ifndef E_COMPLETION_VIEW_H
-#define E_COMPLETION_VIEW_H
-
-#include <libgnome/gnome-defs.h>
-#include <gtk/gtk.h>
-#include <gal/e-table/e-table.h>
-#include "e-completion.h"
-
-BEGIN_GNOME_DECLS
-
-#define E_COMPLETION_VIEW_TYPE        (e_completion_view_get_type ())
-#define E_COMPLETION_VIEW(o)          (GTK_CHECK_CAST ((o), E_COMPLETION_VIEW_TYPE, ECompletionView))
-#define E_COMPLETION_VIEW_CLASS(k)    (GTK_CHECK_CLASS_CAST ((k), E_COMPLETION_VIEW_TYPE, ECompletionViewClass))
-#define E_IS_COMPLETION_VIEW(o)       (GTK_CHECK_TYPE ((o), E_COMPLETION_VIEW_TYPE))
-#define E_IS_COMPLETION_VIEW_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_COMPLETION_VIEW_TYPE))
-
-typedef struct _ECompletionView ECompletionView;
-typedef struct _ECompletionViewClass ECompletionViewClass;
-
-struct _ECompletionView {
-	GtkEventBox parent;
-	
-	ETableModel *model;
-	GtkWidget *table;
-
-	ECompletion *completion;
-	guint begin_signal_id;
-	guint comp_signal_id;
-	guint restart_signal_id;
-	guint cancel_signal_id;
-	guint end_signal_id;
-
-	GtkWidget *key_widget;
-	guint key_signal_id;
-
-	gint complete_key;
-	gint uncomplete_key;
-
-	GList *choices;
-	gint choice_count;
-	gboolean have_all_choices;
-
-	gboolean editable;
-	gint selection;
-       
-	gint border_width;
-};
-
-struct _ECompletionViewClass {
-	GtkEventBoxClass parent_class;
-
-	/* Signals */
-	void (*nonempty) (ECompletionView *cv);
-	void (*added)    (ECompletionView *cv);
-	void (*full)     (ECompletionView *cv);
-	void (*browse)   (ECompletionView *cv, ECompletionMatch *match);
-	void (*unbrowse) (ECompletionView *cv);
-	void (*activate) (ECompletionView *cv, ECompletionMatch *match);
-};
-
-GtkType    e_completion_view_get_type     (void);
-
-void       e_completion_view_construct    (ECompletionView *cv, ECompletion *completion);
-GtkWidget *e_completion_view_new          (ECompletion *completion);
-
-void       e_completion_view_connect_keys (ECompletionView *cv, GtkWidget *w);
-
-void       e_completion_view_set_complete_key   (ECompletionView *cv, gint keyval);
-void       e_completion_view_set_uncomplete_key (ECompletionView *cv, gint keyval);
-
-void       e_completion_view_set_width    (ECompletionView *cv, gint width);
-void       e_completion_view_set_editable (ECompletionView *cv, gboolean);
-
-END_GNOME_DECLS
-
-
-#endif /* E_COMPLETION_H */
diff --git a/widgets/text/e-completion.c b/widgets/text/e-completion.c
deleted file mode 100644
index 0ede90a088..0000000000
--- a/widgets/text/e-completion.c
+++ /dev/null
@@ -1,400 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* ECompletion - A base class for text completion.
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * Author: Miguel de Icaza <miguel@ximian.com>
- * Adapted by Jon Trowbridge <trow@ximian.com>
- *
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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
- */
-
-
-#include <config.h>
-#include <stdio.h>
-#include <gtk/gtk.h>
-#include "e-completion.h"
-
-enum {
-	E_COMPLETION_BEGIN_COMPLETION,
-	E_COMPLETION_COMPLETION,
-	E_COMPLETION_RESTART_COMPLETION,
-	E_COMPLETION_CANCEL_COMPLETION,
-	E_COMPLETION_END_COMPLETION,
-	E_COMPLETION_LAST_SIGNAL
-};
-
-static guint e_completion_signals[E_COMPLETION_LAST_SIGNAL] = { 0 };
-
-struct _ECompletionPrivate {
-	gboolean searching;
-	gchar *search_text;
-	gint pos;
-	gint limit;
-	gint match_count;
-	GList *matches;
-	double min_score, max_score;
-};
-
-static void e_completion_class_init (ECompletionClass *klass);
-static void e_completion_init       (ECompletion *complete);
-static void e_completion_destroy    (GtkObject *object);
-
-static void   match_list_free (GList *);
-
-static void     e_completion_add_match     (ECompletion *complete, ECompletionMatch *);
-static void     e_completion_clear_matches (ECompletion *complete);
-static gboolean e_completion_sort          (ECompletion *complete);
-static void     e_completion_restart       (ECompletion *complete);
-
-static GtkObjectClass *parent_class;
-
-
-
-GtkType
-e_completion_get_type (void)
-{
-	static GtkType complete_type = 0;
-  
-	if (!complete_type) {
-		GtkTypeInfo complete_info = {
-			"ECompletion",
-			sizeof (ECompletion),
-			sizeof (ECompletionClass),
-			(GtkClassInitFunc) e_completion_class_init,
-			(GtkObjectInitFunc) e_completion_init,
-			NULL, NULL, /* reserved */
-			(GtkClassInitFunc) NULL
-		};
-
-		complete_type = gtk_type_unique (gtk_object_get_type (), &complete_info);
-	}
-
-	return complete_type;
-}
-
-static void
-e_completion_class_init (ECompletionClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-
-	parent_class = GTK_OBJECT_CLASS (gtk_type_class (gtk_object_get_type ()));
-
-	e_completion_signals[E_COMPLETION_BEGIN_COMPLETION] =
-		gtk_signal_new ("begin_completion",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ECompletionClass, begin_completion),
-				gtk_marshal_NONE__POINTER_INT_INT,
-				GTK_TYPE_NONE, 3,
-				GTK_TYPE_POINTER, GTK_TYPE_INT, GTK_TYPE_INT);
-
-	e_completion_signals[E_COMPLETION_COMPLETION] =
-		gtk_signal_new ("completion",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ECompletionClass, completion),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_POINTER);
-
-	e_completion_signals[E_COMPLETION_RESTART_COMPLETION] =
-		gtk_signal_new ("restart_completion",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ECompletionClass, restart_completion),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_completion_signals[E_COMPLETION_CANCEL_COMPLETION] =
-		gtk_signal_new ("cancel_completion",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ECompletionClass, cancel_completion),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_completion_signals[E_COMPLETION_END_COMPLETION] =
-		gtk_signal_new ("end_completion",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ECompletionClass, end_completion),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, e_completion_signals, E_COMPLETION_LAST_SIGNAL);
-
-	object_class->destroy = e_completion_destroy;
-}
-
-static void
-e_completion_init (ECompletion *complete)
-{
-	complete->priv = g_new0 (struct _ECompletionPrivate, 1);
-}
-
-static void
-e_completion_destroy (GtkObject *object)
-{
-	ECompletion *complete = E_COMPLETION (object);
-
-	g_free (complete->priv->search_text);
-	complete->priv->search_text = NULL;
-
-	e_completion_clear_matches (complete);
-
-	g_free (complete->priv);
-	complete->priv = NULL;
-
-	if (parent_class->destroy)
-		(parent_class->destroy) (object);
-}
-
-static void
-match_list_free (GList *i)
-{
-	while (i) {
-		e_completion_match_unref ((ECompletionMatch *) i->data);
-		i = g_list_next (i);
-	}
-}
-
-static void
-e_completion_add_match (ECompletion *complete, ECompletionMatch *match)
-{
-	g_return_if_fail (complete && E_IS_COMPLETION (complete));
-	g_return_if_fail (match != NULL);
-
-	complete->priv->matches = g_list_append (complete->priv->matches, match);
-
-	if (complete->priv->match_count == 0) {
-
-		complete->priv->min_score = complete->priv->max_score = match->score;
-		
-	} else {
-
-		complete->priv->min_score = MIN (complete->priv->min_score, match->score);
-		complete->priv->max_score = MAX (complete->priv->max_score, match->score);
-
-	}
-
-	++complete->priv->match_count;
-}
-
-static void
-e_completion_clear_matches (ECompletion *complete)
-{
-	match_list_free (complete->priv->matches);
-	g_list_free (complete->priv->matches);
-	complete->priv->matches = NULL;
-
-	complete->priv->match_count = 0;
-
-	complete->priv->min_score = 0;
-	complete->priv->max_score = 0;
-}
-
-void
-e_completion_begin_search (ECompletion *complete, const gchar *text, gint pos, gint limit)
-{
-	g_return_if_fail (complete != NULL);
-	g_return_if_fail (E_IS_COMPLETION (complete));
-	g_return_if_fail (text != NULL);
-
-	/* Stop any prior search. */
-	if (complete->priv->searching)
-		e_completion_cancel_search (complete);
-
-	g_free (complete->priv->search_text);
-	complete->priv->search_text = g_strdup (text);
-
-	complete->priv->pos = pos;
-	complete->priv->searching = TRUE;
-
-	e_completion_clear_matches (complete);
-
-	complete->priv->limit = limit > 0 ? limit : G_MAXINT;
-
-	gtk_signal_emit (GTK_OBJECT (complete), e_completion_signals[E_COMPLETION_BEGIN_COMPLETION], text, pos, limit);
-}
-
-void
-e_completion_cancel_search (ECompletion *complete)
-{
-	g_return_if_fail (complete != NULL);
-	g_return_if_fail (E_IS_COMPLETION (complete));
-
-	/* If there is no search to cancel, just silently return. */
-	if (!complete->priv->searching)
-		return;
-
-	gtk_signal_emit (GTK_OBJECT (complete), e_completion_signals[E_COMPLETION_CANCEL_COMPLETION]);
-
-	complete->priv->searching = FALSE;
-}
-
-gboolean
-e_completion_searching (ECompletion *complete)
-{
-	g_return_val_if_fail (complete != NULL, FALSE);
-	g_return_val_if_fail (E_IS_COMPLETION (complete), FALSE);
-
-	return complete->priv->searching;
-}
-
-const gchar *
-e_completion_search_text (ECompletion *complete)
-{
-	g_return_val_if_fail (complete != NULL, NULL);
-	g_return_val_if_fail (E_IS_COMPLETION (complete), NULL);
-
-	return complete->priv->search_text;
-}
-
-gint
-e_completion_search_text_pos (ECompletion *complete)
-{
-	g_return_val_if_fail (complete != NULL, -1);
-	g_return_val_if_fail (E_IS_COMPLETION (complete), -1);
-
-	return complete->priv->pos;
-}
-
-gint
-e_completion_match_count (ECompletion *complete)
-{
-	g_return_val_if_fail (complete != NULL, 0);
-	g_return_val_if_fail (E_IS_COMPLETION (complete), 0);
-
-	return complete->priv->match_count;
-}
-
-void
-e_completion_foreach_match (ECompletion *complete, ECompletionMatchFn fn, gpointer closure)
-{
-	GList *i;
-
-	g_return_if_fail (complete != NULL);
-	g_return_if_fail (E_IS_COMPLETION (complete));
-
-	if (fn == NULL)
-		return;
-
-	for (i = complete->priv->matches; i != NULL; i = g_list_next (i)) {
-		fn ((ECompletionMatch *) i->data, closure);
-	}
-}
-
-ECompletion *
-e_completion_new (void)
-{
-	return E_COMPLETION (gtk_type_new (e_completion_get_type ()));
-}
-
-static gboolean
-e_completion_sort (ECompletion *complete)
-{
-	GList *sort_list = NULL, *i, *j;
-	gboolean diff;
-	gint count;
-
-	for (i = complete->priv->matches; i != NULL; i = g_list_next (i)) {
-		sort_list = g_list_append (sort_list, i->data);
-	}
-
-	sort_list = g_list_sort (sort_list, (GCompareFunc) e_completion_match_compare_alpha);
-
-	diff = FALSE;
-	count = 0;
-	i = complete->priv->matches;
-	j = sort_list;
-	while (i && j && !diff && count < complete->priv->limit) {
-		
-		if (i->data != j->data)
-			diff = TRUE;
-
-		i = g_list_next (i);
-		j = g_list_next (j);
-		++count;
-	}
-
-	g_list_free (complete->priv->matches);
-	complete->priv->matches = sort_list;
-
-	return diff;
-}
-
-/* Emit a restart signal and re-declare our matches, up to the limit. */
-static void
-e_completion_restart (ECompletion *complete)
-{
-	GList *i;
-	gint count = 0;
-
-	gtk_signal_emit (GTK_OBJECT (complete), e_completion_signals[E_COMPLETION_RESTART_COMPLETION]);
-	
-	i = complete->priv->matches;
-	while (i != NULL && count < complete->priv->limit) {
-		ECompletionMatch *m = (ECompletionMatch *) i->data;
-		gtk_signal_emit (GTK_OBJECT (complete), e_completion_signals[E_COMPLETION_COMPLETION], m);
-		i = g_list_next (i);
-		++count;
-	}
-}
-
-void
-e_completion_found_match (ECompletion *complete, ECompletionMatch *match)
-{
-	g_return_if_fail (complete);
-	g_return_if_fail (E_IS_COMPLETION (complete));
-	g_return_if_fail (match != NULL);
-
-	if (! complete->priv->searching) {
-		g_warning ("e_completion_found_match(...,\"%s\",...) called outside of a search", match->match_text);
-		return;
-	}
-
-	e_completion_add_match (complete, match);
-
-	/* For now, do nothing when we hit the limit --- just don't announce the incoming matches. */
-	if (complete->priv->match_count >= complete->priv->limit) {
-		e_completion_match_unref (match);
-		return;
-	}
-
-	gtk_signal_emit (GTK_OBJECT (complete), e_completion_signals[E_COMPLETION_COMPLETION], match);
-
-}
-
-void
-e_completion_end_search (ECompletion *complete)
-{
-	g_return_if_fail (complete != NULL);
-	g_return_if_fail (E_IS_COMPLETION (complete));
-	g_return_if_fail (complete->priv->searching);
-
-	/* If sorting by score accomplishes anything, issue a restart right before we end. */
-	if (e_completion_sort (complete))
-		e_completion_restart (complete);
-
-	gtk_signal_emit (GTK_OBJECT (complete), e_completion_signals[E_COMPLETION_END_COMPLETION]);
-
-	complete->priv->searching = FALSE;
-}
-
diff --git a/widgets/text/e-completion.h b/widgets/text/e-completion.h
deleted file mode 100644
index 4a06059065..0000000000
--- a/widgets/text/e-completion.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* ECompletion - A base class for text completion.
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * Author: Miguel de Icaza <miguel@ximian.com>
- * Adapted by Jon Trowbridge <trow@ximian.com>
- *
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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
- */
-
-#ifndef E_COMPLETION_H
-#define E_COMPLETION_H
-
-#include <libgnome/gnome-defs.h>
-#include <gtk/gtkobject.h>
-#include "e-completion-match.h"
-
-BEGIN_GNOME_DECLS
-
-#define E_COMPLETION_TYPE        (e_completion_get_type ())
-#define E_COMPLETION(o)          (GTK_CHECK_CAST ((o), E_COMPLETION_TYPE, ECompletion))
-#define E_COMPLETION_CLASS(k)    (GTK_CHECK_CLASS_CAST ((k), E_COMPLETION_TYPE, ECompletionClass))
-#define E_IS_COMPLETION(o)       (GTK_CHECK_TYPE ((o), E_COMPLETION_TYPE))
-#define E_IS_COMPLETION_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_COMPLETION_TYPE))
-
-typedef struct _ECompletion ECompletion;
-typedef struct _ECompletionClass ECompletionClass;
-struct _ECompletionPrivate;
-
-struct _ECompletion {
-	GtkObject parent;
-
-	struct _ECompletionPrivate *priv;
-};
-
-struct _ECompletionClass {
-	GtkObjectClass parent_class;
-
-	/* Signals */
-	void     (*begin_completion)   (ECompletion *comp, const gchar *search_text, gint pos, gint limit);
-	void     (*completion)         (ECompletion *comp, ECompletionMatch *match);
-	void     (*restart_completion) (ECompletion *comp);
-	void     (*cancel_completion)  (ECompletion *comp);
-	void     (*end_completion)     (ECompletion *comp);
-};
-
-GtkType      e_completion_get_type (void);
-
-void         e_completion_begin_search  (ECompletion *comp, const gchar *text, gint pos, gint limit);
-void         e_completion_cancel_search (ECompletion *comp);
-
-gboolean     e_completion_searching       (ECompletion *comp);
-const gchar *e_completion_search_text     (ECompletion *comp);
-gint         e_completion_search_text_pos (ECompletion *comp);
-gint         e_completion_match_count     (ECompletion *comp);
-void         e_completion_foreach_match   (ECompletion *comp, ECompletionMatchFn fn, gpointer user_data);
-
-ECompletion *e_completion_new (void);
-
-
-
-/* These functions should only be called by derived classes or search callbacks,
-   or very bad things might happen. */
-
-void         e_completion_found_match (ECompletion *comp, ECompletionMatch *);
-void         e_completion_end_search  (ECompletion *comp);
-
-END_GNOME_DECLS
-
-
-#endif /* E_COMPLETION_H */
-
diff --git a/widgets/text/e-entry-test.c b/widgets/text/e-entry-test.c
deleted file mode 100644
index 411e8d693c..0000000000
--- a/widgets/text/e-entry-test.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* test-minicard.c
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * 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.
- */
-
-
-
-#include "config.h"
-
-#include <gnome.h>
-#include "e-entry.h"
-
-static void destroy_callback(GtkWidget *app, gpointer data)
-{
-  exit(0);
-}
-
-#if 0
-static void about_callback( GtkWidget *widget, gpointer data )
-{
-  
-  const gchar *authors[] =
-  {
-    "Christopher James Lahey <clahey@umich.edu>",
-    NULL
-  };
-
-  GtkWidget *about =
-    gnome_about_new ( _( "Minicard Test" ), VERSION,
-		      _( "Copyright (C) 2000, Helix Code, Inc." ),
-		      authors,
-		      _( "This should test the minicard canvas item" ),
-		      NULL);
-  gtk_widget_show (about);                                            
-}
-#endif
-
-int main( int argc, char *argv[] )
-{
-  GtkWidget *app;
-  GtkWidget *entry;
-
-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-      textdomain (PACKAGE);*/
-
-  gnome_init( "EEntry Test", VERSION, argc, argv);
-  app = gnome_app_new("EEntry Test", NULL);
-
-  entry = e_entry_new();
-  gtk_object_set(GTK_OBJECT(entry),
-		 "editable", TRUE,
-		 "use_ellipsis", TRUE,
-		 NULL);
-  gnome_app_set_contents( GNOME_APP( app ), entry );
-
-  /* Connect the signals */
-  gtk_signal_connect( GTK_OBJECT( app ), "destroy",
-		      GTK_SIGNAL_FUNC( destroy_callback ),
-		      ( gpointer ) app );
-
-  gtk_widget_show_all( app );
-
-  gtk_main(); 
-
-  /* Not reached. */
-  return 0;
-}
diff --git a/widgets/text/e-entry.c b/widgets/text/e-entry.c
deleted file mode 100644
index 106cd70f73..0000000000
--- a/widgets/text/e-entry.c
+++ /dev/null
@@ -1,1192 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * EEntry: An EText-based entry widget
- *
- * Authors:
- *   Miguel de Icaza <miguel@helixcode.com>
- *   Chris Lahey     <clahey@helixcode.com>
- *   Jon Trowbridge  <trow@ximian.com>
- *
- * Copyright (C) 1999, 2000, 2001 Ximian Inc.
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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
- */
-
-#include <config.h>
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-#include <stdio.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtksignal.h>
-#include <gnome-xml/parser.h>
-#include <libgnomeui/gnome-canvas.h>
-#include "gal/util/e-util.h"
-#include "gal/widgets/e-canvas.h"
-#include "gal/widgets/e-canvas-utils.h"
-#include "e-completion-view.h"
-#include "e-text.h"
-#include "e-entry.h"
-
-#define MOVE_RIGHT_AND_UP 0
-
-#define EVIL_POINTER_WARPING_HACK
-
-#ifdef EVIL_POINTER_WARPING_HACK
-#include <gdk/gdkx.h>
-#endif
-
-#define MIN_ENTRY_WIDTH  150
-
-#define PARENT_TYPE gtk_table_get_type ()
-
-static GtkObjectClass *parent_class;
-
-enum {
-	E_ENTRY_CHANGED,
-	E_ENTRY_ACTIVATE,
-	E_ENTRY_POPUP,
-	E_ENTRY_LAST_SIGNAL
-};
-
-static guint e_entry_signals[E_ENTRY_LAST_SIGNAL] = { 0 };
-
-/* Object argument IDs */
-enum {
-	ARG_0,
-	ARG_MODEL,
-	ARG_EVENT_PROCESSOR,
-	ARG_TEXT,
-	ARG_FONT,
-        ARG_FONTSET,
-	ARG_FONT_GDK,
-	ARG_ANCHOR,
-	ARG_JUSTIFICATION,
-	ARG_X_OFFSET,
-	ARG_Y_OFFSET,
-	ARG_FILL_COLOR,
-	ARG_FILL_COLOR_GDK,
-	ARG_FILL_COLOR_RGBA,
-	ARG_FILL_STIPPLE,
-	ARG_EDITABLE,
-	ARG_USE_ELLIPSIS,
-	ARG_ELLIPSIS,
-	ARG_LINE_WRAP,
-	ARG_BREAK_CHARACTERS,
-	ARG_MAX_LINES,
-	ARG_ALLOW_NEWLINES,
-	ARG_DRAW_BORDERS,
-	ARG_DRAW_BACKGROUND,
-	ARG_CURSOR_POS
-};
-
-typedef struct _EEntryPrivate EEntryPrivate;
-struct _EEntryPrivate {
-	GtkJustification justification;
-
-	guint changed_proxy_tag;
-	guint activate_proxy_tag;
-	guint popup_proxy_tag;
-
-	/* Data related to completions */
-	ECompletion *completion;
-	EEntryCompletionHandler handler;
-	GtkWidget *completion_view;
-	guint nonempty_signal_id;
-	guint added_signal_id;
-	guint full_signal_id;
-	guint browse_signal_id;
-	guint unbrowse_signal_id;
-	guint activate_signal_id;
-	GtkWidget *completion_view_popup;
-	gboolean popup_is_visible;
-	gchar *pre_browse_text;
-	gint completion_delay;
-	guint completion_delay_tag;
-	gboolean ptr_grab;
-	gboolean changed_since_keypress;
-	guint changed_since_keypress_tag;
-	gint last_completion_pos;
-
-	guint draw_borders : 1;
-};
-
-static gboolean e_entry_is_empty              (EEntry *entry);
-static void e_entry_show_popup                (EEntry *entry, gboolean x);
-static void e_entry_start_completion          (EEntry *entry);
-static void e_entry_start_delayed_completion  (EEntry *entry, gint delay);
-static void e_entry_cancel_delayed_completion (EEntry *entry);
-
-static void
-canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc,
-		      EEntry *entry)
-{
-	gnome_canvas_set_scroll_region (entry->canvas,
-					0, 0, alloc->width, alloc->height);
-	gtk_object_set (GTK_OBJECT (entry->item),
-			"clip_width", (double) (alloc->width),
-			"clip_height", (double) (alloc->height),
-			NULL);
-
-	switch (entry->priv->justification) {
-	case GTK_JUSTIFY_RIGHT:
-		e_canvas_item_move_absolute(GNOME_CANVAS_ITEM(entry->item),
-					    alloc->width, 0);
-		break;
-	case GTK_JUSTIFY_CENTER:
-		e_canvas_item_move_absolute(GNOME_CANVAS_ITEM(entry->item),
-					    alloc->width / 2, 0);
-		break;
-	default:
-		e_canvas_item_move_absolute(GNOME_CANVAS_ITEM(entry->item),
-					    0, 0);
-		break;
-	}
-}
-
-static void
-canvas_size_request (GtkWidget *widget, GtkRequisition *requisition,
-		     EEntry *entry)
-{
-	int xthick, ythick;
-	
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (GNOME_IS_CANVAS (widget));
-	g_return_if_fail (requisition != NULL);
-
-	if (entry->priv->draw_borders) {
-		xthick = 2 * widget->style->klass->xthickness;
-		ythick = 2 * widget->style->klass->ythickness;
-	} else {
-		xthick = ythick = 0;
-	}
-	
-	requisition->width = 2 + MIN_ENTRY_WIDTH + xthick;
-	requisition->height = (2 + widget->style->font->ascent +
-			       widget->style->font->descent +
-			       ythick);
-}
-
-static gint
-canvas_focus_in_event (GtkWidget *widget, GdkEventFocus *focus, EEntry *entry)
-{
-	if (entry->canvas->focused_item != GNOME_CANVAS_ITEM(entry->item))
-		gnome_canvas_item_grab_focus(GNOME_CANVAS_ITEM(entry->item));
-
-	return FALSE;
-}
-
-static void
-e_entry_text_keypress (EText *text, guint keyval, guint state, EEntry *entry)
-{
-	if (entry->priv->changed_since_keypress_tag) {
-		gtk_timeout_remove (entry->priv->changed_since_keypress_tag);
-		entry->priv->changed_since_keypress_tag = 0;
-	}
-	
-	if (entry->priv->changed_since_keypress
-	    || (entry->priv->popup_is_visible && e_entry_get_position (entry) != entry->priv->last_completion_pos)) {
-		if (e_entry_is_empty (entry)) {
-			e_entry_cancel_delayed_completion (entry);
-			e_entry_show_popup (entry, FALSE);
-		} else if (entry->priv->popup_is_visible) {
-			e_entry_start_delayed_completion (entry, 1);
-		} else if (entry->priv->completion)
-			e_entry_start_delayed_completion (entry, entry->priv->completion_delay);
-	}
-	entry->priv->changed_since_keypress = FALSE;
-}
-
-static gint
-changed_since_keypress_timeout_fn (gpointer user_data)
-{
-	EEntry *entry = E_ENTRY (user_data);
-	entry->priv->changed_since_keypress = FALSE;
-	entry->priv->changed_since_keypress_tag = 0;
-	return FALSE;
-}
-
-static void
-e_entry_proxy_changed (EText *text, EEntry *entry)
-{
-	if (entry->priv->changed_since_keypress_tag)
-		gtk_timeout_remove (entry->priv->changed_since_keypress_tag);
-	entry->priv->changed_since_keypress = TRUE;
-	entry->priv->changed_since_keypress_tag = gtk_timeout_add (20, changed_since_keypress_timeout_fn, entry);
-	
-	gtk_signal_emit (GTK_OBJECT (entry), e_entry_signals [E_ENTRY_CHANGED]);
-}
-
-static void
-e_entry_proxy_activate (EText *text, EEntry *entry)
-{
-	gtk_signal_emit (GTK_OBJECT (entry), e_entry_signals [E_ENTRY_ACTIVATE]);
-}
-
-static void
-e_entry_proxy_popup (EText *text, GdkEventButton *ev, gint pos, EEntry *entry)
-{
-	gtk_signal_emit (GTK_OBJECT (entry), e_entry_signals [E_ENTRY_POPUP], ev, pos);
-}
-
-static void
-e_entry_init (GtkObject *object)
-{
-	EEntry *entry = E_ENTRY (object);
-	GtkTable *gtk_table = GTK_TABLE (object);
-
-	entry->priv = g_new0 (EEntryPrivate, 1);
-	
-	entry->canvas = GNOME_CANVAS (e_canvas_new ());
-
-	gtk_signal_connect (GTK_OBJECT (entry->canvas),
-			    "size_allocate",
-			    GTK_SIGNAL_FUNC (canvas_size_allocate),
-			    entry);
-
-	gtk_signal_connect (GTK_OBJECT (entry->canvas),
-			    "size_request",
-			    GTK_SIGNAL_FUNC (canvas_size_request),
-			    entry);
-
-	gtk_signal_connect(GTK_OBJECT (entry->canvas),
-			   "focus_in_event",
-			   GTK_SIGNAL_FUNC(canvas_focus_in_event),
-			   entry);
-
-	entry->priv->draw_borders = TRUE;
-
-	entry->item = E_TEXT(gnome_canvas_item_new(
-		gnome_canvas_root (entry->canvas),
-		e_text_get_type(),
-		"clip", TRUE,
-		"fill_clip_rectangle", TRUE,
-		"anchor", GTK_ANCHOR_NW,
-		"draw_borders", TRUE,
-		"draw_background", TRUE,
-		"max_lines", 1,
-		"editable", TRUE,
-		"allow_newlines", FALSE,
-		NULL));
-
-	gtk_signal_connect (GTK_OBJECT (entry->item),
-			    "keypress",
-			    GTK_SIGNAL_FUNC (e_entry_text_keypress),
-			    entry);
-
-	entry->priv->justification = GTK_JUSTIFY_LEFT;
-	gtk_table_attach (gtk_table, GTK_WIDGET (entry->canvas),
-			  0, 1, 0, 1,
-			  GTK_EXPAND | GTK_FILL | GTK_SHRINK,
-			  GTK_EXPAND | GTK_FILL | GTK_SHRINK,
-			  0, 0);
-	gtk_widget_show (GTK_WIDGET (entry->canvas));
-
-	/*
-	 * Proxy functions: we proxy the changed and activate signals
-	 * from the item to ourselves
-	 */
-	entry->priv->changed_proxy_tag = gtk_signal_connect (
-		GTK_OBJECT (entry->item),
-		"changed",
-		GTK_SIGNAL_FUNC (e_entry_proxy_changed),
-		entry);
-	entry->priv->activate_proxy_tag = gtk_signal_connect (
-		GTK_OBJECT (entry->item),
-		"activate",
-		GTK_SIGNAL_FUNC (e_entry_proxy_activate),
-		entry);
-	entry->priv->popup_proxy_tag = gtk_signal_connect (
-		GTK_OBJECT (entry->item),
-		"popup",
-		GTK_SIGNAL_FUNC (e_entry_proxy_popup),
-		entry);
-
-	entry->priv->completion_delay = 1;
-}
-
-/**
- * e_entry_construct
- * 
- * Constructs the given EEntry.
- * 
- **/
-void
-e_entry_construct (EEntry *entry)
-{
-	/* Do nothing */
-}
-
-
-/**
- * e_entry_new
- * 
- * Creates a new EEntry.
- * 
- * Returns: The new EEntry
- **/
-GtkWidget *
-e_entry_new (void)
-{
-	EEntry *entry;
-	entry = gtk_type_new (e_entry_get_type ());
-	e_entry_construct (entry);
-
-	return GTK_WIDGET (entry);
-}
-
-const gchar *
-e_entry_get_text (EEntry *entry)
-{
-	g_return_val_if_fail (entry != NULL && E_IS_ENTRY (entry), NULL);
-
-	return e_text_model_get_text (entry->item->model);
-}
-
-void
-e_entry_set_text (EEntry *entry, const gchar *txt)
-{
-	g_return_if_fail (entry != NULL && E_IS_ENTRY (entry));
-
-	e_text_model_set_text (entry->item->model, txt);
-}
-
-static void
-e_entry_set_text_quiet (EEntry *entry, const gchar *txt)
-{
-	g_return_if_fail (entry != NULL && E_IS_ENTRY (entry));
-
-	gtk_signal_handler_block (GTK_OBJECT (entry->item), entry->priv->changed_proxy_tag);
-	e_entry_set_text (entry, txt);
-	gtk_signal_handler_unblock (GTK_OBJECT (entry->item), entry->priv->changed_proxy_tag);
-}
-
-
-void
-e_entry_set_editable (EEntry *entry, gboolean am_i_editable)
-{
-	g_return_if_fail (entry != NULL && E_IS_ENTRY (entry));
-
-	gtk_object_set (GTK_OBJECT (entry->item), "editable", am_i_editable, NULL);
-}
-
-gint
-e_entry_get_position (EEntry *entry)
-{
-	g_return_val_if_fail (entry != NULL && E_IS_ENTRY (entry), -1);
-
-	return entry->item->selection_start;
-}
-
-void
-e_entry_set_position (EEntry *entry, gint pos)
-{
-	g_return_if_fail (entry != NULL && E_IS_ENTRY (entry));
-	if (pos < 0)
-		pos = 0;
-	else if (pos > e_text_model_get_text_length (entry->item->model))
-		pos = e_text_model_get_text_length (entry->item->model);
-
-	entry->item->selection_start = entry->item->selection_end = pos;
-}
-
-void
-e_entry_select_region (EEntry *entry, gint pos1, gint pos2)
-{
-	gint len;
-
-	g_return_if_fail (entry != NULL && E_IS_ENTRY (entry));
-	
-	len = e_text_model_get_text_length (entry->item->model);
-	pos1 = CLAMP (pos1, 0, len);
-	pos2 = CLAMP (pos2, 0, len);
-
-	entry->item->selection_start = MIN (pos1, pos2);
-	entry->item->selection_end   = MAX (pos1, pos2);
-}
-
-/** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** **/
-
-/*** Completion-related code ***/
-
-static gboolean
-e_entry_is_empty (EEntry *entry)
-{
-	const gchar *txt = e_entry_get_text (entry);
-
-	if (txt == NULL)
-		return TRUE;
-
-	while (*txt) {
-		if (!isspace ((gint) *txt))
-			return FALSE;
-		++txt;
-	}
-	
-	return TRUE;
-}
-
-static void
-e_entry_show_popup (EEntry *entry, gboolean visible)
-{
-	GtkWidget *pop = entry->priv->completion_view_popup;
-
-	if (pop == NULL)
-		return;
-
-	if (visible) {
-		GtkAllocation *dim = &(GTK_WIDGET (entry)->allocation);
-		gint x, y, xo, yo, fudge;
-		const GdkEventMask grab_mask = (GdkEventMask)GDK_BUTTON_PRESS_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_RELEASE_MASK;
-
-		/* Figure out where to put our popup. */
-		gdk_window_get_origin (GTK_WIDGET (entry)->window, &xo, &yo);
-		x = xo + dim->x;
-		y = yo + dim->height + dim->y;
-
-#if MOVE_RIGHT_AND_UP
-		/* Put our popup slightly to the right and up, to try to give a visual cue that this popup
-		 is tied to this entry.  Otherwise one-row popups can sort of "blend" with an entry
-		 directly below. */
-		fudge = MAX (dim->height/10, 3); /* just in case we are using a really big font, etc. */
-		x += 2*fudge;
-		y -= fudge;
-#else
-		fudge = 1;
-		y -= fudge;
-#endif
-		gtk_widget_set_uposition (pop, x, y);
-		e_completion_view_set_width (E_COMPLETION_VIEW (entry->priv->completion_view), dim->width);
-
-#ifdef EVIL_POINTER_WARPING_HACK
-		/*
-		  I should have learned by now to listen to Havoc... 
-		  http://developer.gnome.org/doc/GGAD/faqs.html
-		*/
-		   
-		if (! entry->priv->popup_is_visible) {
-			GdkWindow *gwin = GTK_WIDGET (entry)->window;
-			gint xx, yy;
-			gdk_window_get_pointer (gwin, &xx, &yy, NULL);
-			xx += xo;
-			yy += yo;
-			
-			/* If we are inside the "zone of death" where the popup will appear, warp the pointer to safety.
-			   This is a horrible thing to do. */
-			if (y <= yy && yy < yy + dim->height && x <= xx && xx < xx + dim->width) {
-				XWarpPointer (GDK_WINDOW_XDISPLAY (gwin), None, GDK_WINDOW_XWINDOW (gwin),
-					      0, 0, 0, 0, 
-					      xx - xo, (y-1) - yo);
-			}
-		}
-#endif
-	
-		gtk_widget_show (pop);
-
-
-		if (getenv ("GAL_E_ENTRY_NO_GRABS_HACK") == NULL && !entry->priv->ptr_grab) {
-			entry->priv->ptr_grab = (0 == gdk_pointer_grab (GTK_WIDGET (entry->priv->completion_view)->window, TRUE,
-									grab_mask, NULL, NULL, GDK_CURRENT_TIME));
-			if (entry->priv->ptr_grab) {
- 				gtk_grab_add (GTK_WIDGET (entry->priv->completion_view));
-			}
-		}
-		
-		
-	} else {
-
-		gtk_widget_hide (pop);
-
-		if (entry->priv->ptr_grab) {
-			gdk_pointer_ungrab (GDK_CURRENT_TIME);
-			gtk_grab_remove (GTK_WIDGET (entry->priv->completion_view));
-		}
-
-		entry->priv->ptr_grab = FALSE;
-
-		entry->priv->last_completion_pos = -1;
-	}
-
-	e_completion_view_set_editable (E_COMPLETION_VIEW (entry->priv->completion_view), visible);
-	entry->priv->popup_is_visible = visible;
-}
-
-static void
-e_entry_refresh_popup (EEntry *entry)
-{
-	if (entry->priv->popup_is_visible)
-		e_entry_show_popup (entry, TRUE);
-}
-
-static void
-e_entry_start_completion (EEntry *entry)
-{
-	if (entry->priv->completion == NULL)
-		return;
-
-	e_entry_cancel_delayed_completion (entry);
-
-	if (e_entry_is_empty (entry))
-		return;
-	
-	e_completion_begin_search (entry->priv->completion,
-				   e_entry_get_text (entry),
-				   entry->priv->last_completion_pos = e_entry_get_position (entry),
-				   0); /* No limit.  Probably a bad idea. */
-}
-
-static gboolean
-start_delayed_cb (gpointer user_data)
-{
-	EEntry *entry = E_ENTRY (user_data);
-	entry->priv->completion_delay_tag = 0;
-	e_entry_start_completion (entry);
-	return FALSE;
-}
-
-static void
-e_entry_start_delayed_completion (EEntry *entry, gint delay)
-{
-	if (delay < 0)
-		return;
-
-	e_entry_cancel_delayed_completion (entry);
-	entry->priv->completion_delay_tag = gtk_timeout_add (MAX (delay, 1), start_delayed_cb, entry);
-}
-
-static void
-e_entry_cancel_delayed_completion (EEntry *entry)
-{
-	if (entry->priv->completion == NULL)
-		return;
-
-	if (entry->priv->completion_delay_tag) {
-		gtk_timeout_remove (entry->priv->completion_delay_tag);
-		entry->priv->completion_delay_tag = 0;
-	}
-}
-
-static void
-nonempty_cb (ECompletionView *view, gpointer user_data)
-{
-	EEntry *entry = E_ENTRY (user_data);
-
-	e_entry_show_popup (entry, TRUE);
-}
-
-static void
-added_cb (ECompletionView *view, gpointer user_data)
-{
-	EEntry *entry = E_ENTRY (user_data);
-	e_entry_refresh_popup (entry);
-}
-
-static void
-full_cb (ECompletionView *view, gpointer user_data)
-{
-	EEntry *entry = E_ENTRY (user_data);
-
-	e_entry_show_popup (entry, view->choice_count > 0);
-}
-
-static void
-browse_cb (ECompletionView *view, ECompletionMatch *match, gpointer user_data)
-{
-	EEntry *entry = E_ENTRY (user_data);
-	
-	if (match == NULL) {
-		/* Requesting a completion. */
-		e_entry_start_completion (entry);
-		return;
-	}
-
-	if (entry->priv->pre_browse_text == NULL)
-		entry->priv->pre_browse_text = g_strdup (e_entry_get_text (entry));
-
-	/* If there is no other handler in place, echo the selected completion in
-	   the entry. */
-	if (entry->priv->handler == NULL)
-		e_entry_set_text_quiet (entry, e_completion_match_get_match_text (match));
-}
-
-static void
-unbrowse_cb (ECompletionView *view, gpointer user_data)
-{
-	EEntry *entry = E_ENTRY (user_data);
-
-	if (entry->priv->pre_browse_text) {
-
-		if (entry->priv->handler == NULL)
-			e_entry_set_text_quiet (entry, entry->priv->pre_browse_text);
-
-		g_free (entry->priv->pre_browse_text);
-		entry->priv->pre_browse_text = NULL;
-	}
-
-	e_entry_show_popup (entry, FALSE);
-}
-
-static void
-activate_cb (ECompletionView *view, ECompletionMatch *match, gpointer user_data)
-{
-	EEntry *entry = E_ENTRY (user_data);
-
-	e_entry_cancel_delayed_completion (entry);
-	
-	g_free (entry->priv->pre_browse_text);
-	entry->priv->pre_browse_text = NULL;
-	e_entry_show_popup (entry, FALSE);
-
-	if (entry->priv->handler)
-		entry->priv->handler (entry, match);
-	else
-		e_entry_set_text (entry, match->match_text);
-
-	e_entry_cancel_delayed_completion (entry);
-}
-
-void
-e_entry_enable_completion (EEntry *entry, ECompletion *completion)
-{
-	g_return_if_fail (entry != NULL && E_IS_ENTRY (entry));
-	g_return_if_fail (completion != NULL && E_IS_COMPLETION (completion));
-
-	e_entry_enable_completion_full (entry, completion, -1, NULL);
-}
-
-static void
-button_press_cb (GtkWidget *w, GdkEvent *ev, gpointer user_data)
-{
-	EEntry *entry = E_ENTRY (user_data);
-	GtkWidget *child;
-
-	/* Bail out if our click happened inside of our widget. */
-	child = gtk_get_event_widget (ev);
-	if (child != w) {
-		while (child) {
-			if (child == w)
-				return;
-			child = child->parent;
-		}
-	}
-
-	/* Treat this as an unbrowse */
-	unbrowse_cb (E_COMPLETION_VIEW (w), entry);
-}
-
-static gint
-key_press_cb (GtkWidget *w, GdkEventKey *ev, gpointer user_data)
-{
-	gint rv = 0;
-	/* Forward signal */
-	gtk_signal_emit_by_name (GTK_OBJECT (user_data), "key_press_event", ev, &rv);
-	return rv;
-}
-
-static gint
-key_release_cb (GtkWidget *w, GdkEventKey *ev, gpointer user_data)
-{
-	gint rv = 0;
-	/* Forward signal */
-	gtk_signal_emit_by_name (GTK_OBJECT (user_data), "key_release_event", ev, &rv);
-	return rv;
-}
-
-void
-e_entry_enable_completion_full (EEntry *entry, ECompletion *completion, gint delay, EEntryCompletionHandler handler)
-{
-	g_return_if_fail (entry != NULL && E_IS_ENTRY (entry));
-	g_return_if_fail (completion != NULL && E_IS_COMPLETION (completion));
-
-	/* For now, completion can't be changed mid-stream. */
-	g_return_if_fail (entry->priv->completion == NULL);
-
-	entry->priv->completion = completion;
-	gtk_object_ref (GTK_OBJECT (completion));
-	gtk_object_sink (GTK_OBJECT (completion));
-	
-	entry->priv->completion_delay = delay;
-	entry->priv->handler = handler;
-
-	entry->priv->completion_view = e_completion_view_new (completion);
-	/* Make the up and down keys enable and disable completions. */
-	e_completion_view_set_complete_key (E_COMPLETION_VIEW (entry->priv->completion_view), GDK_Down);
-	e_completion_view_set_uncomplete_key (E_COMPLETION_VIEW (entry->priv->completion_view), GDK_Up);
-
-	gtk_signal_connect_after (GTK_OBJECT (entry->priv->completion_view),
-				  "button_press_event",
-				  GTK_SIGNAL_FUNC (button_press_cb),
-				  entry);
-
-	entry->priv->nonempty_signal_id = gtk_signal_connect (GTK_OBJECT (entry->priv->completion_view),
-							      "nonempty",
-							      GTK_SIGNAL_FUNC (nonempty_cb),
-							      entry);
-
-	entry->priv->added_signal_id = gtk_signal_connect (GTK_OBJECT (entry->priv->completion_view),
-							   "added",
-							   GTK_SIGNAL_FUNC (added_cb),
-							   entry);
-
-	entry->priv->full_signal_id = gtk_signal_connect (GTK_OBJECT (entry->priv->completion_view),
-							  "full",
-							  GTK_SIGNAL_FUNC (full_cb),
-							  entry);
-
-	entry->priv->browse_signal_id = gtk_signal_connect (GTK_OBJECT (entry->priv->completion_view),
-							    "browse",
-							    GTK_SIGNAL_FUNC (browse_cb),
-							    entry);
-
-	entry->priv->unbrowse_signal_id = gtk_signal_connect (GTK_OBJECT (entry->priv->completion_view),
-							      "unbrowse",
-							      GTK_SIGNAL_FUNC (unbrowse_cb),
-							      entry);
-
-	entry->priv->activate_signal_id = gtk_signal_connect (GTK_OBJECT (entry->priv->completion_view),
-							      "activate",
-							      GTK_SIGNAL_FUNC (activate_cb),
-							      entry);
-
-	entry->priv->completion_view_popup = gtk_window_new (GTK_WINDOW_POPUP);
-
-	gtk_signal_connect (GTK_OBJECT (entry->priv->completion_view_popup),
-			    "key_press_event",
-			    GTK_SIGNAL_FUNC (key_press_cb),
-			    entry->canvas);
-	gtk_signal_connect (GTK_OBJECT (entry->priv->completion_view_popup),
-			    "key_release_event",
-			    GTK_SIGNAL_FUNC (key_release_cb),
-			    entry->canvas);
-
-	gtk_object_ref (GTK_OBJECT (entry->priv->completion_view_popup));
-	gtk_object_sink (GTK_OBJECT (entry->priv->completion_view_popup));
-	gtk_window_set_policy (GTK_WINDOW (entry->priv->completion_view_popup), TRUE, TRUE, TRUE);
-	gtk_container_add (GTK_CONTAINER (entry->priv->completion_view_popup), entry->priv->completion_view);
-	gtk_widget_show (entry->priv->completion_view);
-
-	e_completion_view_connect_keys (
-		E_COMPLETION_VIEW (entry->priv->completion_view),
-		GTK_WIDGET (entry->canvas));
-}
-
-/** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** **/
-
-static void
-et_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EEntry *entry = E_ENTRY (o);
-	GtkObject *item = GTK_OBJECT (entry->item);
-	
-	switch (arg_id){
-	case ARG_MODEL:
-		gtk_object_get(item,
-			       "model", &GTK_VALUE_OBJECT (*arg),
-			       NULL);
-		break;
-
-	case ARG_EVENT_PROCESSOR:
-		gtk_object_get(item,
-			       "event_processor", &GTK_VALUE_OBJECT (*arg),
-			       NULL);
-		break;
-
-	case ARG_TEXT:
-		gtk_object_get(item,
-			       "text", &GTK_VALUE_STRING (*arg),
-			       NULL);
-		break;
-
-	case ARG_FONT_GDK:
-		gtk_object_get(item,
-			       "font_gdk", &GTK_VALUE_BOXED (*arg),
-			       NULL);
-		break;
-
-	case ARG_JUSTIFICATION:
-		gtk_object_get(item,
-			       "justification", &GTK_VALUE_ENUM (*arg),
-			       NULL);
-		break;
-
-	case ARG_FILL_COLOR_GDK:
-		gtk_object_get(item,
-			       "fill_color_gdk", &GTK_VALUE_BOXED (*arg),
-			       NULL);
-		break;
-
-	case ARG_FILL_COLOR_RGBA:
-		gtk_object_get(item,
-			       "fill_color_rgba", &GTK_VALUE_UINT (*arg),
-			       NULL);
-		break;
-
-	case ARG_FILL_STIPPLE:
-		gtk_object_get(item,
-			       "fill_stiple", &GTK_VALUE_BOXED (*arg),
-			       NULL);
-		break;
-
-	case ARG_EDITABLE:
-		gtk_object_get(item,
-			       "editable", &GTK_VALUE_BOOL (*arg),
-			       NULL);
-		break;
-
-	case ARG_USE_ELLIPSIS:
-		gtk_object_get(item,
-			       "use_ellipsis", &GTK_VALUE_BOOL (*arg),
-			       NULL);
-		break;
-
-	case ARG_ELLIPSIS:
-		gtk_object_get(item,
-			       "ellipsis", &GTK_VALUE_STRING (*arg),
-			       NULL);
-		break;
-
-	case ARG_LINE_WRAP:
-		gtk_object_get(item,
-			       "line_wrap", &GTK_VALUE_BOOL (*arg),
-			       NULL);
-		break;
-		
-	case ARG_BREAK_CHARACTERS:
-		gtk_object_get(item,
-			       "break_characters", &GTK_VALUE_STRING (*arg),
-			       NULL);
-		break;
-
-	case ARG_MAX_LINES:
-		gtk_object_get(item,
-			       "max_lines", &GTK_VALUE_INT (*arg),
-			       NULL);
-		break;
-	case ARG_ALLOW_NEWLINES:
-		gtk_object_get(item,
-			       "allow_newlines", &GTK_VALUE_BOOL (*arg),
-			       NULL);
-		break;
-
-	case ARG_DRAW_BORDERS:
-		GTK_VALUE_BOOL (*arg) = entry->priv->draw_borders;
-		break;
-
-	case ARG_DRAW_BACKGROUND:
-		gtk_object_get (item,
-				"draw_background", &GTK_VALUE_BOOL (*arg),
-				NULL);
-		break;
-
-	case ARG_CURSOR_POS:
-		gtk_object_get (item,
-				"cursor_pos", &GTK_VALUE_INT (*arg),
-				NULL);
-		
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-et_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EEntry *entry = E_ENTRY (o);
-	GtkObject *item = GTK_OBJECT (entry->item);
-	GtkAnchorType anchor;
-	double width, height;
-	gint xthick;
-	gint ythick;
-	GtkWidget *widget = GTK_WIDGET(entry->canvas);
-	
-	switch (arg_id){
-	case ARG_MODEL:
-		gtk_object_set(item,
-			       "model", GTK_VALUE_OBJECT (*arg),
-			       NULL);
-		break;
-
-	case ARG_EVENT_PROCESSOR:
-		gtk_object_set(item,
-			       "event_processor", GTK_VALUE_OBJECT (*arg),
-			       NULL);
-		break;
-
-	case ARG_TEXT:
-
-		gtk_object_set(item,
-			       "text", GTK_VALUE_STRING (*arg),
-			       NULL);
-		break;
-
-	case ARG_FONT:
-		gtk_object_set(item,
-			       "font", GTK_VALUE_STRING (*arg),
-			       NULL);
-		break;
-
-	case ARG_FONTSET:
-		gtk_object_set(item,
-			       "fontset", GTK_VALUE_STRING (*arg),
-			       NULL);
-		break;
-
-	case ARG_FONT_GDK:
-		gtk_object_set(item,
-			       "font_gdk", GTK_VALUE_BOXED (*arg),
-			       NULL);
-		break;
-
-	case ARG_JUSTIFICATION:
-		entry->priv->justification = GTK_VALUE_ENUM (*arg);
-		gtk_object_get(item,
-			       "clip_width", &width,
-			       "clip_height", &height,
-			       NULL);
-
-		if (entry->priv->draw_borders) {
-			xthick = 0;
-			ythick = 0;
-		} else {
-			xthick = widget->style->klass->xthickness;
-			ythick = widget->style->klass->ythickness;
-		}
-
-		switch (entry->priv->justification) {
-		case GTK_JUSTIFY_CENTER:
-			anchor = GTK_ANCHOR_N;
-			e_canvas_item_move_absolute(GNOME_CANVAS_ITEM(entry->item), width / 2, ythick);
-			break;
-		case GTK_JUSTIFY_RIGHT:
-			anchor = GTK_ANCHOR_NE;
-			e_canvas_item_move_absolute(GNOME_CANVAS_ITEM(entry->item), width - xthick, ythick);
-			break;
-		default:
-			anchor = GTK_ANCHOR_NW;
-			e_canvas_item_move_absolute(GNOME_CANVAS_ITEM(entry->item), xthick, ythick);
-			break;
-		}
-		gtk_object_set(item,
-			       "justification", entry->priv->justification,
-			       "anchor", anchor,
-			       NULL);
-		break;
-
-	case ARG_FILL_COLOR:
-		gtk_object_set(item,
-			       "fill_color", GTK_VALUE_STRING (*arg),
-			       NULL);
-		break;
-
-	case ARG_FILL_COLOR_GDK:
-		gtk_object_set(item,
-			       "fill_color_gdk", GTK_VALUE_BOXED (*arg),
-			       NULL);
-		break;
-
-	case ARG_FILL_COLOR_RGBA:
-		gtk_object_set(item,
-			       "fill_color_rgba", GTK_VALUE_UINT (*arg),
-			       NULL);
-		break;
-
-	case ARG_FILL_STIPPLE:
-		gtk_object_set(item,
-			       "fill_stiple", GTK_VALUE_BOXED (*arg),
-			       NULL);
-		break;
-
-	case ARG_EDITABLE:
-		gtk_object_set(item,
-			       "editable", GTK_VALUE_BOOL (*arg),
-			       NULL);
-		break;
-
-	case ARG_USE_ELLIPSIS:
-		gtk_object_set(item,
-			       "use_ellipsis", GTK_VALUE_BOOL (*arg),
-			       NULL);
-		break;
-
-	case ARG_ELLIPSIS:
-		gtk_object_set(item,
-			       "ellipsis", GTK_VALUE_STRING (*arg),
-			       NULL);
-		break;
-
-	case ARG_LINE_WRAP:
-		gtk_object_set(item,
-			       "line_wrap", GTK_VALUE_BOOL (*arg),
-			       NULL);
-		break;
-		
-	case ARG_BREAK_CHARACTERS:
-		gtk_object_set(item,
-			       "break_characters", GTK_VALUE_STRING (*arg),
-			       NULL);
-		break;
-
-	case ARG_MAX_LINES:
-		gtk_object_set(item,
-			       "max_lines", GTK_VALUE_INT (*arg),
-			       NULL);
-		break;
-
-	case ARG_ALLOW_NEWLINES:
-		gtk_object_set(item,
-			       "allow_newlines", GTK_VALUE_BOOL (*arg),
-			       NULL);
-		break;
-
-	case ARG_DRAW_BORDERS: {
-		gboolean need_queue;
-		
-		need_queue = (entry->priv->draw_borders ^ GTK_VALUE_BOOL (*arg));
-		gtk_object_set (item, "draw_borders", GTK_VALUE_BOOL (*arg), NULL);
-		entry->priv->draw_borders = GTK_VALUE_BOOL (*arg);
-		if (need_queue)
-			gtk_widget_queue_resize (GTK_WIDGET (entry));
-		break;
-	}
-
-	case ARG_CURSOR_POS:
-		gtk_object_set (item,
-				"cursor_pos", GTK_VALUE_INT (*arg), NULL);
-		break;
-		
-	case ARG_DRAW_BACKGROUND:
-		gtk_object_set (item, "draw_background",
-				GTK_VALUE_BOOL (*arg), NULL);
-		break;
-	}
-}
-
-static void
-e_entry_destroy (GtkObject *object)
-{
-	EEntry *entry = E_ENTRY (object);
-
-	if (entry->priv->completion_delay_tag)
-		gtk_timeout_remove (entry->priv->completion_delay_tag);
-
-	if (entry->priv->completion)
-		gtk_object_unref (GTK_OBJECT (entry->priv->completion));
-	if (entry->priv->completion_view_popup)
-		gtk_widget_destroy (entry->priv->completion_view_popup);
-	g_free (entry->priv->pre_browse_text);
-
-	if (entry->priv->changed_since_keypress_tag)
-		gtk_timeout_remove (entry->priv->changed_since_keypress_tag);
-
-	if (entry->priv->ptr_grab)
-		gdk_pointer_ungrab (GDK_CURRENT_TIME);
-
-	g_free (entry->priv);
-	entry->priv = NULL;
-}
-
-static void
-e_entry_class_init (GtkObjectClass *object_class)
-{
-	EEntryClass *klass = E_ENTRY_CLASS(object_class);
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->set_arg = et_set_arg;
-	object_class->get_arg = et_get_arg;
-	object_class->destroy = e_entry_destroy;
-
-	klass->changed = NULL;
-	klass->activate = NULL;
-
-	e_entry_signals[E_ENTRY_CHANGED] = gtk_signal_new ("changed",
-							   GTK_RUN_LAST,
-							   object_class->type,
-							   GTK_SIGNAL_OFFSET (EEntryClass, changed),
-							   gtk_marshal_NONE__NONE,
-							   GTK_TYPE_NONE, 0);
-
-	e_entry_signals[E_ENTRY_ACTIVATE] = gtk_signal_new ("activate",
-							    GTK_RUN_LAST,
-							    object_class->type,
-							    GTK_SIGNAL_OFFSET (EEntryClass, activate),
-							    gtk_marshal_NONE__NONE,
-							    GTK_TYPE_NONE, 0);
-
-	e_entry_signals[E_ENTRY_POPUP] = gtk_signal_new ("popup",
-							 GTK_RUN_LAST,
-							 object_class->type,
-							 GTK_SIGNAL_OFFSET (EEntryClass, popup),
-							 gtk_marshal_NONE__POINTER_INT,
-							 GTK_TYPE_NONE, 2, GTK_TYPE_POINTER, GTK_TYPE_INT);
-
-
-	gtk_object_class_add_signals (object_class, e_entry_signals, E_ENTRY_LAST_SIGNAL);
-
-	gtk_object_add_arg_type ("EEntry::model",
-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_MODEL);  
-	gtk_object_add_arg_type ("EEntry::event_processor",
-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_EVENT_PROCESSOR);
-	gtk_object_add_arg_type ("EEntry::text",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_TEXT);
-	gtk_object_add_arg_type ("EEntry::font",
-				 GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_FONT);
-	gtk_object_add_arg_type ("EEntry::fontset",
-				 GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_FONTSET);
-	gtk_object_add_arg_type ("EEntry::font_gdk",
-				 GTK_TYPE_GDK_FONT, GTK_ARG_READWRITE, ARG_FONT_GDK);
-	gtk_object_add_arg_type ("EEntry::justification",
-				 GTK_TYPE_JUSTIFICATION, GTK_ARG_READWRITE, ARG_JUSTIFICATION);
-	gtk_object_add_arg_type ("EEntry::fill_color",
-				 GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_FILL_COLOR);
-	gtk_object_add_arg_type ("EEntry::fill_color_gdk",
-				 GTK_TYPE_GDK_COLOR, GTK_ARG_READWRITE, ARG_FILL_COLOR_GDK);
-	gtk_object_add_arg_type ("EEntry::fill_color_rgba",
-				 GTK_TYPE_UINT, GTK_ARG_READWRITE, ARG_FILL_COLOR_RGBA);
-	gtk_object_add_arg_type ("EEntry::fill_stipple",
-				 GTK_TYPE_GDK_WINDOW, GTK_ARG_READWRITE, ARG_FILL_STIPPLE);
-	gtk_object_add_arg_type ("EEntry::editable",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_EDITABLE);
-	gtk_object_add_arg_type ("EEntry::use_ellipsis",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_USE_ELLIPSIS);
-	gtk_object_add_arg_type ("EEntry::ellipsis",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ELLIPSIS);
-	gtk_object_add_arg_type ("EEntry::line_wrap",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_LINE_WRAP);
-	gtk_object_add_arg_type ("EEntry::break_characters",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_BREAK_CHARACTERS);
-	gtk_object_add_arg_type ("EEntry::max_lines",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_MAX_LINES);
-	gtk_object_add_arg_type ("EEntry::allow_newlines",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_ALLOW_NEWLINES);
-	gtk_object_add_arg_type ("EEntry::draw_borders",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_DRAW_BORDERS);
-	gtk_object_add_arg_type ("EEntry::draw_background",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_DRAW_BACKGROUND);
-	gtk_object_add_arg_type ("EEntry::cursor_pos",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_CURSOR_POS);
-}
-
-E_MAKE_TYPE(e_entry, "EEntry", EEntry, e_entry_class_init, e_entry_init, PARENT_TYPE);
diff --git a/widgets/text/e-entry.h b/widgets/text/e-entry.h
deleted file mode 100644
index 948bb8a4b2..0000000000
--- a/widgets/text/e-entry.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * EEntry: An EText-based entry widget
- *
- * Authors:
- *   Miguel de Icaza <miguel@helixcode.com>
- *   Chris Lahey     <clahey@helixcode.com>
- *   Jon Trowbridge  <trow@ximian.com>
- *
- * Copyright (C) 1999, 2000, 2001 Ximian Inc.
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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
- */
-
-
-#ifndef _E_ENTRY_H_
-#define _E_ENTRY_H_
-
-#include <libgnomeui/gnome-canvas.h>
-#include <gtk/gtktable.h>
-#include <gnome-xml/tree.h>
-#include <gal/e-text/e-text.h>
-#include "e-completion.h"
-
-
-BEGIN_GNOME_DECLS
-
-#define E_ENTRY_TYPE        (e_entry_get_type ())
-#define E_ENTRY(o)          (GTK_CHECK_CAST ((o), E_ENTRY_TYPE, EEntry))
-#define E_ENTRY_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_ENTRY_TYPE, EEntryClass))
-#define E_IS_ENTRY(o)       (GTK_CHECK_TYPE ((o), E_ENTRY_TYPE))
-#define E_IS_ENTRY_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_ENTRY_TYPE))
-
-typedef struct _EEntry EEntry;
-typedef struct _EEntryClass EEntryClass;
-struct _EEntryPrivate;
-
-typedef void (*EEntryCompletionHandler) (EEntry *entry, ECompletionMatch *match);
-
-struct _EEntry {
-	GtkTable parent;
-
-	GnomeCanvas *canvas;
-	EText *item;
-
-	struct _EEntryPrivate *priv;
-};
-
-struct _EEntryClass {
-	GtkTableClass parent_class;
-
-	void (* changed)  (EEntry *entry);
-	void (* activate) (EEntry *entry);
-	void (* popup)    (EEntry *entry, GdkEventButton *ev, gint pos);
-};
-
-GtkType      e_entry_get_type          (void);
-
-void         e_entry_construct         (EEntry *entry);
-GtkWidget   *e_entry_new               (void);
-
-const gchar *e_entry_get_text          (EEntry *entry);
-void         e_entry_set_text          (EEntry *entry, const gchar *text);
-
-gint         e_entry_get_position      (EEntry *entry);
-void         e_entry_set_position      (EEntry *entry, gint);
-void         e_entry_select_region     (EEntry *entry, gint start, gint end);
-
-void         e_entry_set_editable      (EEntry *entry, gboolean editable);
-
-void         e_entry_enable_completion      (EEntry *entry, ECompletion *completion);
-void         e_entry_enable_completion_full (EEntry *entry, ECompletion *completion, gint autocomplete_delay,
-					     EEntryCompletionHandler handler);
-
-END_GNOME_DECLS
-
-#endif /* _E_ENTRY_H_ */
diff --git a/widgets/text/e-table-text-model.c b/widgets/text/e-table-text-model.c
deleted file mode 100644
index daf0456110..0000000000
--- a/widgets/text/e-table-text-model.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* ETableTextModel - Text item model for evolution.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Chris Lahey <clahey@umich.edu>
- *
- * A majority of code taken from:
- *
- * Text item type for GnomeCanvas widget
- *
- * GnomeCanvas is basically a port of the Tk toolkit's most excellent
- * canvas widget.  Tk is copyrighted by the Regents of the University
- * of California, Sun Microsystems, and other parties.
- *
- * Copyright (C) 1998 The Free Software Foundation
- *
- * Author: Federico Mena <federico@nuclecu.unam.mx> */
-
-#include <config.h>
-#include <ctype.h>
-#include <gtk/gtksignal.h>
-#include "e-table-text-model.h"
-
-static void e_table_text_model_class_init (ETableTextModelClass *class);
-static void e_table_text_model_init (ETableTextModel *model);
-static void e_table_text_model_destroy (GtkObject *object);
-
-static const gchar *e_table_text_model_get_text (ETextModel *model);
-static void e_table_text_model_set_text (ETextModel *model, const gchar *text);
-static void e_table_text_model_insert (ETextModel *model, gint postion, const gchar *text);
-static void e_table_text_model_insert_length (ETextModel *model, gint postion, const gchar *text, gint length);
-static void e_table_text_model_delete (ETextModel *model, gint postion, gint length);
-
-static GtkObject *parent_class;
-
-
-
-/**
- * e_table_text_model_get_type:
- * @void: 
- * 
- * Registers the &ETableTextModel class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &ETableTextModel class.
- **/
-GtkType
-e_table_text_model_get_type (void)
-{
-	static GtkType model_type = 0;
-
-	if (!model_type) {
-		GtkTypeInfo model_info = {
-			"ETableTextModel",
-			sizeof (ETableTextModel),
-			sizeof (ETableTextModelClass),
-			(GtkClassInitFunc) e_table_text_model_class_init,
-			(GtkObjectInitFunc) e_table_text_model_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		model_type = gtk_type_unique (e_text_model_get_type (), &model_info);
-	}
-
-	return model_type;
-}
-
-/* Class initialization function for the text item */
-static void
-e_table_text_model_class_init (ETableTextModelClass *klass)
-{
-	GtkObjectClass *object_class;
-	ETextModelClass *model_class;
-
-	object_class = (GtkObjectClass *) klass;
-	model_class = (ETextModelClass *) klass;
-
-	parent_class = gtk_type_class (e_text_model_get_type ());
-
-	model_class->get_text = e_table_text_model_get_text;
-	model_class->set_text = e_table_text_model_set_text;
-	model_class->insert = e_table_text_model_insert;
-	model_class->insert_length = e_table_text_model_insert_length;
-	model_class->delete = e_table_text_model_delete;
-	
-	object_class->destroy = e_table_text_model_destroy;
-}
-
-/* Object initialization function for the text item */
-static void
-e_table_text_model_init (ETableTextModel *model)
-{
-	model->model = NULL;
-	model->row = 0;
-	model->model_col = 0;
-	model->cell_changed_signal_id = 0;
-	model->row_changed_signal_id = 0;
-}
-
-/* Destroy handler for the text item */
-static void
-e_table_text_model_destroy (GtkObject *object)
-{
-	ETableTextModel *model;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (E_IS_TABLE_TEXT_MODEL (object));
-
-	model = E_TABLE_TEXT_MODEL (object);
-	
-	if (model->model)
-		g_assert (GTK_IS_OBJECT (model->model));
-
-	if (model->cell_changed_signal_id)
-		gtk_signal_disconnect (GTK_OBJECT(model->model), 
-				      model->cell_changed_signal_id);
-
-	if (model->row_changed_signal_id)
-		gtk_signal_disconnect (GTK_OBJECT(model->model), 
-				      model->row_changed_signal_id);
-
-	if (model->model)
-		gtk_object_unref (GTK_OBJECT(model->model));
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-static const gchar *
-e_table_text_model_get_text (ETextModel *text_model)
-{
-	ETableTextModel *model = E_TABLE_TEXT_MODEL(text_model);
-	if (model->model)
-		return (gchar *)e_table_model_value_at (model->model, model->model_col, model->row);
-	else
-		return "";
-}
-
-static void
-e_table_text_model_set_text (ETextModel *text_model, const gchar *text)
-{
-	ETableTextModel *model = E_TABLE_TEXT_MODEL(text_model);
-	if (model->model)
-		e_table_model_set_value_at (model->model, model->model_col, model->row, (void *) text);
-}
-
-static void
-e_table_text_model_insert (ETextModel *text_model, gint position, const gchar *text)
-{
-	ETableTextModel *model = E_TABLE_TEXT_MODEL(text_model);
-	if (model->model){
-		gchar *temp = (gchar *)e_table_model_value_at (model->model, model->model_col, model->row);
-		temp = g_strdup_printf ("%.*s%s%s", position, temp, text, temp + position);
-		e_table_model_set_value_at (model->model, model->model_col, model->row, temp);
-		g_free (temp);
-	}
-}
-
-static void
-e_table_text_model_insert_length (ETextModel *text_model, gint position, const gchar *text, gint length)
-{
-	ETableTextModel *model = E_TABLE_TEXT_MODEL(text_model);
-	if (model->model){
-		gchar *temp = (gchar *)e_table_model_value_at (model->model, model->model_col, model->row);
-		temp = g_strdup_printf ("%.*s%.*s%s", position, temp, length, text, temp + position);
-		e_table_model_set_value_at (model->model, model->model_col, model->row, temp);
-		g_free (temp);
-	}
-}
-
-static void
-e_table_text_model_delete (ETextModel *text_model, gint position, gint length)
-{
-	ETableTextModel *model = E_TABLE_TEXT_MODEL(text_model);
-	if (model->model){
-		gchar *temp = (gchar *)e_table_model_value_at (model->model, model->model_col, model->row);
-		temp = g_strdup_printf ("%.*s%s", position, temp, temp + position + length);
-		e_table_model_set_value_at (model->model, model->model_col, model->row, temp);
-		g_free (temp);
-	}
-}
-
-static void
-cell_changed (ETableModel *table_model, int model_col, int row, ETableTextModel *model)
-{
-	if (model->model_col == model_col &&
-	    model->row == row)
-		e_text_model_changed (E_TEXT_MODEL(model));
-}
-
-static void
-row_changed (ETableModel *table_model, int row, ETableTextModel *model)
-{
-	if (model->row == row)
-		e_text_model_changed (E_TEXT_MODEL(model));
-}
-
-ETableTextModel *
-e_table_text_model_new (ETableModel *table_model, int row, int model_col)
-{
-	ETableTextModel *model;
-
-	g_return_val_if_fail(table_model != NULL, NULL);
-	g_return_val_if_fail(E_IS_TABLE_MODEL(table_model), NULL);
-
-	model = gtk_type_new (e_table_text_model_get_type ());
-	model->model = table_model;
-	if (model->model){
-		gtk_object_ref (GTK_OBJECT(model->model));
-		model->cell_changed_signal_id = 
-			gtk_signal_connect (GTK_OBJECT(model->model),
-					   "model_cell_changed",
-					   GTK_SIGNAL_FUNC(cell_changed),
-					   model);
-		model->row_changed_signal_id = 
-			gtk_signal_connect (GTK_OBJECT(model->model),
-					   "model_row_changed",
-					   GTK_SIGNAL_FUNC(row_changed),
-					   model);
-	}
-	model->row = row;
-	model->model_col = model_col;
-	return model;
-}
-
diff --git a/widgets/text/e-table-text-model.h b/widgets/text/e-table-text-model.h
deleted file mode 100644
index 8f3694843f..0000000000
--- a/widgets/text/e-table-text-model.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* ETableTextModel - Text item for evolution.
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Author: Chris Lahey <clahey@umich.edu>
- *
- * A majority of code taken from:
- *
- * Text item type for GnomeCanvas widget
- *
- * GnomeCanvas is basically a port of the Tk toolkit's most excellent
- * canvas widget.  Tk is copyrighted by the Regents of the University
- * of California, Sun Microsystems, and other parties.
- *
- * Copyright (C) 1998 The Free Software Foundation
- *
- * Author: Federico Mena <federico@nuclecu.unam.mx> */
-
-#ifndef E_TABLE_TEXT_MODEL_H
-#define E_TABLE_TEXT_MODEL_H
-
-#include <gal/e-text/e-text-model.h>
-#include <gal/e-table/e-table-model.h>
-
-
-BEGIN_GNOME_DECLS
-
-#define E_TYPE_TABLE_TEXT_MODEL            (e_table_text_model_get_type ())
-#define E_TABLE_TEXT_MODEL(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_TABLE_TEXT_MODEL, ETableTextModel))
-#define E_TABLE_TEXT_MODEL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_TABLE_TEXT_MODEL, ETableTextModelClass))
-#define E_IS_TABLE_TEXT_MODEL(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_TABLE_TEXT_MODEL))
-#define E_IS_TABLE_TEXT_MODEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_TABLE_TEXT_MODEL))
-
-typedef struct _ETableTextModel ETableTextModel;
-typedef struct _ETableTextModelClass ETableTextModelClass;
-
-struct _ETableTextModel {
-	ETextModel parent;
-
-	ETableModel *model;
-	int row;
-	int model_col;
-
-	int cell_changed_signal_id;
-	int row_changed_signal_id;
-};
-
-struct _ETableTextModelClass {
-	ETextModelClass parent_class;
-
-};
-
-
-/* Standard Gtk function */
-GtkType e_table_text_model_get_type (void);
-ETableTextModel *e_table_text_model_new (ETableModel *table_model, int row, int model_col);
-
-END_GNOME_DECLS
-
-#endif
diff --git a/widgets/text/e-text-model-repos.c b/widgets/text/e-text-model-repos.c
deleted file mode 100644
index 407a661b05..0000000000
--- a/widgets/text/e-text-model-repos.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* Standard ETextModelReposFn definitions
- *
- * Copyright (C) 2001 Ximian Inc.
- *
- * Author: Jon Trowbridge <trow@ximian.com>
- */
-
-#include "e-text-model-repos.h"
-
-#define MODEL_CLAMP(model, pos) (CLAMP((pos), 0, strlen((model)->text)))
-
-gint
-e_repos_shift (gint pos, gpointer data)
-{
-	EReposShift *info = (EReposShift *) data;
-	g_return_val_if_fail (data, -1);
-
-	return e_text_model_validate_position (info->model, pos + info->change);
-}
-
-gint
-e_repos_absolute (gint pos, gpointer data)
-{
-	EReposAbsolute *info = (EReposAbsolute *) data;
-	g_return_val_if_fail (data, -1);
-
-	pos = info->pos;
-	if (pos < 0) {
-		gint len = e_text_model_get_text_length (info->model);
-		pos += len + 1;
-	}
-	
-	return e_text_model_validate_position (info->model, pos);
-}
-
-gint
-e_repos_insert_shift (gint pos, gpointer data)
-{
-	EReposInsertShift *info = (EReposInsertShift *) data;
-	g_return_val_if_fail (data, -1);
-
-	if (pos >= info->pos)
-		pos += info->len;
-
-	return e_text_model_validate_position (info->model, pos);
-}
-
-gint
-e_repos_delete_shift (gint pos, gpointer data)
-{
-	EReposDeleteShift *info = (EReposDeleteShift *) data;
-	g_return_val_if_fail (data, -1);
-
-	if (pos > info->pos + info->len)
-		pos -= info->len;
-	else if (pos > info->pos)
-		pos = info->pos;
-
-	return e_text_model_validate_position (info->model, pos);
-}
-
-gint
-e_repos_clamp (gint pos, gpointer data)
-{
-	ETextModel *model;
-
-	g_return_val_if_fail (data != NULL && E_IS_TEXT_MODEL (data), -1);
-	model = E_TEXT_MODEL (data);
-
-	return e_text_model_validate_position (model, pos);
-}
diff --git a/widgets/text/e-text-model-repos.h b/widgets/text/e-text-model-repos.h
deleted file mode 100644
index 620e41a415..0000000000
--- a/widgets/text/e-text-model-repos.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* Standard ETextModelReposFn definitions
- *
- * Copyright (C) 2001 Ximian Inc.
- *
- * Author: Jon Trowbridge <trow@ximian.com>
- */
-
-#ifndef E_TEXT_MODEL_REPOS_H
-#define E_TEXT_MODEL_REPOS_H
-
-#include "e-text-model.h"
-
-typedef struct {
-	ETextModel *model;
-	gint change;  /* Relative change to position. */
-} EReposShift;
-
-gint e_repos_shift (gint pos, gpointer data);
-
-
-typedef struct {
-	ETextModel *model;
-	gint pos;  /* Position to move to.  Negative values count from the end buffer.
-		      (i.e. -1 puts cursor at the end, -2 one character from end, etc.) */
-} EReposAbsolute;
-
-gint e_repos_absolute (gint pos, gpointer data);
-
-
-typedef struct {
-	ETextModel *model;
-	gint pos;  /* Location of first inserted character. */
-	gint len;  /* Number of characters inserted. */
-} EReposInsertShift;
-
-gint e_repos_insert_shift (gint pos, gpointer data);
-
-
-typedef struct {
-	ETextModel *model;
-	gint pos;  /* Location of first deleted character. */
-	gint len;  /* Number of characters deleted. */
-} EReposDeleteShift; 
-
-gint e_repos_delete_shift (gint pos, gpointer data);
-
-
-/* For e_repos_clamp, data is a pointer to an ETextModel.  The only repositioning
-   that occurs is to avoid buffer overruns. */
-
-gint e_repos_clamp (gint pos, gpointer data);
-
-#endif
diff --git a/widgets/text/e-text-model-test.c b/widgets/text/e-text-model-test.c
deleted file mode 100644
index 9bf73962b0..0000000000
--- a/widgets/text/e-text-model-test.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-  ETextModelTest
-*/
-
-#include <gnome.h>
-#include <gal/widgets/e-canvas.h>
-#include "e-text-model.h"
-#include "e-text-model-uri.h"
-#include "e-text.h"
-#include <gal/util/e-util.h>
-
-#if 0
-static void
-describe_model (ETextModel *model)
-{
-  gint i, N;
-  g_return_if_fail (E_IS_TEXT_MODEL (model));
-
-  N = e_text_model_object_count (model);
-
-  g_print ("text: %s\n", e_text_model_get_text (model));
-  g_print ("objs: %d\n", N);
-
-  for (i=0; i<N; ++i) {
-    gchar *s = e_text_model_strdup_nth_object (model, i);
-    g_print ("obj%d: %s\n", i, s);
-    g_free (s);
-  }
-}
-#endif
-
-int
-main (int argc, gchar **argv)
-{
-  GtkWidget *win[2], *canvas[2];
-  GnomeCanvasItem *item[2];
-  ETextModel *model;
-  gint i;
-
-  gnome_init ("ETextModelTest", "0.0", argc, argv);
-
-  model = e_text_model_uri_new ();
-
-  e_text_model_set_text (model, "My favorite website is http://www.ximian.com.  My next favorite www.assbarn.com.");
-
-  //  describe_model (model);
-  
-  for (i=0; i<2; ++i) {
-    win[i] = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  
-    gtk_widget_push_visual (gdk_rgb_get_visual ());
-    gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-    canvas[i] = e_canvas_new ();
-    gtk_widget_pop_visual ();
-    gtk_widget_pop_colormap ();
-
-    item[i] = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (canvas[i])),
-				     e_text_get_type (),
-				     "model", model,
-				     "font", "-adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1",
-				     "anchor", GTK_ANCHOR_NORTH,
-				     "line_wrap", TRUE,
-				     "width", 150.0,
-				     "editable", TRUE,
-				     NULL);
-
-    gtk_container_add (GTK_CONTAINER (win[i]), canvas[i]);
-    gtk_widget_show_all (win[i]);
-  }
-
-  gtk_main ();
-
-  return 0;
-}
diff --git a/widgets/text/e-text-model-uri.c b/widgets/text/e-text-model-uri.c
deleted file mode 100644
index 62790cbcc5..0000000000
--- a/widgets/text/e-text-model-uri.c
+++ /dev/null
@@ -1,345 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* ETextModelURI - A Text Model w/ clickable URIs
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Jon Trowbridge <trow@gnu.org>
- *
- */
-
-#include <config.h>
-
-#include "e-text-model-uri.h"
-
-#include <ctype.h>
-#include <sys/types.h>
-#include <regex.h>
-#include <gtk/gtkmain.h>
-#include <libgnome/gnome-url.h>
-
-static void e_text_model_uri_class_init (ETextModelURIClass *class);
-static void e_text_model_uri_init (ETextModelURI *model);
-static void e_text_model_uri_destroy (GtkObject *object);
-
-static void objectify_uris (ETextModelURI *model);
-
-static void e_text_model_uri_objectify (ETextModel *model);
-static gint e_text_model_uri_validate_pos (ETextModel *model, gint pos);
-static gint e_text_model_uri_get_obj_count (ETextModel *model);
-static const gchar *e_text_model_uri_get_nth_object (ETextModel *model, gint i, gint *len);
-static void e_text_model_uri_activate_nth_object (ETextModel *model, gint);
-
-typedef struct _ObjInfo ObjInfo;
-struct _ObjInfo {
-	gint offset, len;
-};
-
-static GtkObject *parent_class;
-
-GtkType
-e_text_model_uri_get_type (void)
-{
-	static GtkType model_uri_type = 0;
-	
-	if (!model_uri_type) {
-		GtkTypeInfo model_uri_info = {
-			"ETextModelURI",
-			sizeof (ETextModelURI),
-			sizeof (ETextModelURIClass),
-			(GtkClassInitFunc) e_text_model_uri_class_init,
-			(GtkObjectInitFunc) e_text_model_uri_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-		
-		model_uri_type = gtk_type_unique (e_text_model_get_type (), &model_uri_info);
-	}
-	
-	return model_uri_type;
-}
-
-static void
-e_text_model_uri_class_init (ETextModelURIClass *klass)
-{
-	GtkObjectClass *object_class;
-	ETextModelClass *model_class;
-
-	object_class = (GtkObjectClass *) klass;
-	model_class = E_TEXT_MODEL_CLASS (klass);
-
-	parent_class = gtk_type_class (e_text_model_get_type ());
-
-	object_class->destroy = e_text_model_uri_destroy;
-
-	model_class->object_activated = e_text_model_uri_activate_nth_object;
-
-	model_class->objectify = e_text_model_uri_objectify;
-	model_class->validate_pos = e_text_model_uri_validate_pos;
-	model_class->obj_count = e_text_model_uri_get_obj_count;
-	model_class->get_nth_obj = e_text_model_uri_get_nth_object;
-
-}
-
-static void
-e_text_model_uri_init (ETextModelURI *model)
-{
-
-}
-
-static void
-e_text_model_uri_destroy (GtkObject *object)
-{
-	ETextModelURI *model_uri = E_TEXT_MODEL_URI (object);
-	GList *iter;
-
-	if (model_uri->objectify_idle) {
-		gtk_idle_remove (model_uri->objectify_idle);
-		model_uri->objectify_idle = 0;
-	}
-
-	for (iter = model_uri->uris; iter != NULL; iter = g_list_next (iter))
-		g_free (iter->data);
-	g_list_free (model_uri->uris);
-	model_uri->uris = NULL;
-	
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-
-}
-
-static const gchar *uri_regex[] = {
-	"(((news|telnet|nttp|file|http|ftp|https)://)|(www|ftp))[-A-Za-z0-9\\.]+(:[0-9]*)?/[-A-Za-z0-9_\\$\\.\\+\\!\\*\\(\\),;:@&=\\?/~\\#\\%]*[^]'\\.}>\\) ,\\\"]",
-        "(((news|telnet|nttp|file|http|ftp|https)://)|(www|ftp))[-A-Za-z0-9\\.]+[-A-Za-z0-9](:[0-9]*)?",
-        "mailto:[A-Za-z0-9_]+@[-A-Za-z0-9_]+\\.[-A-Za-z0-9\\.]+[-A-Za-z0-9]",
-	NULL
-};
-static gint regex_count = 0;
-static regex_t *regex_compiled = NULL;
-
-static void
-regex_init (void)
-{
-	gint i;
-
-	if (regex_count != 0)
-		return;
-
-	while (uri_regex[regex_count]) ++regex_count;
-
-	regex_compiled = g_new0 (regex_t, regex_count);
-	
-	for (i=0; i<regex_count; ++i) {
-		if (regcomp (&regex_compiled[i], uri_regex[i], REG_EXTENDED))
-			g_error ("Bad regex?: %s", uri_regex[i]);
-	}
-}
-
-
-static void
-objectify_uris (ETextModelURI *model_uri)
-{
-	static gboolean objectifying = FALSE;
-
-	ETextModel *model = E_TEXT_MODEL (model_uri);
-	const gchar *txt;
-	GList *iter, *old_uris;
-	gint offset, len;
-	gboolean found_match;
-	regmatch_t match;
-	gboolean changed;
-
-	if (objectifying)
-		return;
-
-	objectifying = TRUE;
-
-	if (regex_count == 0)
-		regex_init ();
-
-	txt = e_text_model_get_text (model);
-	len  = e_text_model_get_text_length (model);
-
-	old_uris = model_uri->uris;
-	model_uri->uris = NULL;
-
-	if (txt) {
-		offset = 0;
-		found_match = TRUE;
-
-		while (offset < len && found_match) {
-			
-			gint i, so=-1, eo=-1;
-
-			found_match = FALSE;
-			
-			for (i=0; i<regex_count; ++i) {
-				
-				if (regexec (&regex_compiled[i], txt+offset, 1, &match, 0) == 0) {
-
-					/* Take earliest match possible.  In case of a tie, take the
-					   largest possible match. */
-					if (!found_match
-					    || match.rm_so < so
-					    || (match.rm_so == so && match.rm_eo > eo)) {
-						so = match.rm_so;
-						eo = match.rm_eo;
-					}
-					found_match = TRUE;
-				}
-			}
-			
-			if (found_match) {
-				
-				ObjInfo *info = g_new0 (ObjInfo, 1);
-				info->offset = offset + so;
-				info->len = eo - so;
-
-				model_uri->uris = g_list_append (model_uri->uris, info);
-				
-				offset += eo;
-			}
-		}
-	}
-
-	changed = (g_list_length (old_uris) != g_list_length (model_uri->uris));
-
-	if (!changed) {
-		/* Check that there is a 1-1 correspondence between object positions. */
-		GList *jter;
-
-		for (iter = model_uri->uris; iter != NULL && !changed; iter = g_list_next (iter)) {
-			ObjInfo *info = (ObjInfo *) iter->data;
-			found_match = FALSE;
-			for (jter = old_uris; jter != NULL && !found_match; jter = g_list_next (jter)) {
-				ObjInfo *jnfo = (ObjInfo *) jter->data;
-
-				if (info->offset == jnfo->offset && info->len == jnfo->len)
-					found_match = TRUE;
-			}
-			changed = !found_match;
-		}
-	}
-
-	if (changed)
-		e_text_model_changed (model);
-
-	/* Free old uris */
-	for (iter = old_uris; iter != NULL; iter = g_list_next (iter))
-		g_free (iter->data);
-	g_list_free (old_uris);
-
-	objectifying = FALSE;
-}
-
-static gboolean
-objectify_idle_cb (gpointer ptr)
-{
-	ETextModelURI *model_uri = E_TEXT_MODEL_URI (ptr);
-
-	g_assert (model_uri->objectify_idle);
-	objectify_uris (model_uri);
-	model_uri->objectify_idle = 0;
-
-	return FALSE;
-}
-
-static void
-e_text_model_uri_objectify (ETextModel *model)
-{
-	ETextModelURI *model_uri = E_TEXT_MODEL_URI (model);
-
-	if (model_uri->objectify_idle == 0)
-		model_uri->objectify_idle = gtk_idle_add (objectify_idle_cb, model);
-
-	if (E_TEXT_MODEL_CLASS(parent_class)->objectify)
-		E_TEXT_MODEL_CLASS(parent_class)->objectify (model);
-}
-
-static void
-objectify_idle_flush (ETextModelURI *model_uri)
-{
-	if (model_uri->objectify_idle) {
-		gtk_idle_remove (model_uri->objectify_idle);
-		model_uri->objectify_idle = 0;
-		objectify_uris (model_uri);
-	}
-}
-
-static gint
-e_text_model_uri_validate_pos (ETextModel *model, gint pos)
-{
-	gint obj_num;
-
-	/* Cause us to skip over objects */
-
-	obj_num = e_text_model_get_object_at_offset (model, pos);
-	if (obj_num != -1) {
-		gint pos0, pos1, mp;
-		e_text_model_get_nth_object_bounds (model, obj_num, &pos0, &pos1);
-		mp = (pos0 + pos1)/2;
-		if (pos0 < pos && pos < mp)
-			pos = pos1;
-		else if (mp <= pos && pos < pos1)
-			pos = pos0;
-	}
-
-	
-
-	if (E_TEXT_MODEL_CLASS (parent_class)->validate_pos)
-		pos = E_TEXT_MODEL_CLASS (parent_class)->validate_pos (model, pos);
-
-	return pos;
-}
-
-static gint
-e_text_model_uri_get_obj_count (ETextModel *model)
-{
-	ETextModelURI *model_uri = E_TEXT_MODEL_URI (model);
-
-	objectify_idle_flush (model_uri);
-
-	return g_list_length (model_uri->uris);
-}
-
-static const gchar *
-e_text_model_uri_get_nth_object (ETextModel *model, gint i, gint *len)
-{
-	ETextModelURI *model_uri = E_TEXT_MODEL_URI (model);
-	ObjInfo *info;
-	const gchar *txt;
-
-	objectify_idle_flush (model_uri);
-	
-	txt = e_text_model_get_text (model);
-
-	info = (ObjInfo *) g_list_nth_data (model_uri->uris, i);
-	g_return_val_if_fail (info != NULL, NULL);
-
-
-	if (len)
-		*len = info->len;
-	return txt + info->offset;
-}
-
-static void
-e_text_model_uri_activate_nth_object (ETextModel *model, gint i)
-{
-	gchar *obj_str;
-
-	objectify_idle_flush (E_TEXT_MODEL_URI (model));
-	
-	obj_str = e_text_model_strdup_nth_object (model, i);
-	gnome_url_show (obj_str);
-	g_free (obj_str);
-}
-
-ETextModel *
-e_text_model_uri_new (void)
-{
-	return E_TEXT_MODEL (gtk_type_new (e_text_model_uri_get_type ()));
-}
-
-
-/* $Id$ */
diff --git a/widgets/text/e-text-model-uri.h b/widgets/text/e-text-model-uri.h
deleted file mode 100644
index 9743935529..0000000000
--- a/widgets/text/e-text-model-uri.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* ETextModelURI - A Text Model w/ clickable URIs
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Author: Jon Trowbridge <trow@gnu.org>
- *
- */
-
-#ifndef E_TEXT_MODEL_URI_H
-#define E_TEXT_MODEL_URI_H
-
-#include <gal/e-text/e-text-model.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TYPE_TEXT_MODEL_URI            (e_text_model_get_type ())
-#define E_TEXT_MODEL_URI(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_TEXT_MODEL_URI, ETextModelURI))
-#define E_TEXT_MODEL_URI_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_TEXT_MODEL_URI, ETextModelURIClass))
-#define E_IS_TEXT_MODEL_URI(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_TEXT_MODEL_URI))
-#define E_IS_TEXT_MODEL_URI_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_TEXT_MODEL_URI))
-
-typedef struct _ETextModelURI ETextModelURI;
-typedef struct _ETextModelURIClass ETextModelURIClass;
-
-struct _ETextModelURI {
-	ETextModel item;
-	GList *uris;
-	
-	guint objectify_idle;
-};
-
-struct _ETextModelURIClass {
-  ETextModelClass parent_class;
-};
-
-GtkType e_text_model_uri_get_type (void);
-ETextModel *e_text_model_uri_new (void);
-
-END_GNOME_DECLS
-
-#endif
diff --git a/widgets/text/e-text-model.c b/widgets/text/e-text-model.c
deleted file mode 100644
index 4fec8724d8..0000000000
--- a/widgets/text/e-text-model.c
+++ /dev/null
@@ -1,592 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* ETextModel - Text item model for evolution.
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Chris Lahey <clahey@umich.edu>
- *
- * A majority of code taken from:
- *
- * Text item type for GnomeCanvas widget
- *
- * GnomeCanvas is basically a port of the Tk toolkit's most excellent
- * canvas widget.  Tk is copyrighted by the Regents of the University
- * of California, Sun Microsystems, and other parties.
- *
- * Copyright (C) 1998 The Free Software Foundation
- *
- * Author: Federico Mena <federico@nuclecu.unam.mx> */
-
-#undef  PARANOID_DEBUGGING
-
-#include <config.h>
-#include <ctype.h>
-#include <string.h>
-#include <gtk/gtksignal.h>
-#include "e-text-model-repos.h"
-#include "e-text-model.h"
-
-#define CLASS(obj) (E_TEXT_MODEL_CLASS (GTK_OBJECT (obj)->klass))
-
-enum {
-	E_TEXT_MODEL_CHANGED,
-	E_TEXT_MODEL_REPOSITION,
-	E_TEXT_MODEL_OBJECT_ACTIVATED,
-	E_TEXT_MODEL_LAST_SIGNAL
-};
-
-static guint e_text_model_signals[E_TEXT_MODEL_LAST_SIGNAL] = { 0 };
-
-struct _ETextModelPrivate {
-	gchar   *text;
-	gint     len;
-};
-
-static void e_text_model_class_init (ETextModelClass *class);
-static void e_text_model_init       (ETextModel *model);
-static void e_text_model_destroy    (GtkObject *object);
-
-static gint         e_text_model_real_validate_position (ETextModel *, gint pos);
-static const gchar *e_text_model_real_get_text          (ETextModel *model);
-static gint         e_text_model_real_get_text_length   (ETextModel *model);
-static void         e_text_model_real_set_text          (ETextModel *model, const gchar *text);
-static void         e_text_model_real_insert            (ETextModel *model, gint postion, const gchar *text);
-static void         e_text_model_real_insert_length     (ETextModel *model, gint postion, const gchar *text, gint length);
-static void         e_text_model_real_delete            (ETextModel *model, gint postion, gint length);
-
-static GtkObject *parent_class;
-
-
-
-/**
- * e_text_model_get_type:
- * @void: 
- * 
- * Registers the &ETextModel class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &ETextModel class.
- **/
-GtkType
-e_text_model_get_type (void)
-{
-	static GtkType model_type = 0;
-
-	if (!model_type) {
-		GtkTypeInfo model_info = {
-			"ETextModel",
-			sizeof (ETextModel),
-			sizeof (ETextModelClass),
-			(GtkClassInitFunc) e_text_model_class_init,
-			(GtkObjectInitFunc) e_text_model_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		model_type = gtk_type_unique (gtk_object_get_type (), &model_info);
-	}
-
-	return model_type;
-}
-
-/* Class initialization function for the text item */
-static void
-e_text_model_class_init (ETextModelClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) klass;
-
-	parent_class = gtk_type_class (gtk_object_get_type ());
-
-	e_text_model_signals[E_TEXT_MODEL_CHANGED] =
-		gtk_signal_new ("changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETextModelClass, changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_text_model_signals[E_TEXT_MODEL_REPOSITION] =
-		gtk_signal_new ("reposition",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETextModelClass, reposition),
-				gtk_marshal_NONE__POINTER_POINTER,
-				GTK_TYPE_NONE, 2,
-				GTK_TYPE_POINTER, GTK_TYPE_POINTER);
-
-	e_text_model_signals[E_TEXT_MODEL_OBJECT_ACTIVATED] =
-		gtk_signal_new ("object_activated",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETextModelClass, object_activated),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_INT);
-	
-	gtk_object_class_add_signals (object_class, e_text_model_signals, E_TEXT_MODEL_LAST_SIGNAL);
-	
-	/* No default signal handlers. */
-	klass->changed          = NULL;
-	klass->reposition       = NULL;
-	klass->object_activated = NULL;
-	
-	klass->validate_pos  = e_text_model_real_validate_position;
-
-	klass->get_text      = e_text_model_real_get_text;
-	klass->get_text_len  = e_text_model_real_get_text_length;
-	klass->set_text      = e_text_model_real_set_text;
-	klass->insert        = e_text_model_real_insert;
-	klass->insert_length = e_text_model_real_insert_length;
-	klass->delete        = e_text_model_real_delete;
-
-	/* We explicitly don't define default handlers for these. */
-	klass->objectify        = NULL;
-	klass->obj_count        = NULL;
-	klass->get_nth_obj      = NULL;
-	
-	object_class->destroy = e_text_model_destroy;
-}
-
-/* Object initialization function for the text item */
-static void
-e_text_model_init (ETextModel *model)
-{
-	model->priv = g_new0 (struct _ETextModelPrivate, 1);
-	model->priv->text = g_strdup ("");
-	model->priv->len  = 0;
-}
-
-/* Destroy handler for the text item */
-static void
-e_text_model_destroy (GtkObject *object)
-{
-	ETextModel *model;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (E_IS_TEXT_MODEL (object));
-
-	model = E_TEXT_MODEL (object);
-
-	g_free (model->priv->text);
-
-	g_free (model->priv);
-	model->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-static gint
-e_text_model_real_validate_position (ETextModel *model, gint pos)
-{
-	gint len;
-
-	if (pos < 0)
-		pos = 0;
-	else if (pos > ( len = e_text_model_get_text_length (model) ))
-		pos = len;
-
-	return pos;
-}
-
-static const gchar *
-e_text_model_real_get_text (ETextModel *model)
-{
-	if (model->priv->text)
-		return model->priv->text;
-	else
-		return "";
-}
-
-static gint
-e_text_model_real_get_text_length (ETextModel *model)
-{
-	if (model->priv->len < 0)
-		model->priv->len = strlen (e_text_model_get_text (model));
-
-	return model->priv->len;
-}
-
-static void
-e_text_model_real_set_text (ETextModel *model, const gchar *text)
-{
-	EReposAbsolute repos;
-	gboolean changed = FALSE;
-
-	if (text == NULL) {
-
-		changed = (model->priv->text != NULL);
-
-		g_free (model->priv->text);
-		model->priv->text = NULL;
-		model->priv->len = -1;
-
-	} else if (model->priv->text == NULL || strcmp (model->priv->text, text)) {
-		
-		g_free (model->priv->text);
-		model->priv->text = g_strdup (text);
-		model->priv->len = -1;
-
-		changed = TRUE;
-	}
-
-	if (changed) {
-		e_text_model_changed (model);
-		repos.model = model;
-		repos.pos = -1;
-		e_text_model_reposition (model, e_repos_absolute, &repos);
-	}
-}
-
-static void
-e_text_model_real_insert (ETextModel *model, gint position, const gchar *text)
-{
-	EReposInsertShift repos;
-	gchar *new_text;
-	gint ins_len;
-
-	new_text = g_strdup_printf ("%.*s%s%s", position, model->priv->text, text, model->priv->text + position);
-	ins_len = strlen (text);
-
-	if (model->priv->text)
-		g_free (model->priv->text);
-
-	model->priv->text = new_text;
-	
-	if (model->priv->len >= 0)
-		model->priv->len += ins_len;
-	
-	e_text_model_changed (model);
-
-	repos.model = model;
-	repos.pos = position;
-	repos.len = ins_len;
-
-	e_text_model_reposition (model, e_repos_insert_shift, &repos);
-}
-
-static void
-e_text_model_real_insert_length (ETextModel *model, gint position, const gchar *text, gint length)
-{
-	EReposInsertShift repos;
-	gchar *new_text = g_strdup_printf ("%.*s%.*s%s", position, model->priv->text, length, text, model->priv->text + position);
-
-	if (model->priv->text)
-		g_free (model->priv->text);
-	model->priv->text = new_text;
-
-	if (model->priv->len >= 0)
-		model->priv->len += length;
-
-	e_text_model_changed (model);
-
-	repos.model = model;
-	repos.pos   = position;
-	repos.len   = length;
-
-	e_text_model_reposition (model, e_repos_insert_shift, &repos);
-}
-
-static void
-e_text_model_real_delete (ETextModel *model, gint position, gint length)
-{
-	EReposDeleteShift repos;
- 
-	memmove (model->priv->text + position, model->priv->text + position + length, strlen (model->priv->text + position + length) + 1);
-	
-	if (model->priv->len >= 0)
-		model->priv->len -= length;
-
-	e_text_model_changed (model);
-
-	repos.model = model;
-	repos.pos   = position;
-	repos.len   = length;
-
-	e_text_model_reposition (model, e_repos_delete_shift, &repos);
-}
-
-void
-e_text_model_changed (ETextModel *model)
-{
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_TEXT_MODEL (model));
-
-	/*
-	  Objectify before emitting any signal.
-	  While this method could, in theory, do pretty much anything, it is meant
-	  for scanning objects and converting substrings into embedded objects.
-	*/
-	if (CLASS (model)->objectify)
-		CLASS (model)->objectify (model);
-
-	gtk_signal_emit (GTK_OBJECT (model),
-			 e_text_model_signals[E_TEXT_MODEL_CHANGED]);
-}
-
-void
-e_text_model_reposition (ETextModel *model, ETextModelReposFn fn, gpointer repos_data)
-{
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_TEXT_MODEL (model));
-	g_return_if_fail (fn != NULL);
-
-	gtk_signal_emit (GTK_OBJECT (model),
-			 e_text_model_signals[E_TEXT_MODEL_REPOSITION],
-			 fn, repos_data);
-}
-
-gint
-e_text_model_validate_position (ETextModel *model, gint pos)
-{
-	g_return_val_if_fail (model != NULL, 0);
-	g_return_val_if_fail (E_IS_TEXT_MODEL (model), 0);
-
-	if (CLASS (model)->validate_pos)
-		pos = CLASS (model)->validate_pos (model, pos);
-
-	return pos;
-}
-
-const gchar *
-e_text_model_get_text (ETextModel *model)
-{
-	g_return_val_if_fail (model != NULL, NULL);
-	g_return_val_if_fail (E_IS_TEXT_MODEL (model), NULL);
-
-	if (CLASS (model)->get_text)
-		return CLASS (model)->get_text (model);
-
-	return "";
-}
-
-gint
-e_text_model_get_text_length (ETextModel *model)
-{
-	g_return_val_if_fail (model != NULL, 0);
-	g_return_val_if_fail (E_IS_TEXT_MODEL (model), 0);
-
-	if (CLASS (model)->get_text_len (model)) {
-
-		gint len = CLASS (model)->get_text_len (model);
-
-#ifdef PARANOID_DEBUGGING
-		const gchar *str = e_text_model_get_text (model);
-		gint len2 = str ? strlen (str) : 0;
-		if (len != len)
-			g_error ("\"%s\" length reported as %d, not %d.", str, len, len2);
-#endif
-
-		return len;
-
-	} else {
-		/* Calculate length the old-fashioned way... */
-		const gchar *str = e_text_model_get_text (model);
-		return str ? strlen (str) : 0;
-	}
-}
-
-void
-e_text_model_set_text (ETextModel *model, const gchar *text)
-{
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_TEXT_MODEL (model));
-
-	if (CLASS (model)->set_text)
-		CLASS (model)->set_text (model, text);
-}
-
-void
-e_text_model_insert (ETextModel *model, gint position, const gchar *text)
-{ 
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_TEXT_MODEL (model));
-
-	if (text == NULL)
-		return;
-
-	if (CLASS (model)->insert)
-		CLASS (model)->insert (model, position, text);
-}
-
-void
-e_text_model_insert_length (ETextModel *model, gint position, const gchar *text, gint length)
-{
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_TEXT_MODEL (model));
-	g_return_if_fail (length >= 0);
-
-
-	if (text == NULL || length == 0)
-		return;
-
-	if (CLASS (model)->insert_length)
-		CLASS (model)->insert_length (model, position, text, length);
-}
-
-void
-e_text_model_prepend (ETextModel *model, const gchar *text)
-{
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_TEXT_MODEL (model));
-
-	if (text == NULL)
-		return;
-
-	e_text_model_insert (model, 0, text);
-}
-
-void
-e_text_model_append (ETextModel *model, const gchar *text)
-{
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_TEXT_MODEL (model));
-
-	if (text == NULL)
-		return;
-
-	e_text_model_insert (model, e_text_model_get_text_length (model), text);
-}
-
-void
-e_text_model_delete (ETextModel *model, gint position, gint length)
-{
-	gint txt_len;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_TEXT_MODEL (model));
-	g_return_if_fail (length >= 0);
-
-	txt_len = e_text_model_get_text_length (model);
-	if (position + length > txt_len)
-		length = txt_len - position;
-
-	if (length <= 0)
-		return;
-
-	if (CLASS (model)->delete)
-		CLASS (model)->delete (model, position, length);
-}
-
-gint
-e_text_model_object_count (ETextModel *model)
-{
-	g_return_val_if_fail (model != NULL, 0);
-	g_return_val_if_fail (E_IS_TEXT_MODEL (model), 0);
-
-	if (CLASS (model)->obj_count)
-		return CLASS (model)->obj_count (model);
-
-	return 0;
-}
-
-const gchar *
-e_text_model_get_nth_object (ETextModel *model, gint n, gint *len)
-{
-	g_return_val_if_fail (model != NULL, NULL);
-	g_return_val_if_fail (E_IS_TEXT_MODEL (model), NULL);
-
-	if (n < 0 || n >= e_text_model_object_count (model))
-		return NULL;
-
-	if (CLASS (model)->get_nth_obj)
-		return CLASS (model)->get_nth_obj (model, n, len);
-
-	return NULL;
-}
-
-gchar *
-e_text_model_strdup_nth_object (ETextModel *model, gint n)
-{
-	const gchar *obj;
-	gint len = 0;
-
-	g_return_val_if_fail (model != NULL, NULL);
-	g_return_val_if_fail (E_IS_TEXT_MODEL (model), NULL);
-
-	obj = e_text_model_get_nth_object (model, n, &len);
-	
-	return obj ? g_strndup (obj, n) : NULL;
-}
-
-void
-e_text_model_get_nth_object_bounds (ETextModel *model, gint n, gint *start, gint *end)
-{
-	const gchar *txt = NULL, *obj = NULL;
-	gint len = 0;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_TEXT_MODEL (model));
-
-	txt = e_text_model_get_text (model);
-	obj = e_text_model_get_nth_object (model, n, &len);
-
-	g_return_if_fail (obj != NULL);
-
-	if (start)
-		*start = obj - txt;
-	if (end)
-		*end = obj - txt + len;
-}
-
-gint
-e_text_model_get_object_at_offset (ETextModel *model, gint offset)
-{
-	g_return_val_if_fail (model != NULL, -1);
-	g_return_val_if_fail (E_IS_TEXT_MODEL (model), -1);
-
-	if (offset < 0 || offset >= e_text_model_get_text_length (model))
-		return -1;
-
-	/* If an optimized version has been provided, we use it. */
-	if (CLASS (model)->obj_at_offset) {
-
-		return CLASS (model)->obj_at_offset (model, offset);
-
-	} else { 
-		/* If not, we fake it.*/
-
-		gint i, N, pos0, pos1;
-
-		N = e_text_model_object_count (model);
-
-		for (i = 0; i < N; ++i) {
-			e_text_model_get_nth_object_bounds (model, i, &pos0, &pos1);
-			if (pos0 <= offset && offset < pos1)
-				return i;
-		}
-			
-	}
-
-	return -1;
-}
-
-gint
-e_text_model_get_object_at_pointer (ETextModel *model, const gchar *s)
-{
-	g_return_val_if_fail (model != NULL, -1);
-	g_return_val_if_fail (E_IS_TEXT_MODEL (model), -1);
-	g_return_val_if_fail (s != NULL, -1);
-
-	return e_text_model_get_object_at_offset (model, s - e_text_model_get_text (model));
-}
-
-void
-e_text_model_activate_nth_object (ETextModel *model, gint n)
-{
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_TEXT_MODEL (model));
-	g_return_if_fail (n >= 0);
-	g_return_if_fail (n < e_text_model_object_count (model));
-
-	gtk_signal_emit (GTK_OBJECT (model), e_text_model_signals[E_TEXT_MODEL_OBJECT_ACTIVATED], n);
-}
-
-ETextModel *
-e_text_model_new (void)
-{
-	ETextModel *model = gtk_type_new (e_text_model_get_type ());
-	return model;
-}
diff --git a/widgets/text/e-text-model.h b/widgets/text/e-text-model.h
deleted file mode 100644
index b697ca8396..0000000000
--- a/widgets/text/e-text-model.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* ETextModel - Text item for evolution.
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Chris Lahey <clahey@umich.edu>
- *
- * A majority of code taken from:
- *
- * Text item type for GnomeCanvas widget
- *
- * GnomeCanvas is basically a port of the Tk toolkit's most excellent
- * canvas widget.  Tk is copyrighted by the Regents of the University
- * of California, Sun Microsystems, and other parties.
- *
- * Copyright (C) 1998 The Free Software Foundation
- *
- * Author: Federico Mena <federico@nuclecu.unam.mx> */
-
-
-#ifndef E_TEXT_MODEL_H
-#define E_TEXT_MODEL_H
-
-#include <glib.h>
-#include <gtk/gtkobject.h>
-#include <libgnome/gnome-defs.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_TYPE_TEXT_MODEL            (e_text_model_get_type ())
-#define E_TEXT_MODEL(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_TEXT_MODEL, ETextModel))
-#define E_TEXT_MODEL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_TEXT_MODEL, ETextModelClass))
-#define E_IS_TEXT_MODEL(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_TEXT_MODEL))
-#define E_IS_TEXT_MODEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_TEXT_MODEL))
-
-typedef struct _ETextModel ETextModel;
-typedef struct _ETextModelClass ETextModelClass;
-
-struct _ETextModelPrivate;
-
-typedef gint (*ETextModelReposFn) (gint, gpointer);
-
-struct _ETextModel {
-	GtkObject item;
-
-	struct _ETextModelPrivate *priv;
-};
-
-struct _ETextModelClass {
-	GtkObjectClass parent_class;
-
-	/* Signal */
-	void  (* changed)          (ETextModel *model);
-	void  (* reposition)       (ETextModel *model, ETextModelReposFn fn, gpointer repos_fn_data);
-	void  (* object_activated) (ETextModel *model, gint obj_num);
-
-	/* Virtual methods */
-
-	gint  (* validate_pos) (ETextModel *model, gint pos);
-
-	const char *(* get_text)      (ETextModel *model);
-	gint        (* get_text_len)  (ETextModel *model);
-	void        (* set_text)      (ETextModel *model, const gchar *text);
-	void        (* insert)        (ETextModel *model, gint position, const gchar *text);
-	void        (* insert_length) (ETextModel *model, gint position, const gchar *text, gint length);
-	void        (* delete)        (ETextModel *model, gint position, gint length);
-
-	void         (* objectify)          (ETextModel *model);
-	gint         (* obj_count)          (ETextModel *model);
-	const gchar *(* get_nth_obj)        (ETextModel *model, gint n, gint *len);
-	gint         (* obj_at_offset)      (ETextModel *model, gint offset);
-};
-
-GtkType     e_text_model_get_type (void);
-
-ETextModel *e_text_model_new (void);
-
-void        e_text_model_changed (ETextModel *model);
-
-void        e_text_model_reposition        (ETextModel *model, ETextModelReposFn fn, gpointer repos_data);
-gint        e_text_model_validate_position (ETextModel *model, gint pos);
-
-
-/* Functions for manipulating the underlying text. */
-
-const gchar *e_text_model_get_text        (ETextModel *model);
-gint         e_text_model_get_text_length (ETextModel *model);
-void         e_text_model_set_text        (ETextModel *model, const gchar *text);
-void         e_text_model_insert          (ETextModel *model, gint position, const gchar *text);
-void         e_text_model_insert_length   (ETextModel *model, gint position, const gchar *text, gint length);
-void         e_text_model_prepend         (ETextModel *model, const gchar *text);
-void         e_text_model_append          (ETextModel *model, const gchar *text);
-void         e_text_model_delete          (ETextModel *model, gint position, gint length);
-
-
-/* Functions for accessing embedded objects. */
-
-gint         e_text_model_object_count          (ETextModel *model);
-const gchar *e_text_model_get_nth_object        (ETextModel *model, gint n, gint *len);
-gchar       *e_text_model_strdup_nth_object     (ETextModel *model, gint n);
-void         e_text_model_get_nth_object_bounds (ETextModel *model, gint n, gint *start_pos, gint *end_pos);
-gint         e_text_model_get_object_at_offset  (ETextModel *model, gint offset);
-gint         e_text_model_get_object_at_pointer (ETextModel *model, const gchar *c);
-void         e_text_model_activate_nth_object   (ETextModel *model, gint n);
-
-
-
-
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/widgets/text/e-text-test.c b/widgets/text/e-text-test.c
deleted file mode 100644
index e3931da02f..0000000000
--- a/widgets/text/e-text-test.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
-  ETextTest: E-Text item test program
-  Copyright (C)2000: Iain Holmes  <ih@csd.abdn.ac.uk>
-
-  This code is licensed under the GPL
-*/
-
-#include "e-text.h"
-#include <gnome.h>
-#include "gal/widgets/e-canvas.h"
-#include "gal/widgets/e-unicode.h"
-
-GnomeCanvasItem *rect;
-
-static void allocate_callback(GtkWidget *canvas, GtkAllocation *allocation, GnomeCanvasItem *item)
-{
-  double height;
-  gnome_canvas_item_set( item,
-			 "width", (double) allocation->width,
-			 NULL );
-  gtk_object_get(GTK_OBJECT(item),
-		 "height", &height,
-		 NULL);
-  height = MAX(height, allocation->height);
-  gnome_canvas_set_scroll_region(GNOME_CANVAS( canvas ), 0, 0, allocation->width, height );
-  gnome_canvas_item_set( rect,
-			 "x2", (double) allocation->width,
-			 "y2", (double) height,
-			 NULL );
-}
-
-static void
-reflow (GtkWidget *canvas, GnomeCanvasItem *item)
-{
-  double height;
-  gtk_object_get(GTK_OBJECT(item),
-		 "height", &height,
-		 NULL);
-  height = MAX(height, canvas->allocation.height);
-  gnome_canvas_set_scroll_region(GNOME_CANVAS( canvas ), 0, 0, canvas->allocation.width, height );
-  gnome_canvas_item_set( rect,
-			 "x2", (double) canvas->allocation.width,
-			 "y2", (double) height,
-			 NULL );
-}
-
-static void
-quit_cb (GtkWidget *widget,
-	 gpointer data)
-{
-  gtk_main_quit ();
-}
-
-static void
-change_text_cb (GtkEntry *entry,
-		EText *text)
-{
-  gchar *str;
-
-  str = e_utf8_gtk_entry_get_text (entry);
-  gnome_canvas_item_set (GNOME_CANVAS_ITEM (text),
-			 "text", str,
-			 NULL);
-}
-
-static void
-change_font_cb (GtkEntry *entry,
-		EText *text)
-{
-  gchar *font;
-
-  font = gtk_entry_get_text (entry);
-  gnome_canvas_item_set (GNOME_CANVAS_ITEM (text),
-			 "font", font,
-			 NULL);
-}
-
-int
-main (int argc,
-      char **argv)
-{
-  GtkWidget *window, *canvas, *scroller, *vbox, *text, *font;
-  GtkWidget *frame;
-  GnomeCanvasItem *item;
-
-  gnome_init ("ETextTest", "0.0.1", argc, argv);
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_title (GTK_WINDOW (window), "EText Test");
-  gtk_signal_connect (GTK_OBJECT (window), "destroy",
-		      GTK_SIGNAL_FUNC (quit_cb), NULL);
-
-  gtk_widget_push_visual (gdk_rgb_get_visual ());
-  gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-  canvas = e_canvas_new ();
-  gtk_widget_pop_visual ();
-  gtk_widget_pop_colormap ();
-  scroller = gtk_scrolled_window_new (NULL, NULL);
-  vbox = gtk_vbox_new (FALSE, 2);
-
-  gtk_container_add (GTK_CONTAINER (window), vbox);
-  gtk_box_pack_start (GTK_BOX (vbox), scroller, TRUE, TRUE, 2);
-  gtk_container_add (GTK_CONTAINER (scroller), canvas);
-
-  frame = gtk_frame_new ("Text");
-  text = gtk_entry_new ();
-  gtk_entry_set_text(GTK_ENTRY(text), "Hello World! This is a really long string to test out the ellipsis stuff.");
-  gtk_container_add (GTK_CONTAINER (frame), text);
-  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
-  
-  frame = gtk_frame_new ("Font");
-  font = gtk_entry_new ();
-  gtk_entry_set_text(GTK_ENTRY(font), "fixed");
-  gtk_container_add (GTK_CONTAINER (frame), font);
-  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
-
-  rect = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),
-				gnome_canvas_rect_get_type(),
-				"x1", (double) 0,
-				"y1", (double) 0,
-				"x2", (double) 100,
-				"y2", (double) 100,
-				"fill_color", "white",
-				NULL );
-
-  item = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (canvas)),
-				e_text_get_type (),
-				"text", "Hello World! This is a really long string to test out the ellipsis stuff.",
-				"font", "fixed",
-				"fill_color", "black",
-				"anchor", GTK_ANCHOR_NW,
-				"clip", TRUE,
-				"use_ellipsis", TRUE,
-				"editable", TRUE,
-				"line_wrap", TRUE,
-				"max_lines", 2,
-				"width", 150.0,
-				NULL);
-
-  gtk_signal_connect (GTK_OBJECT (text), "activate",
-		      GTK_SIGNAL_FUNC (change_text_cb), item);
-  gtk_signal_connect (GTK_OBJECT (font), "activate",
-		      GTK_SIGNAL_FUNC (change_font_cb), item);
-
-  gtk_signal_connect( GTK_OBJECT( canvas ), "size_allocate",
-		      GTK_SIGNAL_FUNC( allocate_callback ),
-		      item );
-  gtk_signal_connect( GTK_OBJECT( canvas ), "reflow",
-		      GTK_SIGNAL_FUNC( reflow ),
-		      item );
-  gnome_canvas_set_scroll_region (GNOME_CANVAS (canvas), 0.0, 0.0, 400.0, 400.0);
-  gtk_widget_show_all (window);
-  gtk_main ();
-
-  return 0;
-}
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
deleted file mode 100644
index b0dd3261e7..0000000000
--- a/widgets/text/e-text.c
+++ /dev/null
@@ -1,3897 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* EText - Text item for evolution.
- * Copyright (C) 2000, 2001 Ximian Inc.
- *
- * Author: Chris Lahey <clahey@ximian.com>
- * Further hacking by Jon Trowbridge <trow@ximian.com>
- *
- * A majority of code taken from:
- *
- * Text item type for GnomeCanvas widget
- *
- * GnomeCanvas is basically a port of the Tk toolkit's most excellent
- * canvas widget.  Tk is copyrighted by the Regents of the University
- * of California, Sun Microsystems, and other parties.
- *
- * Copyright (C) 1998 The Free Software Foundation
- *
- * Author: Federico Mena <federico@nuclecu.unam.mx> */
-
-#include <config.h>
-
-#include "e-text.h"
-
-#include <math.h>
-#include <ctype.h>
-#include <string.h>
-#include <gdk/gdkx.h> /* for BlackPixel */
-#include <gtk/gtkinvisible.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkselection.h>
-#include <gtk/gtkwindow.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-
-#include "gal/widgets/e-canvas.h"
-#include "gal/widgets/e-canvas-utils.h"
-#include "gal/widgets/e-unicode.h"
-#include "gal/util/e-text-event-processor-emacs-like.h"
-#include <libart_lgpl/art_affine.h>
-#include <libart_lgpl/art_rgb.h>
-#include <libart_lgpl/art_rgb_bitmap_affine.h>
-
-#define BORDER_INDENT 4
-
-enum {
-	E_TEXT_CHANGED,
-	E_TEXT_ACTIVATE,
-	E_TEXT_KEYPRESS,
-	E_TEXT_POPUP,
-	E_TEXT_LAST_SIGNAL
-};
-
-static guint e_text_signals[E_TEXT_LAST_SIGNAL] = { 0 };
-
-
-
-/* This defines a line of text */
-struct line {
-	const char *text;	/* Line's text, it is a pointer into the text->text string */
-	int length;	/* Line's length IN BYTES */
-	int width;	/* Line's width in pixels */
-	int ellipsis_length;  /* Length before adding ellipsis */
-};
-
-/* Object argument IDs */
-enum {
-	ARG_0,
-	ARG_MODEL,
-	ARG_EVENT_PROCESSOR,
-	ARG_TEXT,
-	ARG_FONT,
-        ARG_FONTSET,
-	ARG_FONT_GDK,
-	ARG_FONT_E,
-	ARG_BOLD,
-	ARG_STRIKEOUT,
-	ARG_ANCHOR,
-	ARG_JUSTIFICATION,
-	ARG_CLIP_WIDTH,
-	ARG_CLIP_HEIGHT,
-	ARG_CLIP,
-	ARG_FILL_CLIP_RECTANGLE,
-	ARG_X_OFFSET,
-	ARG_Y_OFFSET,
-	ARG_FILL_COLOR,
-	ARG_FILL_COLOR_GDK,
-	ARG_FILL_COLOR_RGBA,
-	ARG_FILL_STIPPLE,
-	ARG_TEXT_WIDTH,
-	ARG_TEXT_HEIGHT,
-	ARG_EDITABLE,
-	ARG_USE_ELLIPSIS,
-	ARG_ELLIPSIS,
-	ARG_LINE_WRAP,
-	ARG_BREAK_CHARACTERS,
-	ARG_MAX_LINES,
-	ARG_WIDTH,
-	ARG_HEIGHT,
-	ARG_DRAW_BORDERS,
-	ARG_ALLOW_NEWLINES,
-	ARG_DRAW_BACKGROUND,
-	ARG_CURSOR_POS
-};
-
-
-enum {
-	E_SELECTION_PRIMARY,
-	E_SELECTION_CLIPBOARD
-};
-enum {
-  TARGET_STRING,
-  TARGET_TEXT,
-  TARGET_COMPOUND_TEXT
-};
-
-static void e_text_class_init (ETextClass *class);
-static void e_text_init (EText *text);
-static void e_text_destroy (GtkObject *object);
-static void e_text_set_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_text_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-
-static void e_text_reflow (GnomeCanvasItem *item, int flags);
-static void e_text_update (GnomeCanvasItem *item, double *affine,
-				      ArtSVP *clip_path, int flags);
-static void e_text_realize (GnomeCanvasItem *item);
-static void e_text_unrealize (GnomeCanvasItem *item);
-static void e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
-				    int x, int y, int width, int height);
-static double e_text_point (GnomeCanvasItem *item, double x, double y, int cx, int cy,
-				       GnomeCanvasItem **actual_item);
-static void e_text_bounds (GnomeCanvasItem *item,
-				      double *x1, double *y1, double *x2, double *y2);
-static void e_text_render (GnomeCanvasItem *item, GnomeCanvasBuf *buf);
-static gint e_text_event (GnomeCanvasItem *item, GdkEvent *event);
-
-static void e_text_command(ETextEventProcessor *tep, ETextEventProcessorCommand *command, gpointer data);
-
-static void e_text_get_selection(EText *text, GdkAtom selection, guint32 time);
-static void e_text_supply_selection (EText *text, guint time, GdkAtom selection, guchar *data, gint length);
-
-static void e_text_text_model_changed(ETextModel *model, EText *text);
-static void e_text_text_model_reposition (ETextModel *model, ETextModelReposFn fn, gpointer repos_data, gpointer data);
-
-static void _get_tep(EText *text);
-
-static GtkWidget *e_text_get_invisible(EText *text);
-static void _selection_clear_event (GtkInvisible *invisible,
-				    GdkEventSelection *event,
-				    EText *text);
-static void _selection_get (GtkInvisible *invisible,
-			    GtkSelectionData *selection_data,
-			    guint info,
-			    guint time_stamp,
-			    EText *text);
-static void _selection_received (GtkInvisible *invisible,
-				 GtkSelectionData *selection_data,
-				 guint time,
-				 EText *text);
-
-#if 0
-static ETextSuckFont *e_suck_font (GdkFont *font);
-static void e_suck_font_free (ETextSuckFont *suckfont);
-#endif
-
-static void e_text_free_lines(EText *text);
-
-static gint text_width_with_objects (ETextModel *model,
-				     EFont *font, EFontStyle style,
-				     const gchar *text, gint bytelen);
-
-static void calc_height (EText *text);
-static void calc_line_widths (EText *text);
-static void split_into_lines (EText *text);
-
-static GnomeCanvasItemClass *parent_class;
-static GdkAtom clipboard_atom = GDK_NONE;
-
-
-
-/**
- * e_text_get_type:
- * @void: 
- * 
- * Registers the &EText class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &EText class.
- **/
-GtkType
-e_text_get_type (void)
-{
-	static GtkType text_type = 0;
-
-	if (!text_type) {
-		GtkTypeInfo text_info = {
-			"EText",
-			sizeof (EText),
-			sizeof (ETextClass),
-			(GtkClassInitFunc) e_text_class_init,
-			(GtkObjectInitFunc) e_text_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		text_type = gtk_type_unique (gnome_canvas_item_get_type (), &text_info);
-	}
-
-	return text_type;
-}
-
-/* Class initialization function for the text item */
-static void
-e_text_class_init (ETextClass *klass)
-{
-	GtkObjectClass *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	object_class = (GtkObjectClass *) klass;
-	item_class = (GnomeCanvasItemClass *) klass;
-
-	parent_class = gtk_type_class (gnome_canvas_item_get_type ());
-
-	e_text_signals[E_TEXT_CHANGED] =
-		gtk_signal_new ("changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETextClass, changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_text_signals[E_TEXT_ACTIVATE] =
-		gtk_signal_new ("activate",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETextClass, activate),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_text_signals[E_TEXT_KEYPRESS] =
-		gtk_signal_new ("keypress",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETextClass, keypress),
-				gtk_marshal_NONE__INT_INT,
-				GTK_TYPE_NONE, 2, GTK_TYPE_UINT, GTK_TYPE_UINT);
-
-	e_text_signals[E_TEXT_POPUP] =
-		gtk_signal_new ("popup",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ETextClass, popup),
-				gtk_marshal_NONE__POINTER_INT,
-				GTK_TYPE_NONE, 2, GTK_TYPE_POINTER, GTK_TYPE_INT);
-
-	gtk_object_class_add_signals (object_class, e_text_signals, E_TEXT_LAST_SIGNAL);
-
-
-	gtk_object_add_arg_type ("EText::model",
-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_MODEL);  
-	gtk_object_add_arg_type ("EText::event_processor",
-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_EVENT_PROCESSOR);
-	gtk_object_add_arg_type ("EText::text",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_TEXT);
-	gtk_object_add_arg_type ("EText::font",
-				 GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_FONT);
-	gtk_object_add_arg_type ("EText::fontset",
-				 GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_FONTSET);
-	gtk_object_add_arg_type ("EText::font_gdk",
-				 GTK_TYPE_GDK_FONT, GTK_ARG_WRITABLE, ARG_FONT_GDK);
-	gtk_object_add_arg_type ("EText::font_e",
-				 GTK_TYPE_POINTER, GTK_ARG_READWRITE, ARG_FONT_E);
-	gtk_object_add_arg_type ("EText::bold",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_BOLD);
-	gtk_object_add_arg_type ("EText::strikeout",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_STRIKEOUT);
-	gtk_object_add_arg_type ("EText::anchor",
-				 GTK_TYPE_ANCHOR_TYPE, GTK_ARG_READWRITE, ARG_ANCHOR);
-	gtk_object_add_arg_type ("EText::justification",
-				 GTK_TYPE_JUSTIFICATION, GTK_ARG_READWRITE, ARG_JUSTIFICATION);
-	gtk_object_add_arg_type ("EText::clip_width",
-				 GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_CLIP_WIDTH);
-	gtk_object_add_arg_type ("EText::clip_height",
-				 GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_CLIP_HEIGHT);
-	gtk_object_add_arg_type ("EText::clip",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_CLIP);
-	gtk_object_add_arg_type ("EText::fill_clip_rectangle",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_FILL_CLIP_RECTANGLE);
-	gtk_object_add_arg_type ("EText::x_offset",
-				 GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_X_OFFSET);
-	gtk_object_add_arg_type ("EText::y_offset",
-				 GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_Y_OFFSET);
-	gtk_object_add_arg_type ("EText::fill_color",
-				 GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_FILL_COLOR);
-	gtk_object_add_arg_type ("EText::fill_color_gdk",
-				 GTK_TYPE_GDK_COLOR, GTK_ARG_READWRITE, ARG_FILL_COLOR_GDK);
-	gtk_object_add_arg_type ("EText::fill_color_rgba",
-				 GTK_TYPE_UINT, GTK_ARG_READWRITE, ARG_FILL_COLOR_RGBA);
-	gtk_object_add_arg_type ("EText::fill_stipple",
-				 GTK_TYPE_GDK_WINDOW, GTK_ARG_READWRITE, ARG_FILL_STIPPLE);
-	gtk_object_add_arg_type ("EText::text_width",
-				 GTK_TYPE_DOUBLE, GTK_ARG_READABLE, ARG_TEXT_WIDTH);
-	gtk_object_add_arg_type ("EText::text_height",
-				 GTK_TYPE_DOUBLE, GTK_ARG_READABLE, ARG_TEXT_HEIGHT);
-	gtk_object_add_arg_type ("EText::editable",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_EDITABLE);
-	gtk_object_add_arg_type ("EText::use_ellipsis",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_USE_ELLIPSIS);
-	gtk_object_add_arg_type ("EText::ellipsis",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ELLIPSIS);
-	gtk_object_add_arg_type ("EText::line_wrap",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_LINE_WRAP);
-	gtk_object_add_arg_type ("EText::break_characters",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_BREAK_CHARACTERS);
-	gtk_object_add_arg_type ("EText::max_lines",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_MAX_LINES);
-	gtk_object_add_arg_type ("EText::width",
-				 GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_WIDTH);
-	gtk_object_add_arg_type ("EText::height",
-				 GTK_TYPE_DOUBLE, GTK_ARG_READABLE, ARG_HEIGHT);
-	gtk_object_add_arg_type ("EText::draw_borders",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_DRAW_BORDERS);
-	gtk_object_add_arg_type ("EText::allow_newlines",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_ALLOW_NEWLINES);
-	gtk_object_add_arg_type ("EText::draw_background",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_DRAW_BACKGROUND);
-	gtk_object_add_arg_type ("EText::cursor_pos",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_CURSOR_POS);
-
-	if (!clipboard_atom)
-		clipboard_atom = gdk_atom_intern ("CLIPBOARD", FALSE);
-
-
-
-	klass->changed = NULL;
-	klass->activate = NULL;
-
-	object_class->destroy = e_text_destroy;
-	object_class->set_arg = e_text_set_arg;
-	object_class->get_arg = e_text_get_arg;
-
-	item_class->update = e_text_update;
-	item_class->realize = e_text_realize;
-	item_class->unrealize = e_text_unrealize;
-	item_class->draw = e_text_draw;
-	item_class->point = e_text_point;
-	item_class->bounds = e_text_bounds;
-	item_class->render = e_text_render;
-	item_class->event = e_text_event;
-}
-
-/* Object initialization function for the text item */
-static void
-e_text_init (EText *text)
-{
-	text->model = e_text_model_new ();
-	text->text = e_text_model_get_text (text->model);
-
-	gtk_object_ref (GTK_OBJECT (text->model));
-	gtk_object_sink (GTK_OBJECT (text->model));
-
-	text->model_changed_signal_id =
-		gtk_signal_connect (GTK_OBJECT (text->model),
-				   "changed",
-				    GTK_SIGNAL_FUNC (e_text_text_model_changed),
-				    text);
-	text->model_repos_signal_id =
-		gtk_signal_connect (GTK_OBJECT (text->model),
-				    "reposition",
-				    GTK_SIGNAL_FUNC (e_text_text_model_reposition),
-				    text);
-
-	text->anchor = GTK_ANCHOR_CENTER;
-	text->justification = GTK_JUSTIFY_LEFT;
-	text->clip_width = -1.0;
-	text->clip_height = -1.0;
-	text->xofs = 0.0;
-	text->yofs = 0.0;
-
-	text->ellipsis = NULL;
-	text->use_ellipsis = FALSE;
-	text->ellipsis_width = 0;
-
-	text->editable = FALSE;
-	text->editing = FALSE;
-	text->xofs_edit = 0;
-	text->yofs_edit = 0;
-	
-	text->selection_start = 0;
-	text->selection_end = 0;
-	text->select_by_word = FALSE;
-
-	text->timeout_id = 0;
-	text->timer = NULL;
-
-	text->lastx = 0;
-	text->lasty = 0;
-	text->last_state = 0;
-
-	text->scroll_start = 0;
-	text->show_cursor = TRUE;
-	text->button_down = FALSE;
-	
-	text->tep = NULL;
-	text->tep_command_id = 0;
-
-	text->has_selection = FALSE;
-	
-	text->invisible = NULL;
-	text->primary_selection = NULL;
-	text->primary_length = 0;
-	text->clipboard_selection = NULL;
-	text->clipboard_length = 0;
-
-	text->pointer_in = FALSE;
-	text->default_cursor_shown = TRUE;
-
-	text->line_wrap = FALSE;
-	text->break_characters = NULL;
-	text->max_lines = -1;
-
-	text->tooltip_timeout = 0;
-	text->tooltip_count = 0;
-	text->tooltip_owner = FALSE;
-
-	text->dbl_timeout = 0;
-	text->tpl_timeout = 0;
-
-	text->draw_background = FALSE;
-
-	text->bold = FALSE;
-	text->strikeout = FALSE;
-
-	text->style = E_FONT_PLAIN;
-
-	e_canvas_item_set_reflow_callback(GNOME_CANVAS_ITEM(text), e_text_reflow);
-}
-
-/* Destroy handler for the text item */
-static void
-e_text_destroy (GtkObject *object)
-{
-	EText *text;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (E_IS_TEXT (object));
-
-	text = E_TEXT (object);
-
-	if (text->tooltip_owner) {
-		e_canvas_hide_tooltip (E_CANVAS(GNOME_CANVAS_ITEM(text)->canvas));
-	}
-
-	if (text->model_changed_signal_id)
-		gtk_signal_disconnect (GTK_OBJECT (text->model), 
-				       text->model_changed_signal_id);
-
-	if (text->model_repos_signal_id)
-		gtk_signal_disconnect (GTK_OBJECT (text->model),
-				       text->model_repos_signal_id);
-
-	if (text->model)
-		gtk_object_unref(GTK_OBJECT(text->model));
-
-	if (text->tep_command_id)
-		gtk_signal_disconnect(GTK_OBJECT(text->tep),
-				      text->tep_command_id);
-
-	if (text->tep)
-		gtk_object_unref (GTK_OBJECT(text->tep));
-	
-	if (text->invisible)
-		gtk_object_unref (GTK_OBJECT(text->invisible));
-
-	if (text->lines)
-		g_free (text->lines);
-
-	if (text->font)
-		e_font_unref (text->font);
-	text->font = NULL;
-
-#if 0
-	if (text->suckfont)
-		e_suck_font_free (text->suckfont);
-#endif
-
-	if (text->stipple)
-		gdk_bitmap_unref (text->stipple);
-
-	if (text->timeout_id) {
-		g_source_remove(text->timeout_id);
-		text->timeout_id = 0;
-	}
-	
-	if (text->timer) {
-		g_timer_stop(text->timer);
-		g_timer_destroy(text->timer);
-		text->timer = NULL;
-	}
-				
-	if ( text->tooltip_timeout ) {
-		gtk_timeout_remove (text->tooltip_timeout);
-		text->tooltip_timeout = 0;
-	}
-
-	if ( text->dbl_timeout ) {
-		gtk_timeout_remove (text->dbl_timeout);
-		text->dbl_timeout = 0;
-	}
-
-	if ( text->tpl_timeout ) {
-		gtk_timeout_remove (text->tpl_timeout);
-		text->tpl_timeout = 0;
-	}
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void
-e_text_text_model_changed (ETextModel *model, EText *text)
-{
-	text->text = e_text_model_get_text(model);
-	e_text_free_lines(text);
-	gtk_signal_emit (GTK_OBJECT (text), e_text_signals[E_TEXT_CHANGED]);
-	text->needs_split_into_lines = 1;
-	e_canvas_item_request_reflow (GNOME_CANVAS_ITEM(text));
-}
-
-static void
-e_text_text_model_reposition (ETextModel *model, ETextModelReposFn fn, gpointer repos_data, gpointer user_data)
-{
-	EText *text = E_TEXT (user_data);
-	gint model_len = e_text_model_get_text_length (model);
-
-	text->selection_start = fn (text->selection_start, repos_data);
-	text->selection_end   = fn (text->selection_end,   repos_data);
-
-	/* Our repos function should make sure we don't overrun the buffer, but it never
-	   hurts to be paranoid. */
-	text->selection_start = CLAMP (text->selection_start, 0, model_len);
-	text->selection_end   = CLAMP (text->selection_end,   0, model_len);
-
-	if (text->selection_start > text->selection_end) {
-		gint tmp = text->selection_start;
-		text->selection_start = text->selection_end;
-		text->selection_end = tmp;
-	}
-}
-
-static void
-get_bounds_item_relative (EText *text, double *px1, double *py1, double *px2, double *py2)
-{
-	GnomeCanvasItem *item;
-	double x, y;
-	double clip_x, clip_y;
-	int old_height;
-
-	item = GNOME_CANVAS_ITEM (text);
-	
-	x = 0;
-	y = 0;
-
-	clip_x = x;
-	clip_y = y;
-
-	/* Calculate text dimensions */
-
-	old_height = text->height;
-
-	if (text->text && text->font)
-		text->height = (e_font_height (text->font)) * text->num_lines;
-	else
-		text->height = 0;
-
-	if (old_height != text->height)
-		e_canvas_item_request_parent_reflow(item);
-
-	/* Anchor text */
-
-	switch (text->anchor) {
-	case GTK_ANCHOR_NW:
-	case GTK_ANCHOR_W:
-	case GTK_ANCHOR_SW:
-		break;
-
-	case GTK_ANCHOR_N:
-	case GTK_ANCHOR_CENTER:
-	case GTK_ANCHOR_S:
-		x -= text->max_width / 2;
-		if ( text->clip_width >= 0)
-			clip_x -= text->clip_width / 2;
-		else
-			clip_x -= text->width / 2;
-		break;
-
-	case GTK_ANCHOR_NE:
-	case GTK_ANCHOR_E:
-	case GTK_ANCHOR_SE:
-		x -= text->max_width;
-		if (text->clip_width >= 0)
-			clip_x -= text->clip_width;
-		else
-			clip_x -= text->width;
-		break;
-	}
-
-	switch (text->anchor) {
-	case GTK_ANCHOR_NW:
-	case GTK_ANCHOR_N:
-	case GTK_ANCHOR_NE:
-		break;
-
-	case GTK_ANCHOR_W:
-	case GTK_ANCHOR_CENTER:
-	case GTK_ANCHOR_E:
-		y -= text->height / 2;
-		if ( text->clip_height >= 0 )
-			clip_y -= text->clip_height / 2;
-		else
-			clip_y -= text->height / 2;
-		break;
-
-	case GTK_ANCHOR_SW:
-	case GTK_ANCHOR_S:
-	case GTK_ANCHOR_SE:
-		y -= text->height;
-		if ( text->clip_height >= 0 )
-			clip_y -= text->clip_height;
-		else
-			clip_y -= text->height;
-		break;
-	}
-
-	/* Bounds */
-
-	if (text->clip) {
-		/* maybe do bbox intersection here? */
-		*px1 = clip_x;
-		*py1 = clip_y;
-		if (text->clip_width >= 0)
-			*px2 = clip_x + text->clip_width;
-		else
-			*px2 = clip_x + text->width;
-
-		if ( text->clip_height >= 0 )
-			*py2 = clip_y + text->clip_height;
-		else
-			*py2 = clip_y + text->height;
-	} else {
-		*px1 = x;
-		*py1 = y;
-		*px2 = x + text->max_width;
-		*py2 = y + text->height;
-	}
-}
-
-static void
-get_bounds (EText *text, double *px1, double *py1, double *px2, double *py2)
-{
-	GnomeCanvasItem *item;
-	double wx, wy, clip_width;
-
-	item = GNOME_CANVAS_ITEM (text);
-
-	/* Get canvas pixel coordinates for text position */
-
-	wx = 0;
-	wy = 0;
-	gnome_canvas_item_i2w (item, &wx, &wy);
-	gnome_canvas_w2c (item->canvas, wx + text->xofs, wy + text->yofs, &text->cx, &text->cy);
-
-	if (text->clip_width < 0)
-		clip_width = text->max_width;
-	else
-		clip_width = text->clip_width;
-
-	/* Get canvas pixel coordinates for clip rectangle position */
-	gnome_canvas_w2c (item->canvas, wx, wy, &text->clip_cx, &text->clip_cy);
-	text->clip_cwidth = clip_width * item->canvas->pixels_per_unit;
-	if ( text->clip_height >= 0 )
-		text->clip_cheight = text->clip_height * item->canvas->pixels_per_unit;
-	else
-		text->clip_cheight = text->height * item->canvas->pixels_per_unit;
-
-	/* Anchor text */
-
-	switch (text->anchor) {
-	case GTK_ANCHOR_NW:
-	case GTK_ANCHOR_W:
-	case GTK_ANCHOR_SW:
-		break;
-
-	case GTK_ANCHOR_N:
-	case GTK_ANCHOR_CENTER:
-	case GTK_ANCHOR_S:
-		text->cx -= text->max_width / 2;
-		text->clip_cx -= text->clip_cwidth / 2;
-		break;
-
-	case GTK_ANCHOR_NE:
-	case GTK_ANCHOR_E:
-	case GTK_ANCHOR_SE:
-		text->cx -= text->max_width;
-		text->clip_cx -= text->clip_cwidth;
-		break;
-	}
-
-	switch (text->anchor) {
-	case GTK_ANCHOR_NW:
-	case GTK_ANCHOR_N:
-	case GTK_ANCHOR_NE:
-		break;
-
-	case GTK_ANCHOR_W:
-	case GTK_ANCHOR_CENTER:
-	case GTK_ANCHOR_E:
-		text->cy -= text->height / 2;
-		text->clip_cy -= text->clip_cheight / 2;
-		break;
-
-	case GTK_ANCHOR_SW:
-	case GTK_ANCHOR_S:
-	case GTK_ANCHOR_SE:
-		text->cy -= text->height;
-		text->clip_cy -= text->clip_cheight;
-		break;
-	}
-
-	/* Bounds */
-
-	if (text->clip) {
-		*px1 = text->clip_cx;
-		*py1 = text->clip_cy;
-		*px2 = text->clip_cx + text->clip_cwidth;
-		*py2 = text->clip_cy + text->clip_cheight;
-	} else {
-		*px1 = text->cx;
-		*py1 = text->cy;
-		*px2 = text->cx + text->max_width;
-		*py2 = text->cy + text->height;
-	}
-}
-
-static void
-calc_height (EText *text)
-{
-	GnomeCanvasItem *item;
-	int old_height;
-
-	item = GNOME_CANVAS_ITEM (text);
-
-	/* Calculate text dimensions */
-
-	old_height = text->height;
-
-	if (text->text && text->font)
-		text->height = e_font_height (text->font) * text->num_lines;
-	else
-		text->height = 0;
-
-	if (old_height != text->height)
-		e_canvas_item_request_parent_reflow(item);
-}
-
-static void
-calc_ellipsis (EText *text)
-{
-	if (text->font)
-		text->ellipsis_width = 
-			e_font_utf8_text_width (text->font, text->style,
-						text->ellipsis ? text->ellipsis : "...",
-						text->ellipsis ? strlen (text->ellipsis) : 3);
-}
-
-/* Calculates the line widths (in pixels) of the text's splitted lines */
-static void
-calc_line_widths (EText *text)
-{
-	struct line *lines;
-	int i;
-	gdouble clip_width;
-	const gchar *p;
-
-	lines = text->lines;
-	text->max_width = 0;
-
-	clip_width = text->clip_width;
-	if (clip_width >= 0 && text->draw_borders) {
-		clip_width -= 6;
-		if (clip_width < 0)
-			clip_width = 0;
-	}
-
-
-	if (!lines)
-		return;
-
-	for (i = 0; i < text->num_lines; i++) {
-		if (lines->length != 0) {
-			if (text->font) {
-				lines->width = text_width_with_objects (text->model,
-									text->font, text->style,
-									lines->text, lines->length);
-				lines->ellipsis_length = 0;
-			} else {
-				lines->width = 0;
-			}
-			
-			if (text->clip && 
-			    text->use_ellipsis &&
-			    ! text->editing &&
-			    lines->width > clip_width &&
-			    clip_width >= 0) {
-				if (text->font) {
-					lines->ellipsis_length = 0;
-					for (p = lines->text;
-					     p && *p && g_unichar_validate (g_utf8_get_char (p)) && (p - lines->text) < lines->length;
-					     p = g_utf8_next_char (p)) {
-						gint text_width = text_width_with_objects (text->model,
-											   text->font, text->style,
-											   lines->text, p - lines->text);
-						if (clip_width >= text_width + text->ellipsis_width)
-							lines->ellipsis_length = p - lines->text;
-						else
-							break;
-					}
-				}
-				else
-					lines->ellipsis_length = 0;
-				lines->width = text_width_with_objects (text->model,
-									text->font, text->style,
-									lines->text, lines->ellipsis_length) + 
-					text->ellipsis_width;
-			} else
-				lines->ellipsis_length = lines->length;
-
-			if (lines->width > text->max_width)
-				text->max_width = lines->width;
-		}
-
-		lines++;
-	}
-}
-
-static void
-e_text_free_lines(EText *text)
-{
-	if (text->lines)
-		g_free (text->lines);
-
-	text->lines = NULL;
-	text->num_lines = 0;
-}
-
-static gint
-text_width_with_objects (ETextModel *model,
-			 EFont *font, EFontStyle style,
-			 const gchar *text, gint numbytes)
-{
-	return e_font_utf8_text_width (font, style, text, numbytes);
-}
-
-static void
-text_draw_with_objects (ETextModel *model, 
-			GdkDrawable *drawable,
-			EFont *font, EFontStyle style,
-			GdkGC *gc,
-			gint x, gint y,
-			const gchar *text, gint numbytes)
-{
-	const gchar *c;
-	
-	while (*text && numbytes > 0) {
-		gint obj_num = -1;
-		
-		c = text;
-
-		while (*c
-		       && (obj_num = e_text_model_get_object_at_pointer (model, c)) == -1
-		       && numbytes > 0) {
-			++c;
-			--numbytes;
-		}
-
-		e_font_draw_utf8_text (drawable, font, style, gc, x, y, text, c-text);
-		x += e_font_utf8_text_width (font, style, text, c-text);
-		
-		if (obj_num != -1 && numbytes > 0) {
-			gint len;
-			gint start_x = x;
-
-			e_text_model_get_nth_object (model, obj_num, &len);
-
-			if (len > numbytes)
-				len = numbytes;
-			e_font_draw_utf8_text (drawable, font, style, gc, x, y, c, len);
-			x += e_font_utf8_text_width (font, style, c, len);
-
-			/* We underline our objects. */
-			gdk_draw_line (drawable, gc, start_x, y+1, x, y+1);
-
-			c += len;
-			numbytes -= len;
-		}
-		
-		text = c;
-	}
-}
-
-#define IS_BREAKCHAR(text,c) ((text)->break_characters && g_utf8_strchr ((text)->break_characters, (c)))
-/* Splits the text of the text item into lines */
-static void
-split_into_lines (EText *text)
-{
-	const char *p, *cp;
-	struct line *lines;
-	int len;
-	int line_num;
-	const char *laststart;
-	const char *lastend;
-	const char *linestart;
-	double clip_width;
-	gunichar unival;
-
-
-	if (text->text == NULL)
-		return;
-
-	/* Free old array of lines */
-	e_text_free_lines(text);
-
-	/* First, count the number of lines */
-
-	lastend = text->text;
-	laststart = text->text;
-	linestart = text->text;
-
-	clip_width = text->clip_width;
-	if (clip_width >= 0 && text->draw_borders) {
-		clip_width -= 6;
-		if (clip_width < 0)
-			clip_width = 0;
-	}
-
-	cp = text->text;
-
-	for (p = e_unicode_get_utf8 (cp, &unival); (unival && p); cp = p, p = e_unicode_get_utf8 (p, &unival)) {
-		if (text->line_wrap
-		    && (g_unichar_isspace (unival) || unival == '\n')
-		    && e_text_model_get_object_at_pointer (text->model, cp) == -1) { /* don't break mid-object */
-			if (laststart != lastend
-			    && clip_width < text_width_with_objects (text->model,
-								     text->font, text->style,
-								     linestart, cp - linestart)) {
-				text->num_lines ++;
-				
-				linestart = laststart;
-				laststart = p;
-				lastend = cp;
-			} else if (g_unichar_isspace (unival)) {
-				laststart = p;
-				lastend = cp;
-			}
-		} else if (text->line_wrap
-			   && IS_BREAKCHAR (text, unival)) {
-			
-			if (laststart != lastend
-			    && g_utf8_pointer_to_offset (linestart, cp) != 1
-			    && clip_width < text_width_with_objects (text->model,
-								     text->font, text->style,
-								     linestart, p - linestart)) {
-				text->num_lines ++;
-				
-				linestart = laststart;
-				laststart = p;
-				lastend = p;
-			} else {
-				laststart = p;
-				lastend = p;
-			}
-		}
-
-		if (unival == '\n') {
-			text->num_lines ++;
-
-			lastend = p;
-			laststart = p;
-			linestart = p;
-		} 
-	}
-
-	if ( text->line_wrap
-	     && p
-	     && laststart != lastend
-	     && clip_width < text_width_with_objects (text->model,
-						      text->font, text->style, 
-						      linestart, cp - linestart)) {
-		text->num_lines ++;
-	}
-
-	text->num_lines++;
-
-	if ( (!text->editing) && text->max_lines != -1 && text->num_lines > text->max_lines ) {
-		text->num_lines = text->max_lines;
-	}
-
-	/* Allocate array of lines and calculate split positions */
-
-	text->lines = lines = g_new0 (struct line, text->num_lines);
-	len = 0;
-	line_num = 1;
-	lastend = text->text;
-	laststart = text->text;
-
-	cp = text->text;
-
-	for (p = e_unicode_get_utf8 (cp, &unival); p && unival && line_num < text->num_lines; cp = p, p = e_unicode_get_utf8 (p, &unival)) {
-		gboolean handled = FALSE;
-
-		if (len == 0)
-			lines->text = cp;
-		if (text->line_wrap
-		    && (g_unichar_isspace (unival) || unival == '\n')
-		    && e_text_model_get_object_at_pointer (text->model, cp) == -1) { /* don't break mid-object */
-			if (clip_width < text_width_with_objects (text->model,
-								  text->font, text->style,
-								  lines->text, cp - lines->text)
-			    && laststart != lastend) {
-
-				lines->length = lastend - lines->text;
-
-				lines++;
-				line_num++;
-				len = cp - laststart;
-				lines->text = laststart;
-				laststart = p;
-				lastend = cp;
-			} else if (g_unichar_isspace (unival)) {
-				laststart = p;
-				lastend = cp;
-				len ++;
-			}
-			handled = TRUE;
-		} else if (text->line_wrap
-			   && IS_BREAKCHAR(text, unival) 
-			   && e_text_model_get_object_at_pointer (text->model, cp) == -1) {
-			if (laststart != lastend
-			    && g_utf8_pointer_to_offset (lines->text, cp) != 1
-			    && clip_width < text_width_with_objects (text->model,
-								     text->font, text->style,
-								     lines->text, p - lines->text)) {
-
-				lines->length = lastend - lines->text;
-
-				lines++;
-				line_num++;
-				len = p - laststart;
-				lines->text = laststart;
-				laststart = p;
-				lastend = p;
-			} else {
-				laststart = p;
-				lastend = p;
-				len ++;
-			}
-		} 
-		if (line_num >= text->num_lines)
-			break;
-		if (unival == '\n') {
-
-			lines->length = cp - lines->text;
-			
-			lines++;
-			line_num++;
-			len = 0;
-			lastend = p;
-			laststart = p;
-			handled = TRUE;
-		} 
-		if (!handled)
-			len++;
-	}
-
-	if ( line_num < text->num_lines && text->line_wrap ) {
-		if (clip_width < text_width_with_objects (text->model,
-							  text->font, text->style,
-							  lines->text, cp - lines->text)
-		    && laststart != lastend ) {
-
-			lines->length = lastend - lines->text;
-
-			lines++;
-			line_num++;
-			len = cp - laststart;
-			lines->text = laststart;
-			laststart = p;
-			lastend = cp;
-		}
-	} 
-	
-	if (len == 0)
-		lines->text = cp;
-	lines->length = strlen (lines->text);
-}
-
-/* Convenience function to set the text's GC's foreground color */
-static void
-set_text_gc_foreground (EText *text)
-{
-	if (!text->gc)
-		return;
-
-	gdk_gc_set_foreground (text->gc, &text->color);
-}
-
-/* Sets the stipple pattern for the text */
-static void
-set_stipple (EText *text, GdkBitmap *stipple, int reconfigure)
-{
-	if (text->stipple && !reconfigure)
-		gdk_bitmap_unref (text->stipple);
-
-	text->stipple = stipple;
-	if (stipple && !reconfigure)
-		gdk_bitmap_ref (stipple);
-
-	if (text->gc) {
-		if (stipple) {
-			gdk_gc_set_stipple (text->gc, stipple);
-			gdk_gc_set_fill (text->gc, GDK_STIPPLED);
-		} else
-			gdk_gc_set_fill (text->gc, GDK_SOLID);
-	}
-}
-
-/* Set_arg handler for the text item */
-static void
-e_text_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EText *text;
-	GdkColor color = { 0, 0, 0, 0, };
-	GdkColor *pcolor;
-	gboolean color_changed;
-	int have_pixel;
-	
-	gboolean needs_update = 0;
-	gboolean needs_reflow = 0;
-
-	item = GNOME_CANVAS_ITEM (object);
-	text = E_TEXT (object);
-
-	color_changed = FALSE;
-	have_pixel = FALSE;
-
-	switch (arg_id) {
-	case ARG_MODEL:
-
-		if ( text->model_changed_signal_id )
-			gtk_signal_disconnect (GTK_OBJECT (text->model),
-					       text->model_changed_signal_id);
-
-		if ( text->model_repos_signal_id )
-			gtk_signal_disconnect (GTK_OBJECT (text->model),
-					       text->model_repos_signal_id);
-
-		gtk_object_unref (GTK_OBJECT (text->model));
-		text->model = E_TEXT_MODEL (GTK_VALUE_OBJECT (*arg));
-		gtk_object_ref (GTK_OBJECT (text->model));
-
-		text->model_changed_signal_id =
-			gtk_signal_connect (GTK_OBJECT (text->model),
-					    "changed",
-					    GTK_SIGNAL_FUNC (e_text_text_model_changed),
-					    text);
-
-		text->model_repos_signal_id =
-			gtk_signal_connect (GTK_OBJECT (text->model),
-					    "reposition",
-					    GTK_SIGNAL_FUNC (e_text_text_model_reposition),
-					    text);
-
-		e_text_free_lines(text);
-
-		text->text = e_text_model_get_text(text->model);
-		gtk_signal_emit (GTK_OBJECT (text), e_text_signals[E_TEXT_CHANGED]);
-
-		text->needs_split_into_lines = 1;
-		needs_reflow = 1;
-		break;
-
-	case ARG_EVENT_PROCESSOR:
-		if ( text->tep && text->tep_command_id )
-			gtk_signal_disconnect(GTK_OBJECT(text->tep),
-					      text->tep_command_id);
-		if ( text->tep ) {
-			gtk_object_unref(GTK_OBJECT(text->tep));
-		}
-		text->tep = E_TEXT_EVENT_PROCESSOR(GTK_VALUE_OBJECT (*arg));
-		gtk_object_ref(GTK_OBJECT(text->tep));
-		text->tep_command_id = 
-			gtk_signal_connect(GTK_OBJECT(text->tep),
-					   "command",
-					   GTK_SIGNAL_FUNC(e_text_command),
-					   text);
-		break;
-
-	case ARG_TEXT:
-		text->num_lines = 1;
-		e_text_model_set_text(text->model, GTK_VALUE_STRING (*arg));
-		break;
-
-	case ARG_FONT:
-		if (text->font)
-  			e_font_unref (text->font);
-
-		text->font = e_font_from_gdk_name (GTK_VALUE_STRING (*arg));
-		
-		calc_ellipsis (text);
-		if ( text->line_wrap )
-			text->needs_split_into_lines = 1;
-		else {
-			text->needs_calc_line_widths = 1;
-			text->needs_calc_height = 1;
-		}
-		needs_reflow = 1;
-		break;
-
-	case ARG_FONTSET:
-		if (text->font)
-  			e_font_unref (text->font); 
-
-		text->font = e_font_from_gdk_name (GTK_VALUE_STRING (*arg));
-
-		calc_ellipsis (text);
-		if ( text->line_wrap )
-			text->needs_split_into_lines = 1;
-		else {
-			text->needs_calc_line_widths = 1;
-			text->needs_calc_height = 1;
-		}
-		needs_reflow = 1;
-		break;
-
-	case ARG_FONT_GDK:
-		/* Ref the font in case it was the font that is stored
-		   in the e-font */
-		gdk_font_ref (GTK_VALUE_POINTER (*arg));
-		if (text->font)
-  			e_font_unref (text->font); 
-
-		text->font = e_font_from_gdk_font (GTK_VALUE_POINTER (*arg));
-
-		calc_ellipsis (text);
-		if ( text->line_wrap )
-			text->needs_split_into_lines = 1;
-		else {
-			text->needs_calc_line_widths = 1;
-			text->needs_calc_height = 1;
-		}
-		needs_reflow = 1;
-		break;
-
-	case ARG_FONT_E:
-		if (text->font)
-			e_font_unref (text->font);
-
-		text->font = GTK_VALUE_POINTER (*arg);
-		e_font_ref (text->font);
-
-		calc_ellipsis (text);
-		if (text->line_wrap)
-			text->needs_split_into_lines = 1;
-		else {
-			text->needs_calc_line_widths = 1;
-			text->needs_calc_height = 1;
-		}
-		needs_reflow = 1;
-		break;
-
-	case ARG_BOLD:
-		text->bold = GTK_VALUE_BOOL (*arg);
-		text->style = text->bold ? E_FONT_BOLD : E_FONT_PLAIN;
-
-		text->needs_redraw = 1;
-		text->needs_recalc_bounds = 1;
-		if ( text->line_wrap )
-			text->needs_split_into_lines = 1;
-		else {
-			text->needs_calc_line_widths = 1;
-			text->needs_calc_height = 1;
-		}
-		needs_update = 1;
-		needs_reflow = 1;
-		break;
-
-	case ARG_STRIKEOUT:
-		text->strikeout = GTK_VALUE_BOOL (*arg);
-		text->needs_redraw = 1;
-		needs_update = 1;
-		break;
-
-	case ARG_ANCHOR:
-		text->anchor = GTK_VALUE_ENUM (*arg);
-		text->needs_recalc_bounds = 1;
-		needs_update = 1;
-		break;
-
-	case ARG_JUSTIFICATION:
-		text->justification = GTK_VALUE_ENUM (*arg);
-		text->needs_redraw = 1;
-		needs_update = 1;
-		break;
-
-	case ARG_CLIP_WIDTH:
-		text->clip_width = fabs (GTK_VALUE_DOUBLE (*arg));
-		calc_ellipsis (text);
-		if ( text->line_wrap )
-			text->needs_split_into_lines = 1;
-		else {
-			text->needs_calc_line_widths = 1;
-			text->needs_calc_height = 1;
-		}
-		needs_reflow = 1;
-		break;
-
-	case ARG_CLIP_HEIGHT:
-		text->clip_height = fabs (GTK_VALUE_DOUBLE (*arg));
-		text->needs_recalc_bounds = 1;
-		needs_reflow = 1;
-		break;
-
-	case ARG_CLIP:
-		text->clip = GTK_VALUE_BOOL (*arg);
-		calc_ellipsis (text);
-		if ( text->line_wrap )
-			text->needs_split_into_lines = 1;
-		else {
-			text->needs_calc_line_widths = 1;
-			text->needs_calc_height = 1;
-		}
-		needs_reflow = 1;
-		break;
-
-	case ARG_FILL_CLIP_RECTANGLE:
-		text->fill_clip_rectangle = GTK_VALUE_BOOL (*arg);
-		needs_update = 1;
-		break;
-
-	case ARG_X_OFFSET:
-		text->xofs = GTK_VALUE_DOUBLE (*arg);
-		text->needs_recalc_bounds = 1;
-		needs_update = 1;
-		break;
-
-	case ARG_Y_OFFSET:
-		text->yofs = GTK_VALUE_DOUBLE (*arg);
-		text->needs_recalc_bounds = 1;
-		needs_update = 1;
-		break;
-
-        case ARG_FILL_COLOR:
-		if (GTK_VALUE_STRING (*arg))
-			gdk_color_parse (GTK_VALUE_STRING (*arg), &color);
-
-		text->rgba = ((color.red & 0xff00) << 16 |
-			      (color.green & 0xff00) << 8 |
-			      (color.blue & 0xff00) |
-			      0xff);
-		color_changed = TRUE;
-		break;
-
-	case ARG_FILL_COLOR_GDK:
-		pcolor = GTK_VALUE_BOXED (*arg);
-		if (pcolor) {
-			color = *pcolor;
-		}
-
-		text->rgba = ((color.red & 0xff00) << 16 |
-			      (color.green & 0xff00) << 8 |
-			      (color.blue & 0xff00) |
-			      0xff);
-		color_changed = TRUE;
-		break;
-
-        case ARG_FILL_COLOR_RGBA:
-		text->rgba = GTK_VALUE_UINT (*arg);
-		color.red = ((text->rgba >> 24) & 0xff) * 0x101;
-		color.green = ((text->rgba >> 16) & 0xff) * 0x101;
-		color.blue = ((text->rgba >> 8) & 0xff) * 0x101;
-		color_changed = TRUE;
-		break;
-
-	case ARG_FILL_STIPPLE:
-		set_stipple (text, GTK_VALUE_BOXED (*arg), FALSE);
-		text->needs_redraw = 1;
-		needs_update = 1;
-		break;
-
-	case ARG_EDITABLE:
-		text->editable = GTK_VALUE_BOOL (*arg);
-		text->needs_redraw = 1;
-		needs_update = 1;
-		break;
-
-	case ARG_USE_ELLIPSIS:
-		text->use_ellipsis = GTK_VALUE_BOOL (*arg);
-		text->needs_calc_line_widths = 1;
-		needs_reflow = 1;
-		break;
-
-	case ARG_ELLIPSIS:
-		if (text->ellipsis)
-			g_free (text->ellipsis);
-
-		text->ellipsis = g_strdup (GTK_VALUE_STRING (*arg));
-		calc_ellipsis (text);
-		text->needs_calc_line_widths = 1;
-		needs_reflow = 1;
-		break;
-
-	case ARG_LINE_WRAP:
-		text->line_wrap = GTK_VALUE_BOOL (*arg);
-		text->needs_split_into_lines = 1;
-		needs_reflow = 1;
-		break;
-		
-	case ARG_BREAK_CHARACTERS:
-		if ( text->break_characters ) {
-			g_free(text->break_characters);
-			text->break_characters = NULL;
-		}
-		if ( GTK_VALUE_STRING (*arg) )
-			text->break_characters = g_strdup( GTK_VALUE_STRING (*arg) );
-		text->needs_split_into_lines = 1;
-		needs_reflow = 1;
-		break;
-
-	case ARG_MAX_LINES:
-		text->max_lines = GTK_VALUE_INT (*arg);
-		text->needs_split_into_lines = 1;
-		needs_reflow = 1;
-		break;
-
-	case ARG_WIDTH:
-		text->clip_width = fabs (GTK_VALUE_DOUBLE (*arg));
-		calc_ellipsis (text);
-		if ( text->line_wrap )
-			text->needs_split_into_lines = 1;
-		else {
-			text->needs_calc_line_widths = 1;
-			text->needs_calc_height = 1;
-		}
-		needs_reflow = 1;
-		break;
-		
-	case ARG_DRAW_BORDERS:
-		if (text->draw_borders != GTK_VALUE_BOOL (*arg)) {
-			text->draw_borders = GTK_VALUE_BOOL (*arg);
-			text->needs_calc_height = 1;
-			text->needs_redraw = 1;
-			needs_reflow = 1;
-			needs_update = 1;
-		}
-		break;
-
-	case ARG_DRAW_BACKGROUND:
-		if (text->draw_background != GTK_VALUE_BOOL (*arg)){
-			text->draw_background = GTK_VALUE_BOOL (*arg);
-			text->needs_redraw = 1;
-		}
-		break;
-
-	case ARG_ALLOW_NEWLINES:
-		_get_tep(text);
-		gtk_object_set (GTK_OBJECT (text->tep),
-				"allow_newlines", GTK_VALUE_BOOL (*arg),
-				NULL);
-		break;
-
-	case ARG_CURSOR_POS: {
-		ETextEventProcessorCommand command;
-
-		command.action = E_TEP_MOVE;
-		command.position = E_TEP_VALUE;
-		command.value = GTK_VALUE_INT (*arg);
-		command.time = GDK_CURRENT_TIME;
-		e_text_command (text->tep, &command, text);
-		break;
-	}
-		
-	default:
-		return;
-	}
-
-	if (color_changed) {
-		if (GNOME_CANVAS_ITEM_REALIZED & GTK_OBJECT_FLAGS(item))
-			gdk_color_context_query_color (item->canvas->cc, &color);
-
-		text->color = color;
-
-		if (!item->canvas->aa)
-			set_text_gc_foreground (text);
-
-		text->needs_redraw = 1;
-		needs_update = 1;
-	}
-
-	if ( needs_reflow )
-		e_canvas_item_request_reflow (item);
-	if ( needs_update )
-		gnome_canvas_item_request_update (item);
-}
-
-/* Get_arg handler for the text item */
-static void
-e_text_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EText *text;
-	GdkColor *color;
-
-	text = E_TEXT (object);
-
-	switch (arg_id) {
-	case ARG_MODEL:
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(text->model);
-		break;
-
-	case ARG_EVENT_PROCESSOR:
-		_get_tep(text);
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(text->tep);
-		break;
-
-	case ARG_TEXT:
-		GTK_VALUE_STRING (*arg) = g_strdup (text->text);
-		break;
-
-	case ARG_FONT_E:
-		GTK_VALUE_BOXED (*arg) = text->font;
-		break;
-
-	case ARG_BOLD:
-		GTK_VALUE_BOOL (*arg) = text->bold;
-		break;
-
-	case ARG_STRIKEOUT:
-		GTK_VALUE_BOOL (*arg) = text->strikeout;
-		break;
-
-	case ARG_ANCHOR:
-		GTK_VALUE_ENUM (*arg) = text->anchor;
-		break;
-
-	case ARG_JUSTIFICATION:
-		GTK_VALUE_ENUM (*arg) = text->justification;
-		break;
-
-	case ARG_CLIP_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = text->clip_width;
-		break;
-
-	case ARG_CLIP_HEIGHT:
-		GTK_VALUE_DOUBLE (*arg) = text->clip_height;
-		break;
-
-	case ARG_CLIP:
-		GTK_VALUE_BOOL (*arg) = text->clip;
-		break;
-
-	case ARG_FILL_CLIP_RECTANGLE:
-		GTK_VALUE_BOOL (*arg) = text->fill_clip_rectangle;
-		break;
-
-	case ARG_X_OFFSET:
-		GTK_VALUE_DOUBLE (*arg) = text->xofs;
-		break;
-
-	case ARG_Y_OFFSET:
-		GTK_VALUE_DOUBLE (*arg) = text->yofs;
-		break;
-
-	case ARG_FILL_COLOR_GDK:
-		color = g_new (GdkColor, 1);
-		*color = text->color;
-		GTK_VALUE_BOXED (*arg) = color;
-		break;
-
-	case ARG_FILL_COLOR_RGBA:
-		GTK_VALUE_UINT (*arg) = text->rgba;
-		break;
-
-	case ARG_FILL_STIPPLE:
-		GTK_VALUE_BOXED (*arg) = text->stipple;
-		break;
-
-	case ARG_TEXT_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = text->max_width / text->item.canvas->pixels_per_unit;
-		break;
-
-	case ARG_TEXT_HEIGHT:
-		GTK_VALUE_DOUBLE (*arg) = text->height / text->item.canvas->pixels_per_unit;
-		break;
-
-	case ARG_EDITABLE:
-		GTK_VALUE_BOOL (*arg) = text->editable;
-		break;
-
-	case ARG_USE_ELLIPSIS:
-		GTK_VALUE_BOOL (*arg) = text->use_ellipsis;
-		break;
-
-	case ARG_ELLIPSIS:
-		GTK_VALUE_STRING (*arg) = g_strdup (text->ellipsis);
-		break;
-
-	case ARG_LINE_WRAP:
-		GTK_VALUE_BOOL (*arg) = text->line_wrap;
-		break;
-		
-	case ARG_BREAK_CHARACTERS:
-		GTK_VALUE_STRING (*arg) = g_strdup (text->break_characters);
-		break;
-
-	case ARG_MAX_LINES:
-		GTK_VALUE_INT (*arg) = text->max_lines;
-		break;
-
-	case ARG_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = text->clip_width;
-		break;
-
-	case ARG_HEIGHT:
-		GTK_VALUE_DOUBLE (*arg) = text->clip && text->clip_height != -1 ? text->clip_height : text->height / text->item.canvas->pixels_per_unit;
-		break;
-
-	case ARG_DRAW_BORDERS:
-		GTK_VALUE_BOOL (*arg) = text->draw_borders;
-		break;
-
-	case ARG_DRAW_BACKGROUND:
-		GTK_VALUE_BOOL (*arg) = text->draw_background;
-		break;
-		
-	case ARG_ALLOW_NEWLINES:
-		{
-			gboolean allow_newlines;
-			_get_tep(text);
-			gtk_object_get (GTK_OBJECT (text->tep),
-					"allow_newlines", &allow_newlines,
-					NULL);
-			GTK_VALUE_BOOL (*arg) = allow_newlines;
-		}
-		break;
-
-	case ARG_CURSOR_POS:
-		GTK_VALUE_INT (*arg) = text->selection_start;
-		break;
-		
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-/* Update handler for the text item */
-static void
-e_text_reflow (GnomeCanvasItem *item, int flags)
-{
-	EText *text;
-
-	text = E_TEXT (item);
-
-	if (text->needs_split_into_lines) {
-		split_into_lines (text);
-
-		text->needs_split_into_lines = 0;
-		text->needs_calc_line_widths = 1;
-		text->needs_calc_height = 1;
-	}
-
-	if ( text->needs_calc_line_widths ) {
-		int x;
-		int i;
-		struct line *lines;
-		gdouble clip_width;
-		calc_line_widths (text);
-		text->needs_calc_line_widths = 0;
-		text->needs_redraw = 1;
-
-		lines = text->lines;
-		if ( !lines )
-			return;
-
-		for (lines = text->lines, i = 0; i < text->num_lines ; i++, lines ++) {
-			if ((lines->text - text->text) > text->selection_end) {
-				break;
-			}
-		}
-		lines --;
-		i--;
-		x = text_width_with_objects (text->model,
-					     text->font, text->style,
-					     lines->text,
-					     text->selection_end - (lines->text - text->text));
-
-		if (x < text->xofs_edit) {
-			text->xofs_edit = x;
-		}
-
-		clip_width = text->clip_width;
-		if (clip_width >= 0 && text->draw_borders) {
-			clip_width -= 6;
-			if (clip_width < 0)
-				clip_width = 0;
-		}
-
-		if (2 + x - clip_width > text->xofs_edit) {
-			text->xofs_edit = 2 + x - clip_width;
-		}
-
-		if (e_font_height (text->font) * i < text->yofs_edit)
-			text->yofs_edit = e_font_height (text->font) * i;
-
-		if (e_font_height (text->font) * (i + 1) -
-		     (text->clip_height != -1 ? text->clip_height : text->height) > text->yofs_edit)
-			text->yofs_edit = e_font_height (text->font) * (i + 1) -
-				(text->clip_height != -1 ? text->clip_height : text->height);
-
-		gnome_canvas_item_request_update (item);
-	}
-	if ( text->needs_calc_height ) {
-		calc_height (text);
-		gnome_canvas_item_request_update(item);
-		text->needs_calc_height = 0;
-		text->needs_recalc_bounds = 1;
-	}
-}
-
-/* Update handler for the text item */
-static void
-e_text_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags)
-{
-	EText *text;
-	double x1, y1, x2, y2;
-	ArtDRect i_bbox, c_bbox;
-	int i;
-
-	text = E_TEXT (item);
-
-	if (parent_class->update)
-		(* parent_class->update) (item, affine, clip_path, flags);
-
-	if ( text->needs_recalc_bounds
-	     || (flags & GNOME_CANVAS_UPDATE_AFFINE)) {
-		if (!item->canvas->aa) {
-			set_text_gc_foreground (text);
-			set_stipple (text, text->stipple, TRUE);
-			get_bounds (text, &x1, &y1, &x2, &y2);
-			if ( item->x1 != x1 ||
-			     item->x2 != x2 ||
-			     item->y1 != y1 ||
-			     item->y2 != y2 ) {
-				gnome_canvas_request_redraw (item->canvas, item->x1, item->y1, item->x2, item->y2);
-				item->x1 = x1;
-				item->y1 = y1;
-				item->x2 = x2;
-				item->y2 = y2;
-				text->needs_redraw = 1;
-				item->canvas->need_repick = TRUE;
-			}
-		} else {
-			/* aa rendering */
-			for (i = 0; i < 6; i++)
-				text->affine[i] = affine[i];
-			get_bounds_item_relative (text, &i_bbox.x0, &i_bbox.y0, &i_bbox.x1, &i_bbox.y1);
-			art_drect_affine_transform (&c_bbox, &i_bbox, affine);
-		}
-		text->needs_recalc_bounds = 0;
-	}
-	if ( text->needs_redraw ) {
-		gnome_canvas_request_redraw (item->canvas, item->x1, item->y1, item->x2, item->y2);
-		text->needs_redraw = 0;
-	}
-}
-
-/* Realize handler for the text item */
-static void
-e_text_realize (GnomeCanvasItem *item)
-{
-	EText *text;
-
-	text = E_TEXT (item);
-
-	if (parent_class->realize)
-		(* parent_class->realize) (item);
-
-	text->gc = gdk_gc_new (item->canvas->layout.bin_window);
-	gdk_color_context_query_color (item->canvas->cc, &text->color);
-	gdk_gc_set_foreground (text->gc, &text->color);
-	
-	text->i_cursor = gdk_cursor_new (GDK_XTERM);
-	text->default_cursor = gdk_cursor_new (GDK_LEFT_PTR);
-	if (text->font == NULL) {
-		gdk_font_ref (GTK_WIDGET (item->canvas)->style->font);
-		text->font = e_font_from_gdk_font (GTK_WIDGET (item->canvas)->style->font);
-	}
-}
-
-/* Unrealize handler for the text item */
-static void
-e_text_unrealize (GnomeCanvasItem *item)
-{
-	EText *text;
-
-	text = E_TEXT (item);
-
-	gdk_gc_unref (text->gc);
-	text->gc = NULL;
-
-	gdk_cursor_destroy (text->i_cursor);
-	text->i_cursor = NULL;
-	gdk_cursor_destroy (text->default_cursor);
-	text->default_cursor = NULL;
-
-	if (parent_class->unrealize)
-		(* parent_class->unrealize) (item);
-}
-
-/* Calculates the x position of the specified line of text, based on the text's justification */
-static double
-get_line_xpos_item_relative (EText *text, struct line *line)
-{
-	double x;
-
-	x = 0;
-
-	switch (text->anchor) {
-	case GTK_ANCHOR_NW:
-	case GTK_ANCHOR_W:
-	case GTK_ANCHOR_SW:
-		break;
-
-	case GTK_ANCHOR_N:
-	case GTK_ANCHOR_CENTER:
-	case GTK_ANCHOR_S:
-		x -= text->max_width / 2;
-		break;
-
-	case GTK_ANCHOR_NE:
-	case GTK_ANCHOR_E:
-	case GTK_ANCHOR_SE:
-		x -= text->max_width;
-		break;
-	}
-
-	switch (text->justification) {
-	case GTK_JUSTIFY_RIGHT:
-		x += text->max_width - line->width;
-		break;
-
-	case GTK_JUSTIFY_CENTER:
-		x += (text->max_width - line->width) * 0.5;
-		break;
-
-	default:
-		if (text->draw_borders)
-			x += BORDER_INDENT;
-
-		/* For GTK_JUSTIFY_LEFT, we don't have to do anything.  We do not support
-		 * GTK_JUSTIFY_FILL, yet.
-		 */
-		break;
-	}
-	
-	return x;
-}
-
-#if 0
-/* Calculates the y position of the first line of text. */
-static double
-get_line_ypos_item_relative (EText *text)
-{
-	double y;
-
-	y = 0;
-
-	switch (text->anchor) {
-	case GTK_ANCHOR_NW:
-	case GTK_ANCHOR_N:
-	case GTK_ANCHOR_NE:
-		break;
-
-	case GTK_ANCHOR_W:
-	case GTK_ANCHOR_CENTER:
-	case GTK_ANCHOR_E:
-		y -= text->height / 2;
-		break;
-
-	case GTK_ANCHOR_SW:
-	case GTK_ANCHOR_S:
-	case GTK_ANCHOR_SE:
-		y -= text->height;
-		break;
-	}
-
-	return y;
-}
-#endif
-
-/* Calculates the x position of the specified line of text, based on the text's justification */
-static int
-get_line_xpos (EText *text, struct line *line)
-{
-	int x;
-
-	x = text->cx;
-
-	switch (text->justification) {
-	case GTK_JUSTIFY_RIGHT:
-		x += text->max_width - line->width;
-		break;
-
-	case GTK_JUSTIFY_CENTER:
-		x += (text->max_width - line->width) / 2;
-		break;
-
-	default:
-		if (text->draw_borders)
-			x += BORDER_INDENT;
-		/* For GTK_JUSTIFY_LEFT, we don't have to do anything.  We do not support
-		 * GTK_JUSTIFY_FILL, yet.
-		 */
-		break;
-	}
-
-
-	return x;
-}
-
-static void
-_get_tep(EText *text)
-{
-	if (!text->tep) {
-		text->tep = e_text_event_processor_emacs_like_new();
-		gtk_object_ref (GTK_OBJECT (text->tep));
-		gtk_object_sink (GTK_OBJECT (text->tep));
-		text->tep_command_id = 
-			gtk_signal_connect(GTK_OBJECT(text->tep),
-					   "command",
-					   GTK_SIGNAL_FUNC(e_text_command),
-					   (gpointer) text);
-	}
-}
-
-/* Draw handler for the text item */
-static void
-e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
-			int x, int y, int width, int height)
-{
-	EText *text;
-	GdkRectangle rect, *clip_rect;
-	struct line *lines;
-	int i;
-	int xpos, ypos;
-	int start_char, end_char;
-	int sel_start, sel_end;
-	GdkRectangle sel_rect;
-	GdkGC *fg_gc;
-	GnomeCanvas *canvas;
-	GtkWidget *widget;
-
-	text = E_TEXT (item);
-	canvas = GNOME_CANVAS_ITEM(text)->canvas;
-	widget = GTK_WIDGET(canvas);
-
-	fg_gc = widget->style->fg_gc[text->has_selection ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE];
-	
-	if (text->draw_borders || text->draw_background) {
-		gdouble thisx = item->x1 - x;
-		gdouble thisy = item->y1 - y;
-		gdouble thiswidth, thisheight;
-		GtkWidget *widget = GTK_WIDGET(item->canvas);
-
-		gtk_object_get(GTK_OBJECT(text),
-			       "width", &thiswidth,
-			       "height", &thisheight,
-			       NULL);
-		
-		if (text->draw_borders){
-
-			if (text->editing) {
-				thisx += 1;
-				thisy += 1;
-				thiswidth -= 2;
-				thisheight -= 2;
-			}
-
-			gtk_paint_shadow (widget->style, drawable,
-					  GTK_STATE_NORMAL, GTK_SHADOW_IN,
-					  NULL, widget, "entry",
-					  thisx, thisy, thiswidth, thisheight);
-		
-			if (text->editing) {
-				thisx -= 1;
-				thisy -= 1;
-				thiswidth += 2;
-				thisheight += 2;
-				/*
-				 * Chris: I am here "filling in" for the additions
-				 * and substractions done in the previous if (text->editing).
-				 * but you might have other plans for this.  Please enlighten
-				 * me as to whether it should be:
-				 * thiswidth + 2 or thiswidth + 1.
-				 */
-				gtk_paint_focus (widget->style, drawable, 
-						 NULL, widget, "entry",
-						 thisx, thisy, thiswidth - 1, thisheight - 1);
-			}
-		}
-
-		if (text->draw_background) {
-			gtk_paint_flat_box (widget->style, drawable,
-					    GTK_WIDGET_STATE(widget), GTK_SHADOW_NONE,
-					    NULL, widget, "entry_bg", 
-					    thisx + widget->style->klass->xthickness,
-					    thisy + widget->style->klass->ythickness, 
-					    thiswidth - widget->style->klass->xthickness * 2,
-					    thisheight - widget->style->klass->ythickness * 2);
-		}
-	}
-
-	if (!text->text || !text->font)
-		return;
-
-	lines = text->lines;
-	if ( !lines ) {
-		text->needs_split_into_lines = 1;
-		e_canvas_item_request_reflow (item);
-		return;
-	}
-
-	clip_rect = NULL;
-	if (text->clip) {
-		rect.x = text->clip_cx - x;
-		rect.y = text->clip_cy - y;
-		rect.width = text->clip_cwidth;
-		rect.height = text->clip_cheight;
-		
-		gdk_gc_set_clip_rectangle (text->gc, &rect);
-		gdk_gc_set_clip_rectangle (fg_gc, &rect);
-		clip_rect = &rect;
-	}
-	ypos = text->cy + e_font_ascent (text->font);
-	if (text->draw_borders)
-		ypos += BORDER_INDENT;
-
-	if (text->editing)
-		ypos -= text->yofs_edit;
-
-	if (text->stipple)
-		gnome_canvas_set_stipple_origin (item->canvas, text->gc);
-
-	for (i = 0; i < text->num_lines; i++) {
-
-		xpos = get_line_xpos (text, lines);
-		if (text->editing) {
-			xpos -= text->xofs_edit;
-			start_char = lines->text - text->text;
-			end_char = start_char + lines->length;
-			sel_start = text->selection_start;
-			sel_end = text->selection_end;
-			if (sel_start > sel_end ) {
-				sel_start ^= sel_end;
-				sel_end ^= sel_start;
-				sel_start ^= sel_end;
-			}
-			if ( sel_start < start_char )
-				sel_start = start_char;
-			if ( sel_end > end_char )
-				sel_end = end_char;
-			if ( sel_start < sel_end ) {
-				sel_rect.x = xpos - x + text_width_with_objects (text->model,
-										 text->font, text->style,
-										 lines->text,
-										 sel_start - start_char);
-				sel_rect.y = ypos - y - e_font_ascent (text->font);
-				sel_rect.width = text_width_with_objects (text->model,
-									  text->font, text->style,
-									  lines->text + sel_start - start_char,
-									  sel_end - sel_start);
-				sel_rect.height = e_font_height (text->font);
-				gtk_paint_flat_box(GTK_WIDGET(item->canvas)->style,
-						   drawable,
-						   text->has_selection ?
-						   GTK_STATE_SELECTED :
-						   GTK_STATE_ACTIVE,
-						   GTK_SHADOW_NONE,
-						   clip_rect,
-						   GTK_WIDGET(item->canvas),
-						   "text",
-						   sel_rect.x,
-						   sel_rect.y,
-						   sel_rect.width,
-						   sel_rect.height);
-				text_draw_with_objects (text->model,
-							drawable,
-							text->font, text->style,
-							text->gc,
-							xpos - x,
-							ypos - y,
-							lines->text,
-							sel_start - start_char);
-				text_draw_with_objects (text->model,
-							drawable,
-							text->font, text->style,
-							fg_gc,
-							xpos - x + text_width_with_objects (text->model,
-											    text->font, text->style,
-											    lines->text,
-											    sel_start - start_char),
-							ypos - y,
-							lines->text + sel_start - start_char,
-							sel_end - sel_start);
-				text_draw_with_objects (text->model,
-							drawable,
-							text->font, text->style,
-							text->gc,
-							xpos - x + text_width_with_objects (text->model,
-											    text->font, text->style,
-											    lines->text,
-											    sel_end - start_char),
-							ypos - y,
-							lines->text + sel_end - start_char,
-							end_char - sel_end);
-			} else {
-				text_draw_with_objects (text->model,
-							drawable,
-							text->font, text->style,
-							text->gc,
-							xpos - x,
-							ypos - y,
-							lines->text,
-							lines->length);
-			}
-			if (text->selection_start == text->selection_end &&
-			    text->selection_start >= start_char &&
-			    text->selection_start <= end_char &&
-			    text->show_cursor) {
-				gdk_draw_rectangle (drawable,
-						    text->gc,
-						    TRUE,
-						    xpos - x + text_width_with_objects (text->model,
-											text->font, text->style,
-											lines->text,
-											sel_start - start_char),
-						    ypos - y - e_font_ascent (text->font),
-						    1,
-						    e_font_height (text->font));
-			}
-		} else {
-			if (text->clip && text->use_ellipsis && lines->ellipsis_length < lines->length) {
-				text_draw_with_objects (text->model,
-							drawable,
-							text->font, text->style,
-							text->gc,
-							xpos - x,
-							ypos - y,
-							lines->text,
-							lines->ellipsis_length);
-				e_font_draw_utf8_text (drawable,
-						       text->font, text->style,
-						       text->gc,
-						       xpos - x + lines->width - text->ellipsis_width,
-						       ypos - y,
-						       text->ellipsis ? text->ellipsis : "...",
-						       text->ellipsis ? strlen (text->ellipsis) : 3);
-			} else {
-				text_draw_with_objects (text->model,
-							drawable,
-							text->font, text->style,
-							text->gc,
-							xpos - x,
-							ypos - y,
-							lines->text,
-							lines->length);
-			}
-		}
-
-		if (text->strikeout)
-			gdk_draw_rectangle (drawable,
-					    text->gc,
-					    TRUE,
-					    xpos - x,
-					    ypos - y - e_font_ascent (text->font) / 2,
-					    lines->width, 1);
-		ypos += e_font_height (text->font);
-		lines++;
-	}
-
-	if (text->clip) {
-		gdk_gc_set_clip_rectangle (text->gc, NULL);
-		gdk_gc_set_clip_rectangle (fg_gc, NULL);
-	}
-}
-
-/* Render handler for the text item */
-static void
-e_text_render (GnomeCanvasItem *item, GnomeCanvasBuf *buf)
-{
-#if 0
-	EText *text;
-	guint32 fg_color;
-	double xpos, ypos;
-	struct line *lines;
-	int i, j;
-	double affine[6];
-	int dx, dy;
-	ArtPoint start_i, start_c;
-
-	text = E_TEXT (item);
-
-	if (!text->text || !text->font || !text->suckfont)
-		return;
-
-	suckfont = text->suckfont;
-
-	fg_color = text->rgba;
-
-        gnome_canvas_buf_ensure_buf (buf);
-
-	lines = text->lines;
-	if ( !lines )
-		return;
-
-	start_i.y = get_line_ypos_item_relative (text);
-
-	art_affine_scale (affine, item->canvas->pixels_per_unit, item->canvas->pixels_per_unit);
-	for (i = 0; i < 6; i++)
-		affine[i] = text->affine[i];
-
-	for (i = 0; i < text->num_lines; i++) {
-		if (lines->length != 0) {
-			start_i.x = get_line_xpos_item_relative (text, lines);
-			art_affine_point (&start_c, &start_i, text->affine);
-			xpos = start_c.x;
-			ypos = start_c.y;
-
-			for (j = 0; j < lines->length; j++) {
-				ETextSuckChar *ch;
-
-				ch = &suckfont->chars[(unsigned char)((lines->text)[j])];
-
-				affine[4] = xpos;
-				affine[5] = ypos;
-				art_rgb_bitmap_affine (
-					buf->buf,
-					buf->rect.x0, buf->rect.y0, buf->rect.x1, buf->rect.y1,
-					buf->buf_rowstride,
-					suckfont->bitmap + (ch->bitmap_offset >> 3),
-					ch->width,
-					suckfont->bitmap_height,
-					suckfont->bitmap_width >> 3,
-					fg_color,
-					affine,
-					ART_FILTER_NEAREST, NULL);
-
-				dx = ch->left_sb + ch->width + ch->right_sb;
-				xpos += dx * affine[0];
-				ypos += dx * affine[1];
-			}
-		}
-
-		dy = text->font->ascent + text->font->descent;
-		start_i.y += dy;
-		lines++;
-	}
-
-	buf->is_bg = 0;
-#endif
-}
-
-/* Point handler for the text item */
-static double
-e_text_point (GnomeCanvasItem *item, double x, double y,
-			 int cx, int cy, GnomeCanvasItem **actual_item)
-{
-	EText *text;
-	int i;
-	struct line *lines;
-	int x1, y1, x2, y2;
-	int font_height;
-	int dx, dy;
-	double dist, best;
-
-	text = E_TEXT (item);
-
-	*actual_item = item;
-
-	/* The idea is to build bounding rectangles for each of the lines of
-	 * text (clipped by the clipping rectangle, if it is activated) and see
-	 * whether the point is inside any of these.  If it is, we are done.
-	 * Otherwise, calculate the distance to the nearest rectangle.
-	 */
-
-	if (text->font)
-		font_height = e_font_height (text->font);
-	else
-		font_height = 0;
-
-	best = 1.0e36;
-
-	lines = text->lines;
-
-	if ( !lines ) {
-		text->needs_split_into_lines = 1;
-		e_canvas_item_request_reflow (item);
-		return 1;
-	}
-
-	if (text->fill_clip_rectangle) {
-		double clip_width;
-		double clip_height;
-
-		if (text->clip_width < 0)
-			clip_width = text->max_width;
-		else
-			clip_width = text->clip_width;
-
-		/* Get canvas pixel coordinates for clip rectangle position */
-		clip_width = clip_width * item->canvas->pixels_per_unit;
-		if ( text->clip_height >= 0 )
-			clip_height = text->clip_height * item->canvas->pixels_per_unit;
-		else
-			clip_height = text->height * item->canvas->pixels_per_unit;
-
-		if (cx >= text->clip_cx &&
-		    cx <= text->clip_cx + clip_width &&
-		    cy >= text->clip_cy &&
-		    cy <= text->clip_cy + clip_height)
-			return 0;
-		else
-			return 1;
-	}
-
-	for (i = 0; i < text->num_lines; i++) {
-		/* Compute the coordinates of rectangle for the current line,
-		 * clipping if appropriate.
-		 */
-
-		x1 = get_line_xpos (text, lines);
-		y1 = text->cy + i * font_height;
-		x2 = x1 + lines->width;
-		y2 = y1 + font_height;
-
-		if (text->clip) {
-			if (x1 < text->clip_cx)
-				x1 = text->clip_cx;
-
-			if (y1 < text->clip_cy)
-				y1 = text->clip_cy;
-			
-			if ( text->clip_width >= 0 ) {
-				if (x2 > (text->clip_cx + text->clip_width))
-					x2 = text->clip_cx + text->clip_width;
-			}
-
-			if ( text->clip_height >= 0 ) {
-				if (y2 > (text->clip_cy + text->clip_height))
-					y2 = text->clip_cy + text->clip_height;
-			}
-
-			if ((x1 >= x2) || (y1 >= y2))
-				continue;
-		}
-
-		/* Calculate distance from point to rectangle */
-
-		if (cx < x1)
-			dx = x1 - cx;
-		else if (cx >= x2)
-			dx = cx - x2 + 1;
-		else
-			dx = 0;
-
-		if (cy < y1)
-			dy = y1 - cy;
-		else if (cy >= y2)
-			dy = cy - y2 + 1;
-		else
-			dy = 0;
-
-		if ((dx == 0) && (dy == 0))
-			return 0.0;
-
-		dist = sqrt (dx * dx + dy * dy);
-		if (dist < best)
-			best = dist;
-
-		/* Next! */
-
-		lines++;
-	}
-
-	return best / item->canvas->pixels_per_unit;
-}
-
-/* Bounds handler for the text item */
-static void
-e_text_bounds (GnomeCanvasItem *item, double *x1, double *y1, double *x2, double *y2)
-{
-	EText *text;
-	double width, height;
-
-	text = E_TEXT (item);
-
-	*x1 = 0;
-	*y1 = 0;
-
-	if (text->clip) {
-		width = text->clip_width;
-		if ( text->clip_height >= 0 )
-			height = text->clip_height;
-		else height = text->height;
-	} else {
-		width = text->max_width / item->canvas->pixels_per_unit;
-		height = text->height / item->canvas->pixels_per_unit;
-	}
-
-	switch (text->anchor) {
-	case GTK_ANCHOR_NW:
-	case GTK_ANCHOR_W:
-	case GTK_ANCHOR_SW:
-		break;
-
-	case GTK_ANCHOR_N:
-	case GTK_ANCHOR_CENTER:
-	case GTK_ANCHOR_S:
-		*x1 -= width / 2.0;
-		break;
-
-	case GTK_ANCHOR_NE:
-	case GTK_ANCHOR_E:
-	case GTK_ANCHOR_SE:
-		*x1 -= width;
-		break;
-	}
-
-	switch (text->anchor) {
-	case GTK_ANCHOR_NW:
-	case GTK_ANCHOR_N:
-	case GTK_ANCHOR_NE:
-		break;
-
-	case GTK_ANCHOR_W:
-	case GTK_ANCHOR_CENTER:
-	case GTK_ANCHOR_E:
-		*y1 -= height / 2.0;
-		break;
-
-	case GTK_ANCHOR_SW:
-	case GTK_ANCHOR_S:
-	case GTK_ANCHOR_SE:
-		*y1 -= height;
-		break;
-	}
-
-	*x2 = *x1 + width;
-	*y2 = *y1 + height;
-}
-
-static gboolean
-_get_xy_from_position (EText *text, gint position, gint *xp, gint *yp)
-{
-	if (text->lines && (xp || yp)) {
-		struct line *lines = NULL;
-		int x, y;
-		double xd, yd;
-		int j;
-		x = get_line_xpos_item_relative (text, lines);
-		y = text->yofs;
-		y -= text->yofs_edit;
-		for (j = 0, lines = text->lines; j < text->num_lines; lines++, j++) {
-			if (lines->text > text->text + position)
-				break;
-			y += e_font_height (text->font);
-		}
-		lines --;
-		y -= e_font_descent (text->font);
-		
-		x += text_width_with_objects (text->model,
-					      text->font, text->style,
-					      lines->text,
-					      position - (lines->text - text->text));
-		x -= text->xofs_edit;
-
-		xd = x;  yd = y;
-		gnome_canvas_item_i2w (GNOME_CANVAS_ITEM(text), &xd, &yd);
-		gnome_canvas_w2c (GNOME_CANVAS_ITEM(text)->canvas, xd, yd, &x, &y);
-
-		if (xp)
-			*xp = x;
-		if (yp)
-			*yp = y;
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-static gint
-_get_position_from_xy (EText *text, gint x, gint y)
-{
-	int i, j;
-	int ypos = text->yofs;
-	int xpos;
-	double xd, yd;
-	const char *p;
-	gunichar unival;
-	gint font_ht, adjust=0;
-	struct line *lines;
-
-	xd = x;  yd = y;
-	gnome_canvas_c2w (GNOME_CANVAS_ITEM(text)->canvas, xd, yd, &xd, &yd);
-	gnome_canvas_item_w2i (GNOME_CANVAS_ITEM(text), &xd, &yd);
-	x = xd;  y = yd;
-
-	y += text->yofs_edit;
-	font_ht = e_font_height (text->font);
-
-	if (text->draw_borders)
-		ypos += BORDER_INDENT;
-
-	switch (text->anchor) {
-	case GTK_ANCHOR_WEST:
-	case GTK_ANCHOR_CENTER:
-	case GTK_ANCHOR_EAST:
-		y += (text->num_lines * font_ht)/2;
-		break;
-	case GTK_ANCHOR_SOUTH:
-	case GTK_ANCHOR_SOUTH_EAST:
-	case GTK_ANCHOR_SOUTH_WEST:
-		y += text->num_lines * font_ht;
-	default:
-		/* Do nothing */
-		break;
-	}
-		
-
-	j = 0;
-	while (y > ypos) {
-		ypos += font_ht;
-		j ++;
-	}
-	j--;
-	if (j >= text->num_lines)
-		j = text->num_lines - 1;
-	if (j < 0)
-		j = 0;
-	i = 0;
-	lines = text->lines;
-	
-	if ( !lines )
-		return 0;
-
-	lines += j;
-	x += text->xofs_edit;
-	xpos = get_line_xpos_item_relative (text, lines);
-
-	for (i = 0, p = lines->text; p && i < lines->length; i++, p = e_unicode_get_utf8 (p, &unival)) {
-		int charwidth;
-		int step1, step2;
-
-#if 0
-		if (unival == '\1') {
-			const gchar *obj_str = NULL; /*e_text_model_get_nth_object (text->model, object_num);*/
-			charwidth = e_font_utf8_text_width (text->font, text->style, obj_str, strlen (obj_str));
-			++object_num;
-
-			step1 = charwidth;
-			step2 = 0;
-			adjust = -1;
-
-		} else {
-#endif
-			charwidth = e_font_utf8_char_width (text->font, text->style, (gchar *) p);
-			
-			step1 = charwidth / 2;
-			step2 = (charwidth + 1) / 2;
-			adjust = 0;
-#if 0
-		}
-#endif
-
-		xpos += step1;
-		if (xpos > x) {
-			break;
-		}
-		xpos += step2;
-	}
-
-	if (!p) return 0;
-	
-	return MAX (p - text->text + adjust, 0);
-}
-
-#define SCROLL_WAIT_TIME 30000
-
-static gboolean
-_blink_scroll_timeout (gpointer data)
-{
-	EText *text = E_TEXT(data);
-	gulong current_time;
-	gboolean scroll = FALSE;
-	gboolean redraw = FALSE;
-	
-	g_timer_elapsed(text->timer, &current_time);
-
-	if (text->scroll_start + SCROLL_WAIT_TIME > 1000000) {
-		if (current_time > text->scroll_start - (1000000 - SCROLL_WAIT_TIME) &&
-		    current_time < text->scroll_start)
-			scroll = TRUE;
-	} else {
-		if (current_time > text->scroll_start + SCROLL_WAIT_TIME ||
-		    current_time < text->scroll_start)
-			scroll = TRUE;
-	}
-	if (scroll && text->button_down) {
-		if (text->lastx - text->clip_cx > text->clip_cwidth &&
-		    text->xofs_edit < text->max_width - text->clip_cwidth) {
-			text->xofs_edit += 4;
-			if (text->xofs_edit > text->max_width - text->clip_cwidth + 1)
-				text->xofs_edit = text->max_width - text->clip_cwidth + 1;
-			redraw = TRUE;
-		}
-		if (text->lastx - text->clip_cx < 0 &&
-		    text->xofs_edit > 0) {
-			text->xofs_edit -= 4;
-			if (text->xofs_edit < 0)
-				text->xofs_edit = 0;
-			redraw = TRUE;
-		}
-
-		if (text->lasty - text->clip_cy > text->clip_cheight &&
-		    text->yofs_edit < text->height - text->clip_cheight) {
-			text->yofs_edit += 4;
-			if (text->yofs_edit > text->height - text->clip_cheight + 1)
-				text->yofs_edit = text->height - text->clip_cheight + 1;
-			redraw = TRUE;
-		}
-		if (text->lasty - text->clip_cy < 0 &&
-		    text->yofs_edit > 0) {
-			text->yofs_edit -= 4;
-			if (text->yofs_edit < 0)
-				text->yofs_edit = 0;
-			redraw = TRUE;
-		}
-
-		if (redraw) {
-			ETextEventProcessorEvent e_tep_event;
-			e_tep_event.type = GDK_MOTION_NOTIFY;
-			e_tep_event.motion.state = text->last_state;
-			e_tep_event.motion.time = 0;
-			e_tep_event.motion.position = _get_position_from_xy(text, text->lastx, text->lasty);
-			_get_tep(text);
-			e_text_event_processor_handle_event (text->tep,
-							     &e_tep_event);
-			text->scroll_start = current_time;
-		}
-	}
-
-	if (!((current_time / 500000) % 2)) {
-		if (!text->show_cursor)
-			redraw = TRUE;
-		text->show_cursor = TRUE;
-	} else {
-		if (text->show_cursor)
-			redraw = TRUE;
-		text->show_cursor = FALSE;
-	}
-	if (redraw) {
-		text->needs_redraw = 1;
-		gnome_canvas_item_request_update (GNOME_CANVAS_ITEM(text));
-	}
-	return TRUE;
-}
-
-static gboolean
-tooltip_event(GtkWidget *tooltip, GdkEvent *event, EText *text)
-{
-	gint ret_val = FALSE;
-	if (GTK_OBJECT_DESTROYED (text)) {
-		return FALSE;
-	}
-	switch (event->type) {
-	case GDK_LEAVE_NOTIFY:
-		e_canvas_hide_tooltip (E_CANVAS(GNOME_CANVAS_ITEM(text)->canvas));
-		break;
-	case GDK_BUTTON_PRESS:
-	case GDK_BUTTON_RELEASE:
-		if (event->type == GDK_BUTTON_RELEASE) {
-			e_canvas_hide_tooltip (E_CANVAS(GNOME_CANVAS_ITEM(text)->canvas));
-		}
-		/* Forward events to the text item */
-		gtk_signal_emit_by_name (GTK_OBJECT (text), "event", event,
-					 &ret_val);
-		if (!ret_val)
-			gtk_propagate_event (GTK_WIDGET(GNOME_CANVAS_ITEM(text)->canvas), event);
-		ret_val = TRUE;
-	default:
-		break;
-	}
-	return ret_val;
-}
-
-static void
-tooltip_destroy(GtkWidget *tooltip, EText *text)
-{
-	text->tooltip_owner = FALSE;
-	gtk_object_unref (GTK_OBJECT (text));
-}
-
-static gboolean
-_do_tooltip (gpointer data)
-{
-	EText *text = E_TEXT (data);
-	struct line *lines;
-	GtkWidget *canvas;
-	int i;
-	gdouble max_width;
-	gboolean cut_off;
-	double i2c[6];
-	ArtPoint origin = {0, 0};
-	ArtPoint pixel_origin;
-	int canvas_x, canvas_y;
-	GnomeCanvasItem *tooltip_text;
-	double tooltip_width;
-	double tooltip_height;
-	double tooltip_x;
-	double tooltip_y;
-#if 0
-	double x1, x2, y1, y2;
-#endif
-	GnomeCanvasItem *rect;
-	GtkWidget *tooltip_window;      /* GtkWindow for displaying the tooltip */
-
-	text->tooltip_count = 0;
-
-	lines = text->lines;
-
-	if (E_CANVAS(GNOME_CANVAS_ITEM(text)->canvas)->tooltip_window || text->editing || (!lines)) {
-		text->tooltip_timeout = 0;
-		return FALSE;
-	}
-
-	cut_off = FALSE;
-	for ( lines = text->lines, i = 0; i < text->num_lines; lines++, i++ ) {
-		if (lines->length > lines->ellipsis_length) {
-			cut_off = TRUE;
-			break;
-		}
-	}
-	if ( ! cut_off ) {
-		text->tooltip_timeout = 0;
-		return FALSE;
-	}
-
-	gnome_canvas_item_i2c_affine(GNOME_CANVAS_ITEM(text), i2c);
-	art_affine_point (&pixel_origin, &origin, i2c);
-
-	gdk_window_get_origin (GTK_WIDGET(GNOME_CANVAS_ITEM(text)->canvas)->window, &canvas_x, &canvas_y);
-	pixel_origin.x += canvas_x;
-	pixel_origin.y += canvas_y;
-	pixel_origin.x -= (int) gtk_layout_get_hadjustment(GTK_LAYOUT(GNOME_CANVAS_ITEM(text)->canvas))->value;
-	pixel_origin.y -= (int) gtk_layout_get_vadjustment(GTK_LAYOUT(GNOME_CANVAS_ITEM(text)->canvas))->value;
-
-	tooltip_window = gtk_window_new (GTK_WINDOW_POPUP);
-	gtk_container_set_border_width (GTK_CONTAINER (tooltip_window), 1);
-
-	canvas = e_canvas_new ();
-
-	gtk_container_add (GTK_CONTAINER (tooltip_window), canvas);
-	
-	/* Get the longest line length */
-	max_width = 0.0;
-	for (lines = text->lines, i = 0; i < text->num_lines; lines++, i++) {
-		gdouble line_width;
-
-		line_width = text_width_with_objects (text->model, text->font, text->style, lines->text, lines->length);
-		max_width = MAX (max_width, line_width);
-	}
-
-	rect = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (canvas)),
-				      gnome_canvas_rect_get_type (),
-				      "x1", (double) 0,
-				      "y1", (double) 0,
-				      "x2", (double) max_width + 4,
-				      "y2", (double) text->height + 4,
-				      "fill_color", "light gray",
-				      NULL);
-
-	tooltip_text = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (canvas)),
-					      e_text_get_type (),
-					      "anchor", GTK_ANCHOR_NW,
-					      "bold", text->bold,
-					      "strikeout", text->strikeout,
-					      "font_e", text->font,
-					      "text", text->text,
-					      "editable", FALSE,
-					      "clip_width", text->max_lines != 1 ? text->clip_width : max_width,
-					      "clip_height", text->max_lines != 1 ? -1 : (double)text->height,
-					      "clip", TRUE,
-					      "line_wrap", text->line_wrap,
-					      "justification", text->justification,
-					      NULL);
-
-
-
-	if (text->draw_borders)
-		e_canvas_item_move_absolute(tooltip_text, 1 + BORDER_INDENT, 1 + BORDER_INDENT);
-	else
-		e_canvas_item_move_absolute(tooltip_text, 1, 1);
-
-
-	split_into_lines (E_TEXT(tooltip_text));
-	calc_height (E_TEXT(tooltip_text));
-	calc_line_widths (E_TEXT(tooltip_text));
-	gnome_canvas_item_set (tooltip_text,
-			       "clip_height", (double) E_TEXT(tooltip_text)->height,
-			       "clip_width", (double) E_TEXT(tooltip_text)->max_width,
-			       NULL);
-	tooltip_width = E_TEXT(tooltip_text)->max_width;
-	tooltip_height = E_TEXT(tooltip_text)->height;
-	tooltip_x = 0;
-	tooltip_y = 0;
-	switch(E_TEXT(tooltip_text)->justification) {
-	case GTK_JUSTIFY_CENTER:
-		tooltip_x = - tooltip_width / 2;
-		break;
-	case GTK_JUSTIFY_RIGHT:
-		tooltip_x = tooltip_width / 2;
-		break;
-	case GTK_JUSTIFY_FILL:
-	case GTK_JUSTIFY_LEFT:
-		tooltip_x = 0;
-		break;
-	}
-	switch(text->anchor) {
-	case GTK_ANCHOR_NW:
-	case GTK_ANCHOR_N:
-	case GTK_ANCHOR_NE:
-		break;
-
-	case GTK_ANCHOR_W:
-	case GTK_ANCHOR_CENTER:
-	case GTK_ANCHOR_E:
-		tooltip_y -= tooltip_height / 2.0;
-		break;
-
-	case GTK_ANCHOR_SW:
-	case GTK_ANCHOR_S:
-	case GTK_ANCHOR_SE:
-		tooltip_y -= tooltip_height;
-		break;
-	}
-	switch(E_TEXT(tooltip_text)->anchor) {
-	case GTK_ANCHOR_NW:
-	case GTK_ANCHOR_W:
-	case GTK_ANCHOR_SW:
-		break;
-
-	case GTK_ANCHOR_N:
-	case GTK_ANCHOR_CENTER:
-	case GTK_ANCHOR_S:
-		tooltip_x -= tooltip_width / 2.0;
-		break;
-
-	case GTK_ANCHOR_NE:
-	case GTK_ANCHOR_E:
-	case GTK_ANCHOR_SE:
-		tooltip_x -= tooltip_width;
-		break;
-	}
-
-	gnome_canvas_item_set(rect,
-			      "x2", (double) tooltip_width + 4 + (text->draw_borders ? BORDER_INDENT * 2 : 0),
-			      "y2", (double) tooltip_height + 4 + (text->draw_borders ? BORDER_INDENT * 2 : 0),
-			      NULL);
-	
-	gtk_widget_set_usize (tooltip_window,
-			      tooltip_width + 4 + (text->draw_borders ? BORDER_INDENT * 2 : 0),
-			      tooltip_height + 4 + (text->draw_borders ? BORDER_INDENT * 2 : 0));
-	gnome_canvas_set_scroll_region (GNOME_CANVAS(canvas), 0.0, 0.0,
-					tooltip_width + (text->draw_borders ? BORDER_INDENT * 2 : 0), 
-					(double)tooltip_height + (text->draw_borders ? BORDER_INDENT * 2 : 0));
-	gtk_widget_show (canvas);
-	gtk_widget_realize (tooltip_window);
-	gtk_signal_connect (GTK_OBJECT(tooltip_window), "event",
-			    GTK_SIGNAL_FUNC(tooltip_event), text);
-	gtk_signal_connect (GTK_OBJECT(tooltip_window), "destroy",
-			    GTK_SIGNAL_FUNC(tooltip_destroy), text);
-	gtk_object_ref (GTK_OBJECT (text));
-
-	e_canvas_popup_tooltip (E_CANVAS(GNOME_CANVAS_ITEM(text)->canvas),
-				tooltip_window,
-				pixel_origin.x - 2 + tooltip_x,
-				pixel_origin.y - 2 + tooltip_y);
-	text->tooltip_owner = TRUE;
-	
-	text->tooltip_timeout = 0;
-	return FALSE;
-}
-
-static void
-start_editing (EText *text)
-{
-	if (text->editing)
-		return;
-
-	text->editing = TRUE;
-	if (text->pointer_in) {
-		if (text->default_cursor_shown && (!text->draw_borders)) {
-			gdk_window_set_cursor (GTK_WIDGET (GNOME_CANVAS_ITEM (text)->canvas)->window, text->i_cursor);
-			text->default_cursor_shown = FALSE;
-		}
-	}
-	text->select_by_word = FALSE;
-	text->xofs_edit = 0;
-	text->yofs_edit = 0;
-	if (text->timeout_id == 0)
-		text->timeout_id = g_timeout_add(10, _blink_scroll_timeout, text);
-	text->timer = g_timer_new();
-	g_timer_elapsed(text->timer, &(text->scroll_start));
-	g_timer_start(text->timer);
-}
-
-static void
-stop_editing (EText *text)
-{
-	if (!text->editing)
-		return;
-
-	text->editing = FALSE;
-	if ( (!text->default_cursor_shown) && (!text->draw_borders) ) {
-		gdk_window_set_cursor (GTK_WIDGET (GNOME_CANVAS_ITEM (text)->canvas)->window, text->default_cursor);
-		text->default_cursor_shown = TRUE;
-	}
-	if (text->timer) {
-		g_timer_stop(text->timer);
-		g_timer_destroy(text->timer);
-		text->timer = NULL;
-	}
-}
-
-static gboolean
-_click (gpointer data)
-{
-	*(gint *)data = 0;
-	return FALSE;
-}
-
-static gint
-e_text_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	EText *text = E_TEXT(item);
-	ETextEventProcessorEvent e_tep_event;
-
-	gint return_val = 0;
-
-	if (GTK_OBJECT_DESTROYED (item))
-		return FALSE;
-
-	e_tep_event.type = event->type;
-	switch (event->type) {
-	case GDK_FOCUS_CHANGE:
-		if (text->editable) {
-			GdkEventFocus *focus_event;
-			focus_event = (GdkEventFocus *) event;
-			if (focus_event->in) {
-				start_editing (text);
-			} else {
-				stop_editing (text);
-				if (text->timeout_id) {
-					g_source_remove(text->timeout_id);
-					text->timeout_id = 0;
-				}
-			}
-			if ( text->line_wrap )
-				text->needs_split_into_lines = 1;
-			else
-				text->needs_calc_line_widths = 1;
-			e_canvas_item_request_reflow (GNOME_CANVAS_ITEM(text));
-		}
-		return_val = 0;
-		break;
-	case GDK_KEY_PRESS: /* Fall Through */
-	case GDK_KEY_RELEASE:
-		if (text->editing) {
-			GdkEventKey key = event->key;
-			gint ret;
-
-			e_tep_event.key.time = key.time;
-			e_tep_event.key.state = key.state;
-			e_tep_event.key.keyval = key.keyval;
-			
-			// g_print ("etext got keyval \"%s\"\n", gdk_keyval_name (key.keyval));
-
-			/* This is probably ugly hack, but we have to handle UTF-8 input somehow */
-#if 0
-			e_tep_event.key.length = key.length;
-			e_tep_event.key.string = key.string;
-#else
-			e_tep_event.key.string = e_utf8_from_gtk_event_key (GTK_WIDGET (item->canvas), key.keyval, key.string);
-			if (e_tep_event.key.string != NULL) {
-				e_tep_event.key.length = strlen (e_tep_event.key.string);
-			} else {
-				e_tep_event.key.length = 0;
-			}
-#endif
-			_get_tep(text);
-			ret = e_text_event_processor_handle_event (text->tep, &e_tep_event);
-
-			if (event->type == GDK_KEY_PRESS)
-				gtk_signal_emit (GTK_OBJECT (text), e_text_signals[E_TEXT_KEYPRESS],
-						 e_tep_event.key.keyval, e_tep_event.key.state);
-			
-
-			if (e_tep_event.key.string)
-				g_free (e_tep_event.key.string);
-
-
-			return ret;
-		}
-		else
-			return 0;
-		break;
-	case GDK_BUTTON_PRESS: /* Fall Through */
-	case GDK_BUTTON_RELEASE:
-		if (text->tooltip_timeout) {
-			gtk_timeout_remove (text->tooltip_timeout);
-			text->tooltip_timeout = 0;
-		}
-		e_canvas_hide_tooltip (E_CANVAS(GNOME_CANVAS_ITEM(text)->canvas));
-#if 0
-		if ((!text->editing) 
-		    && text->editable 
-		    && event->type == GDK_BUTTON_RELEASE
-		    && event->button.button == 1) {
-			GdkEventButton button = event->button;
-
-			e_canvas_item_grab_focus (item, TRUE);
-
-			e_tep_event.type = GDK_BUTTON_RELEASE;
-			e_tep_event.button.time = button.time;
-			e_tep_event.button.state = button.state;
-			e_tep_event.button.button = button.button;
-			e_tep_event.button.position = _get_position_from_xy(text, button.x, button.y);
-			_get_tep(text);
-			return_val = e_text_event_processor_handle_event (text->tep,
-									  &e_tep_event);
-			e_tep_event.type = GDK_BUTTON_RELEASE;
-		}
-#else
-		if ((!text->editing) 
-		    && text->editable 
-		    && (event->button.button == 1 ||
-			event->button.button == 2)) {
-			e_canvas_item_grab_focus (item, TRUE);
-			start_editing (text);
-		}
-#endif
-
-		/* We follow convention and emit popup events on right-clicks. */
-		if (event->type == GDK_BUTTON_PRESS && event->button.button == 3) {
-			gtk_signal_emit (GTK_OBJECT (text),
-					 e_text_signals[E_TEXT_POPUP],
-					 &(event->button),
-					 _get_position_from_xy (text, event->button.x, event->button.y));
-
-			break;
-		}
-
-		/* Create our own double and triple click events, 
-		   as gnome-canvas doesn't forward them to us */
-		if (event->type == GDK_BUTTON_PRESS) {
-			if (text->dbl_timeout == 0 && 
-			    text->tpl_timeout == 0) {
-				text->dbl_timeout = gtk_timeout_add (200,
-								     _click,
-								     &(text->dbl_timeout));
-			} else {
-				if (text->tpl_timeout == 0) {
-					e_tep_event.type = GDK_2BUTTON_PRESS;
-					text->tpl_timeout = gtk_timeout_add (200, _click, &(text->tpl_timeout));
-				} else {
-					e_tep_event.type = GDK_3BUTTON_PRESS;
-				}				     
-			}
-		}
-		
-		if (text->editing) {
-			GdkEventButton button = event->button;
-			e_tep_event.button.time = button.time;
-			e_tep_event.button.state = button.state;
-			e_tep_event.button.button = button.button;
-			e_tep_event.button.position = _get_position_from_xy(text, button.x, button.y);
-			_get_tep(text);
-			return_val = e_text_event_processor_handle_event (text->tep,
-									  &e_tep_event);
-			if (event->button.button == 1) {
-				if (event->type == GDK_BUTTON_PRESS)
-					text->button_down = TRUE;
-				else
-					text->button_down = FALSE;
-			}
-			text->lastx = button.x;
-			text->lasty = button.y;
-			text->last_state = button.state;
-		}
-		break;
-	case GDK_MOTION_NOTIFY:
-		if (text->editing) {
-			GdkEventMotion motion = event->motion;
-			e_tep_event.motion.time = motion.time;
-			e_tep_event.motion.state = motion.state;
-			e_tep_event.motion.position = _get_position_from_xy(text, motion.x, motion.y);
-			_get_tep(text);
-			return_val = e_text_event_processor_handle_event (text->tep,
-								       &e_tep_event);
-			text->lastx = motion.x;
-			text->lasty = motion.y;
-			text->last_state = motion.state;
-		}
-		break;
-	case GDK_ENTER_NOTIFY:
-		{
-#if 0
-			GdkEventCrossing *crossing = (GdkEventCrossing *) event;
-			double x1, y1, x2, y2;
-			split_into_lines (text);
-			calc_height (text);
-			calc_line_widths (text);
-			get_bounds (text, &x1, &y1, &x2, &y2);
-			if (crossing->x >= x1 &&
-			    crossing->y >= y1 &&
-			    crossing->x <= x2 &&
-			    crossing->y <= y2) {
-#endif
-				if ( text->tooltip_count == 0 && text->clip) {
-					if (!text->tooltip_timeout)
-						text->tooltip_timeout = gtk_timeout_add (1000, _do_tooltip, text);
-				}
-				text->tooltip_count ++;
-#if 0
-			}
-#endif
-		}
-
-		text->pointer_in = TRUE;
-		if (text->editing || text->draw_borders) {
-			if ( text->default_cursor_shown ) {
-				gdk_window_set_cursor(GTK_WIDGET(item->canvas)->window, text->i_cursor);
-				text->default_cursor_shown = FALSE;
-			}
-		}
-		break;
-	case GDK_LEAVE_NOTIFY:
-		if (text->tooltip_count > 0)
-			text->tooltip_count --;
-		if ( text->tooltip_count == 0 && text->clip) {
-			if ( text->tooltip_timeout ) {
-				gtk_timeout_remove (text->tooltip_timeout);
-				text->tooltip_timeout = 0;
-			}
-		}
-		
-		text->pointer_in = FALSE;
-		if (text->editing || text->draw_borders) {
-			if ( ! text->default_cursor_shown ) {
-				gdk_window_set_cursor(GTK_WIDGET(item->canvas)->window, text->default_cursor);
-				text->default_cursor_shown = TRUE;
-			}
-		}
-		break;
-	default:
-		break;
-	}
-	if (return_val)
-		return return_val;
-	if (GNOME_CANVAS_ITEM_CLASS(parent_class)->event)
-		return GNOME_CANVAS_ITEM_CLASS(parent_class)->event(item, event);
-	else
-		return 0;
-}
-
-/* fixme: */
-
-static int
-_get_position(EText *text, ETextEventProcessorCommand *command)
-{
-	int length, obj_num;
-	int x, y;
-	gunichar unival;
-	char *p = NULL;
-	gint new_pos = 0;
-	
-	switch (command->position) {
-		
-	case E_TEP_VALUE:
-		new_pos = command->value;
-		break;
-
-	case E_TEP_SELECTION:
-		new_pos = text->selection_end;
-		break;
-
-	case E_TEP_START_OF_BUFFER:
-		new_pos = 0;
-		break;
-
-	case E_TEP_END_OF_BUFFER:
-		new_pos = strlen (text->text);
-		break;
-
-	case E_TEP_START_OF_LINE:
-
-		new_pos = 0;
-		
-		if (text->selection_end >= 1) {
-			
-			p = g_utf8_find_prev_char (text->text, text->text + text->selection_end);
-			if (p != text->text) {
-				p = g_utf8_find_prev_char (text->text, p);
-
-				while (p && p > text->text && !new_pos) {
-					if (*p == '\n')
-						new_pos = p - text->text + 1;
-					p = g_utf8_find_prev_char (text->text, p);
-				}
-			}
-		}
-
-		break;
-
-	case E_TEP_END_OF_LINE:
-		new_pos = -1;
-		length = strlen (text->text);
-		
-		if (text->selection_end >= length) {
-			new_pos = length;
-		} else {
-
-			p = g_utf8_next_char (text->text + text->selection_end);
-
-			while (p && *p && g_unichar_validate (g_utf8_get_char (p))) {
-				if (*p == '\n') {
-					new_pos = p - text->text;
-					p = NULL;
-				} else 
-					p = g_utf8_next_char (p);
-			}
-		}
-
-		if (new_pos == -1)
-			new_pos = p - text->text;
-
-		break;
-
-	case E_TEP_FORWARD_CHARACTER:
-		length = strlen (text->text);
-
-		if (text->selection_end >= length) {
-			new_pos = length;
-		} else {
-			p = g_utf8_next_char (text->text + text->selection_end);
-			new_pos = p - text->text;
-		}
-
-		break;
-
-	case E_TEP_BACKWARD_CHARACTER:
-		new_pos = 0;
-		if (text->selection_end >= 1) {
-			p = g_utf8_find_prev_char (text->text, text->text + text->selection_end);
-
-			if (p != NULL)
-				new_pos = p - text->text;
-		}
-
-		break;
-
-	case E_TEP_FORWARD_WORD:
-		new_pos = -1;
-		length = strlen (text->text);
-
-		if (text->selection_end >= length) {
-			new_pos = length;
-		} else {
-
-			p = g_utf8_next_char (text->text + text->selection_end);
-
-			while (p && *p && g_unichar_validate (g_utf8_get_char (p))) {
-				unival = g_utf8_get_char (p);
-				if (g_unichar_isspace (unival)) {
-					new_pos = p - text->text;
-					p = NULL;
-				} else 
-					p = g_utf8_next_char (p);
-			}
-		}
-			
-		if (new_pos == -1)
-			new_pos = p - text->text;
-
-		break;
-
-	case E_TEP_BACKWARD_WORD:
-		new_pos = 0;
-		if (text->selection_end >= 1) {
-			p = g_utf8_find_prev_char (text->text, text->text + text->selection_end);
-			if (p != text->text) {
-				p = g_utf8_find_prev_char (text->text, p);
-
-				while (p && p > text->text && g_unichar_validate (g_utf8_get_char (p))) {
-					unival = g_utf8_get_char (p);
-					if (g_unichar_isspace (unival)) {
-						new_pos = g_utf8_next_char (p) - text->text; 
-						p = NULL;
-					} else
-						p = g_utf8_find_prev_char (text->text, p);
-				}
-			}
-		}
-					
-		break;
-
-	case E_TEP_FORWARD_LINE:
-		if (_get_xy_from_position(text, text->selection_end, &x, &y)) {
-			y += e_font_height (text->font);
-			new_pos = _get_position_from_xy(text, x, y);
-		}
-		break;
-
-	case E_TEP_BACKWARD_LINE:
-		if (_get_xy_from_position(text, text->selection_end, &x, &y)) {
-			y -= e_font_height (text->font);
-			new_pos = _get_position_from_xy(text, x, y);
-		}
-		break;
-
-	case E_TEP_SELECT_WORD:
-
-		/* This is a silly hack to cause double-clicking on an object
-		   to activate that object.
-		   (Normally, double click == select word, which is why this is here.) */
-		
-		obj_num = e_text_model_get_object_at_offset (text->model, text->selection_start);
-		if (obj_num != -1) {
-			e_text_model_activate_nth_object (text->model, obj_num);
-			new_pos = text->selection_start;
-			break;
-		}
-
-
-		if (text->selection_end < 1) {
-			new_pos = 0;
-			break;
-		}
-
-		p = g_utf8_find_prev_char (text->text, text->text + text->selection_end);
-		if (p == text->text) {
-			new_pos = 0;
-			break;
-		}
-		p = g_utf8_find_prev_char (text->text, p);
-
-		while (p && p > text->text && g_unichar_validate (g_utf8_get_char (p))) {
-			unival = g_utf8_get_char (p);
-			if (g_unichar_isspace (unival)) {
-				p = g_utf8_next_char (p);
-				break;
-			}
-			p = g_utf8_find_prev_char (text->text, p);
-		}
-
-		if (!p)
-			text->selection_start = 0;
-		else
-			text->selection_start = p - text->text;
-
-
-		text->selection_start = e_text_model_validate_position (text->model, text->selection_start);
-		
-		length = strlen (text->text);
-		if (text->selection_end >= length) {
-			new_pos = length;
-			break;
-		}
-
-		p = g_utf8_next_char (text->text + text->selection_end);
-
-		while (p && *p && g_unichar_validate (g_utf8_get_char (p))) {
-			unival = g_utf8_get_char (p);
-			if (g_unichar_isspace (unival)) {
-				new_pos =  p - text->text;
-				p = NULL;
-			} else
-				p = g_utf8_next_char (p);
-		}
-
-		if (p)
-			new_pos = p - text->text;
-
-		return new_pos;
-
-	case E_TEP_SELECT_ALL:
-		text->selection_start = 0;
-		new_pos = strlen (text->text);
-		break;
-
-	case E_TEP_FORWARD_PARAGRAPH:
-	case E_TEP_BACKWARD_PARAGRAPH:
-		
-	case E_TEP_FORWARD_PAGE:
-	case E_TEP_BACKWARD_PAGE:
-		new_pos = text->selection_end;
-		break;
-
-	default:
-		new_pos = text->selection_end;
-		break;
-	}
-
-	new_pos = e_text_model_validate_position (text->model, new_pos);
-
-	return new_pos;
-}
-
-static void
-_delete_selection(EText *text)
-{
-	if ( text->selection_start < text->selection_end ) {
-		e_text_model_delete(text->model, text->selection_start, text->selection_end - text->selection_start);
-#if 0
-		text->selection_end = text->selection_start;
-#endif
-	} else {
-		e_text_model_delete(text->model, text->selection_end, text->selection_start - text->selection_end);
-#if 0
-		text->selection_start = text->selection_end;
-#endif
-	}
-}
-
-static void
-_insert(EText *text, char *string, int value)
-{
-	if (value > 0) {
-		e_text_model_insert_length(text->model, text->selection_start, string, value);
-		
-#if 0
-		text->selection_start += value;
-		text->selection_end = text->selection_start;
-#endif
-	}
-}
-
-static void
-e_text_command(ETextEventProcessor *tep, ETextEventProcessorCommand *command, gpointer data)
-{
-	EText *text = E_TEXT(data);
-	int sel_start, sel_end;
-	gboolean scroll = TRUE;
-
-	switch (command->action) {
-	case E_TEP_MOVE:
-		text->selection_start = _get_position(text, command);
-		text->selection_end = text->selection_start;
-		if (text->timer) {
-			g_timer_reset(text->timer);
-		}
-
-		break;
-	case E_TEP_SELECT:
-		text->selection_start = e_text_model_validate_position (text->model, text->selection_start); /* paranoia */
-		text->selection_end = _get_position(text, command);
-		
-		sel_start = MIN(text->selection_start, text->selection_end);
-		sel_end   = MAX(text->selection_start, text->selection_end);
-
-		sel_start = e_text_model_validate_position (text->model, sel_start);
-		
-		if (sel_start != sel_end) {
-			e_text_supply_selection (text, command->time, GDK_SELECTION_PRIMARY,
-						 (guchar *) text->text + sel_start, sel_end - sel_start);
-		} else if (text->timer) {
-			g_timer_reset(text->timer);
-		}
-
-		break;
-	case E_TEP_DELETE:
-		if (text->selection_end == text->selection_start) {
-			text->selection_end = _get_position(text, command);
-		}
-		_delete_selection(text);
-		if (text->timer) {
-			g_timer_reset(text->timer);
-		}
-		break;
-
-	case E_TEP_INSERT:
-		if (text->selection_end != text->selection_start) {
-			_delete_selection(text);
-		}
-		_insert(text, command->string, command->value);
-		if (text->timer) {
-			g_timer_reset(text->timer);
-		}
-		break;
-	case E_TEP_COPY:
-		sel_start = MIN(text->selection_start, text->selection_end);
-		sel_end = MAX(text->selection_start, text->selection_end);
-		if (sel_start != sel_end) {
-			e_text_supply_selection (text, command->time, clipboard_atom,
-						 (guchar *) text->text + sel_start, sel_end - sel_start);
-		}
-		if (text->timer) {
-			g_timer_reset(text->timer);
-		}
-		scroll = FALSE;
-		break;
-	case E_TEP_PASTE:
-		e_text_get_selection (text, clipboard_atom, command->time);
-		if (text->timer) {
-			g_timer_reset(text->timer);
-		}
-		break;
-	case E_TEP_GET_SELECTION:
-		e_text_get_selection (text, GDK_SELECTION_PRIMARY, command->time);
-		break;
-	case E_TEP_ACTIVATE:
-		gtk_signal_emit (GTK_OBJECT (text), e_text_signals[E_TEXT_ACTIVATE]);
-		if (text->timer) {
-			g_timer_reset(text->timer);
-		}
-		break;
-	case E_TEP_SET_SELECT_BY_WORD:
-		text->select_by_word = command->value;
-		break;
-	case E_TEP_GRAB:
-		gnome_canvas_item_grab (GNOME_CANVAS_ITEM(text), 
-					GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK,
-					text->i_cursor,
-					command->time);
-		scroll = FALSE;
-		break;
-	case E_TEP_UNGRAB:
-		gnome_canvas_item_ungrab (GNOME_CANVAS_ITEM(text), command->time);
-		scroll = FALSE;
-		break;
-	case E_TEP_NOP:
-		scroll = FALSE;
-		break;
-	}
-
-	if (scroll && !text->button_down) {
-		int x;
-		int i;
-		struct line *lines = text->lines;
-		gdouble clip_width;
-		if ( !lines )
-			return;
-
-		for (lines = text->lines, i = 0; i < text->num_lines ; i++, lines ++) {
-			if ((lines->text - text->text) > text->selection_end) {
-				break;
-			}
-		}
-		lines --;
-		i --;
-		x = text_width_with_objects (text->model,
-					     text->font, text->style,
-					     lines->text, 
-					     text->selection_end - (lines->text - text->text));
-		
-
-		if (x < text->xofs_edit) {
-			text->xofs_edit = x;
-		}
-
-		clip_width = text->clip_width;
-		if (clip_width >= 0 && text->draw_borders) {
-			clip_width -= 6;
-			if (clip_width < 0)
-				clip_width = 0;
-		}
-
-		if (2 + x - clip_width > text->xofs_edit) {
-			text->xofs_edit = 2 + x - clip_width;
-		}
-		
-		if (e_font_height (text->font) * i < text->yofs_edit)
-			text->yofs_edit = e_font_height (text->font) * i;
-		
-		if (e_font_height (text->font) * (i + 1) - (text->clip_height != -1 ? text->clip_height : text->height) > text->yofs_edit)
-			text->yofs_edit = e_font_height (text->font) * (i + 1) - (text->clip_height != -1 ? text->clip_height : text->height);
-	}
-
-	text->needs_redraw = 1;
-	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM(text));
-}
-
-static void 
-_invisible_destroy (GtkInvisible *invisible,
-				EText *text)
-{
-	text->invisible = NULL;
-}
-
-static GtkWidget *
-e_text_get_invisible(EText *text)
-{	
-	GtkWidget *invisible;
-	if (text->invisible) {
-		invisible = text->invisible;
-	} else {
-		invisible = gtk_invisible_new();
-		text->invisible = invisible;
-		
-		gtk_selection_add_target (invisible,
-					  GDK_SELECTION_PRIMARY,
-					  GDK_SELECTION_TYPE_STRING,
-					  E_SELECTION_PRIMARY);
-		gtk_selection_add_target (invisible,
-					  clipboard_atom,
-					  GDK_SELECTION_TYPE_STRING,
-					  E_SELECTION_CLIPBOARD);
-		
-		gtk_signal_connect (GTK_OBJECT(invisible), "selection_get",
-				    GTK_SIGNAL_FUNC (_selection_get), 
-				    text);
-		gtk_signal_connect (GTK_OBJECT(invisible), "selection_clear_event",
-				    GTK_SIGNAL_FUNC (_selection_clear_event),
-				    text);
-		gtk_signal_connect (GTK_OBJECT(invisible), "selection_received",
-				    GTK_SIGNAL_FUNC (_selection_received),
-				    text);
-		
-		gtk_signal_connect (GTK_OBJECT(invisible), "destroy",
-				    GTK_SIGNAL_FUNC (_invisible_destroy),
-				    text);
-	}
-	return invisible;
-}
-
-static void
-_selection_clear_event (GtkInvisible *invisible,
-			GdkEventSelection *event,
-			EText *text)
-{
-	if (event->selection == GDK_SELECTION_PRIMARY) {
-		g_free (text->primary_selection);
-		text->primary_selection = NULL;
-		text->primary_length = 0;
-
-		text->has_selection = FALSE;
-		text->needs_redraw = 1;
-		gnome_canvas_item_request_update (GNOME_CANVAS_ITEM(text));
-
-	} else if (event->selection == clipboard_atom) {
-		g_free (text->clipboard_selection);
-		text->clipboard_selection = NULL;
-		text->clipboard_length = 0;
-	}
-}
-
-static void
-_selection_get (GtkInvisible *invisible,
-		GtkSelectionData *selection_data,
-		guint info,
-		guint time_stamp,
-		EText *text)
-{
-	switch (info) {
-	case E_SELECTION_PRIMARY:
-		gtk_selection_data_set (selection_data, GDK_SELECTION_TYPE_STRING,
-					8, text->primary_selection, text->primary_length);
-		break;
-	case E_SELECTION_CLIPBOARD:
-		gtk_selection_data_set (selection_data, GDK_SELECTION_TYPE_STRING,
-					8, text->clipboard_selection, text->clipboard_length);
-		break;
-	}
-}
-
-static void
-_selection_received (GtkInvisible *invisible,
-		     GtkSelectionData *selection_data,
-		     guint time,
-		     EText *text)
-{
-	if (selection_data->length < 0 || selection_data->type != GDK_SELECTION_TYPE_STRING) {
-		return;
-	} else {
-		ETextEventProcessorCommand command;
-		command.action = E_TEP_INSERT;
-		command.position = E_TEP_SELECTION;
-		command.string = selection_data->data;
-		command.value = selection_data->length;
-		command.time = time;
-		e_text_command(text->tep, &command, text);
-	}
-}
-
-static void 
-e_text_supply_selection (EText *text, guint time, GdkAtom selection, guchar *data, gint length)
-{
-	gboolean successful;
-	GtkWidget *invisible;
-
-	invisible = e_text_get_invisible(text);
-
-	if (selection == GDK_SELECTION_PRIMARY ) {
-		if (text->primary_selection) {
-			g_free (text->primary_selection);
-		}
-		text->primary_selection = g_strndup(data, length);
-		text->primary_length = length;
-	} else if (selection == clipboard_atom) {
-		if (text->clipboard_selection) {
-			g_free (text->clipboard_selection);
-		}
-		text->clipboard_selection = g_strndup(data, length);
-		text->clipboard_length = length;
-	}
-
-	successful = gtk_selection_owner_set (invisible,
-					      selection,
-					      time);
-	
-	if (selection == GDK_SELECTION_PRIMARY)
-		text->has_selection = successful;
-}
-
-static void
-e_text_get_selection(EText *text, GdkAtom selection, guint32 time)
-{
-	GtkWidget *invisible;
-	invisible = e_text_get_invisible(text);
-	gtk_selection_convert(invisible,
-			      selection,
-			      GDK_SELECTION_TYPE_STRING,
-			      time);
-}
-
-#if 0
-static void
-e_text_real_copy_clipboard (EText *text)
-{
-  guint32 time;
-  gint selection_start_pos; 
-  gint selection_end_pos;
-
-  g_return_if_fail (text != NULL);
-  g_return_if_fail (E_IS_TEXT (text));
-  
-  time = gtk_text_get_event_time (text);
-  selection_start_pos = MIN (text->selection_start, text->selection_end);
-  selection_end_pos = MAX (text->selection_start, text->selection_end);
- 
-  if (selection_start_pos != selection_end_pos)
-    {
-      if (gtk_selection_owner_set (GTK_WIDGET (text->canvas),
-				   clipboard_atom,
-				   time))
-	      text->clipboard_text = "";
-    }
-}
-
-static void
-e_text_real_paste_clipboard (EText *text)
-{
-  guint32 time;
-
-  g_return_if_fail (text != NULL);
-  g_return_if_fail (E_IS_TEXT (text));
-  
-  time = e_text_get_event_time (text);
-  if (text->editable)
-	  gtk_selection_convert (GTK_WIDGET(text->widget),
-				 clipboard_atom,
-				 gdk_atom_intern ("COMPOUND_TEXT", FALSE), time);
-}
-#endif
-
-
-#if 0
-/* Routines for sucking fonts from the X server */
-
-static ETextSuckFont *
-e_suck_font (GdkFont *font)
-{
-	ETextSuckFont *suckfont;
-	int i;
-	int x, y;
-	char text[1];
-	int lbearing, rbearing, ch_width, ascent, descent;
-	GdkPixmap *pixmap;
-	GdkColor black, white;
-	GdkImage *image;
-	GdkGC *gc;
-	guchar *line;
-	int width, height;
-	int black_pixel, pixel;
-
-	if (!font)
-		return NULL;
-
-	suckfont = g_new (ETextSuckFont, 1);
-
-	height = font->ascent + font->descent;
-	x = 0;
-	for (i = 0; i < 256; i++) {
-		text[0] = i;
-		gdk_text_extents (font, text, 1,
-				  &lbearing, &rbearing, &ch_width, &ascent, &descent);
-		suckfont->chars[i].left_sb = lbearing;
-		suckfont->chars[i].right_sb = ch_width - rbearing;
-		suckfont->chars[i].width = rbearing - lbearing;
-		suckfont->chars[i].ascent = ascent;
-		suckfont->chars[i].descent = descent;
-		suckfont->chars[i].bitmap_offset = x;
-		x += (ch_width + 31) & -32;
-	}
-
-	width = x;
-
-	suckfont->bitmap_width = width;
-	suckfont->bitmap_height = height;
-	suckfont->ascent = font->ascent;
-
-	pixmap = gdk_pixmap_new (NULL, suckfont->bitmap_width,
-				 suckfont->bitmap_height, 1);
-	gc = gdk_gc_new (pixmap);
-	gdk_gc_set_font (gc, font);
-
-	black_pixel = BlackPixel (gdk_display, DefaultScreen (gdk_display));
-	black.pixel = black_pixel;
-	white.pixel = WhitePixel (gdk_display, DefaultScreen (gdk_display));
-	gdk_gc_set_foreground (gc, &white);
-	gdk_draw_rectangle (pixmap, gc, 1, 0, 0, width, height);
-
-	gdk_gc_set_foreground (gc, &black);
-	for (i = 0; i < 256; i++) {
-		text[0] = i;
-		gdk_draw_text (pixmap, font, gc,
-			       suckfont->chars[i].bitmap_offset - suckfont->chars[i].left_sb,
-			       font->ascent,
-			       text, 1);
-	}
-
-	/* The handling of the image leaves me with distinct unease.  But this
-	 * is more or less copied out of gimp/app/text_tool.c, so it _ought_ to
-	 * work. -RLL
-	 */
-
-	image = gdk_image_get (pixmap, 0, 0, width, height);
-	suckfont->bitmap = g_malloc0 ((width >> 3) * height);
-
-	line = suckfont->bitmap;
-	for (y = 0; y < height; y++) {
-		for (x = 0; x < width; x++) {
-			pixel = gdk_image_get_pixel (image, x, y);
-			if (pixel == black_pixel)
-				line[x >> 3] |= 128 >> (x & 7);
-		}
-		line += width >> 3;
-	}
-
-	gdk_image_destroy (image);
-
-	/* free the pixmap */
-	gdk_pixmap_unref (pixmap);
-
-	/* free the gc */
-	gdk_gc_destroy (gc);
-
-	return suckfont;
-}
-
-static void
-e_suck_font_free (ETextSuckFont *suckfont)
-{
-	g_free (suckfont->bitmap);
-	g_free (suckfont);
-}
-#endif
diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h
deleted file mode 100644
index b3126bf291..0000000000
--- a/widgets/text/e-text.h
+++ /dev/null
@@ -1,242 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* EText - Text item for evolution.
- * Copyright (C) 2000, 2001 Ximian Inc.
- *
- * Author: Chris Lahey <clahey@ximian.com>
- * Further hacking by Jon Trowbridge <trow@ximian.com>
- *
- * A majority of code taken from:
- *
- * Text item type for GnomeCanvas widget
- *
- * GnomeCanvas is basically a port of the Tk toolkit's most excellent
- * canvas widget.  Tk is copyrighted by the Regents of the University
- * of California, Sun Microsystems, and other parties.
- *
- * Copyright (C) 1998 The Free Software Foundation
- *
- * Author: Federico Mena <federico@nuclecu.unam.mx> */
-
-#ifndef E_TEXT_H
-#define E_TEXT_H
-
-#include <gtk/gtkobject.h>
-#include <gtk/gtkpacker.h>
-
-#include <gal/widgets/e-font.h>
-#include <gal/util/e-text-event-processor.h>
-#include <gal/e-text/e-text-model.h>
-#include <gal/widgets/e-canvas.h>
-
-BEGIN_GNOME_DECLS
-
-
-/* Text item for the canvas.  Text items are positioned by an anchor point and an anchor direction.
- *
- * A clipping rectangle may be specified for the text.  The rectangle is anchored at the text's anchor
- * point, and is specified by clipping width and height parameters.  If the clipping rectangle is
- * enabled, it will clip the text.
- *
- * In addition, x and y offset values may be specified.  These specify an offset from the anchor
- * position.  If used in conjunction with the clipping rectangle, these could be used to implement
- * simple scrolling of the text within the clipping rectangle.
- *
- * The following object arguments are available:
- *
- * name			type			read/write	description
- * ------------------------------------------------------------------------------------------
- * text			string			RW		The string of the text label
- * font			string			W		X logical font descriptor
- * fontset		string			W		X logical fontset descriptor
- * font_gdk		GdkFont*		RW		Pointer to a GdkFont
- * bold                 boolean                 RW              Bold?
- * anchor		GtkAnchorType		RW		Anchor side for the text
- * justification	GtkJustification	RW		Justification for multiline text
- * fill_color		string			W		X color specification for text
- * fill_color_gdk	GdkColor*		RW		Pointer to an allocated GdkColor
- * fill_stipple		GdkBitmap*		RW		Stipple pattern for filling the text
- * clip_width		double			RW		Width of clip rectangle
- * clip_height		double			RW		Height of clip rectangle
- * clip			boolean			RW		Use clipping rectangle?
- * fill_clip_rect       boolean                 RW              Whether the text item represents itself as being the size of the clipping rectangle.
- * x_offset		double			RW		Horizontal offset distance from anchor position
- * y_offset		double			RW		Vertical offset distance from anchor position
- * text_width		double			R		Used to query the width of the rendered text
- * text_height		double			R		Used to query the rendered height of the text
- * width                double                  RW              A synonym for clip_width
- * height               double                  R               A synonym for text_height
- *
- * These are currently ignored in the AA version:
- * editable             boolean                 RW              Can this item be edited
- * use_ellipsis         boolean                 RW              Whether to use ellipsises if text gets cut off.  Meaningless if clip == false.
- * ellipsis             string                  RW              The characters to use as ellipsis.  NULL = "...".
- * line_wrap            boolean                 RW              Line wrap when not editing.
- * break_characters     string                  RW              List of characters to optionally break on.
- * max_lines            int                     RW              Number of lines possible when doing line wrap.
- * draw_borders         boolean                 RW              Whether to draw borders.
- * draw_background      boolean                 RW              Whether to draw the background.
- */
-
-#define E_TYPE_TEXT            (e_text_get_type ())
-#define E_TEXT(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_TEXT, EText))
-#define E_TEXT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_TEXT, ETextClass))
-#define E_IS_TEXT(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_TEXT))
-#define E_IS_TEXT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_TEXT))
-
-
-typedef struct _EText EText;
-typedef struct _ETextClass ETextClass;
-
-#if 0
-typedef struct _ETextSuckFont ETextSuckFont;
-typedef struct _ETextSuckChar ETextSuckChar;
-
-struct _ETextSuckChar {
-	int     left_sb;
-	int     right_sb;
-	int     width;
-	int     ascent;
-	int     descent;
-	int     bitmap_offset; /* in pixels */
-};
-
-struct _ETextSuckFont {
-	guchar *bitmap;
-	gint    bitmap_width;
-	gint    bitmap_height;
-	gint    ascent;
-	ETextSuckChar chars[256];
-};
-#endif
-
-struct _EText {
-	GnomeCanvasItem item;
-	
-	ETextModel *model;
-	gint model_changed_signal_id;
-	gint model_repos_signal_id;
-
-	const gchar *text;              /* Text to display --- from the ETextModel */
-	gpointer lines;			/* Text split into lines (private field) */
-	int num_lines;			/* Number of lines of text */
-
-#if 0
-	GdkFont *font;			/* Font for text */
-#else
-	EFont *font;
-#endif
-	GtkAnchorType anchor;		/* Anchor side for text */
-	GtkJustification justification;	/* Justification for text */
-
-	double clip_width;		/* Width of optional clip rectangle */
-	double clip_height;		/* Height of optional clip rectangle */
-
-	double xofs, yofs;		/* Text offset distance from anchor position */
-
-	GdkColor color; 		/* Fill color */
-	GdkBitmap *stipple;		/* Stipple for text */
-	GdkGC *gc;			/* GC for drawing text */
-
-	int cx, cy;			/* Top-left canvas coordinates for text */
-	int clip_cx, clip_cy;		/* Top-left canvas coordinates for clip rectangle */
-	int clip_cwidth, clip_cheight;	/* Size of clip rectangle in pixels */
-	int max_width;			/* Maximum width of text lines */
-	int width;                      /* Rendered text width in pixels */
-	int height;			/* Rendered text height in pixels */
-
-	/* Antialiased specific stuff follows */
-#if 0
-	ETextSuckFont *suckfont; /* Sucked font */
-#endif
-	guint32 rgba;			/* RGBA color for text */
-	double affine[6];               /* The item -> canvas affine */
-
-	char *ellipsis;                 /* The ellipsis characters.  NULL = "...". */
-	double ellipsis_width;          /* The width of the ellipsis. */
-	gboolean use_ellipsis;          /* Whether to use the ellipsis. */
-
-	gboolean editable;              /* Item is editable */
-	gboolean editing;               /* Item is currently being edited */
-
-	int xofs_edit;                  /* Offset because of editing */
-	int yofs_edit;                  /* Offset because of editing */
-
-	/* This needs to be reworked a bit once we get line wrapping. */
-	int selection_start;            /* Start of selection IN BYTES */
-	int selection_end;              /* End of selection IN BYTES */
-	gboolean select_by_word;        /* Current selection is by word */
-
-	/* This section is for drag scrolling and blinking cursor. */
-	gint timeout_id;                /* Current timeout id for scrolling */
-	GTimer *timer;                  /* Timer for blinking cursor and scrolling */
-
-	gint lastx, lasty;              /* Last x and y motion events */
-	gint last_state;                /* Last state */
-	gulong scroll_start;            /* Starting time for scroll (microseconds) */
-
-	gint show_cursor;               /* Is cursor currently shown */
-	gboolean button_down;           /* Is mouse button 1 down */
-
-	ETextEventProcessor *tep;       /* Text Event Processor */
-	gint tep_command_id;
-
-	GtkWidget *invisible;           /* For selection handling */
-	gboolean has_selection;         /* TRUE if we have the selection */
-	gchar *primary_selection;       /* Primary selection text */
-	gint primary_length;            /* Primary selection text length */
-	gchar *clipboard_selection;     /* Clipboard selection text */
-	gint clipboard_length;          /* Clipboard selection text length*/
-
-	guint clip : 1;			/* Use clip rectangle? */
-	guint fill_clip_rectangle : 1;  /* Fill the clipping rectangle. */
-
-	guint pointer_in : 1;           /* Is the pointer currently over us? */
-	guint default_cursor_shown : 1; /* Is the default cursor currently shown? */
-	guint draw_borders : 1;         /* Draw borders? */
-	guint draw_background : 1;      /* Draw background? */
-
-	guint line_wrap : 1;            /* Do line wrap */
-
-	guint needs_redraw : 1;         /* Needs redraw */
-	guint needs_recalc_bounds : 1;  /* Need recalc_bounds */
-	guint needs_calc_height : 1;    /* Need calc_height */
-	guint needs_calc_line_widths : 1; /* Needs calc_line_widths */
-	guint needs_split_into_lines : 1; /* Needs split_into_lines */
-
-	guint bold : 1;
-	guint strikeout : 1;
-
-	guint tooltip_owner : 1;
-
-	EFontStyle     style;
-
-	gchar *break_characters;        /* Characters to optionally break after */
-
-	gint max_lines;                 /* Max number of lines (-1 = infinite) */
-
-	GdkCursor *default_cursor;      /* Default cursor (arrow) */
-	GdkCursor *i_cursor;            /* I beam cursor */
-
-	gint tooltip_timeout;           /* Timeout for the tooltip */
-	gint tooltip_count;             /* GDK_ENTER_NOTIFY count. */
-
-	gint dbl_timeout;               /* Double click timeout */
-	gint tpl_timeout;               /* Triple click timeout */
-};
-
-struct _ETextClass {
-	GnomeCanvasItemClass parent_class;
-
-	void (* changed)   (EText *text);
-	void (* activate)  (EText *text);
-	void (* keypress)  (EText *text, guint keyval, guint state);
-	void (* popup)     (EText *text, GdkEventButton *ev, gint pos);
-};
-
-
-/* Standard Gtk function */
-GtkType e_text_get_type (void);
-
-END_GNOME_DECLS
-
-#endif