text/e.entry.[ch] text/e-completion.[ch] text/e-text-model-uri.[ch]

2007-10-26  Kjartan Maraas  <kmaraas@gnome.org>

	* e-timezone-dialog/e-timezone-dialog.c: (get_local_offset),
	(get_local_timezone), (on_map_visibility_changed),
	(on_map_button_pressed), (get_zone_from_point),
	(e_timezone_dialog_set_timezone), (on_combo_changed):
	* menus/gal-view-factory.c: (gal_view_factory_get_title):
	* text/Makefile.am:
	* text/e-text.c: (e_text_event), (popup_targets_received),
	(next_word), (find_offset_into_line), (_get_position),
	(e_text_class_init):
	* text/e.entry.[ch]
	* text/e-completion.[ch]
	* text/e-text-model-uri.[ch]
	* text/e-completion-view.[ch]
	* text/e-completion-callbacks.[ch]
	* text/e-completion-match.[ch]
	* text/e-table-text-model.[ch]: Remove all of these. They
	are now unused.

	Warning fixes:
	- NULL vs 0 vs FALSE
	- ANSIfication of function declarations

svn path=/trunk/; revision=34468

17 files changed, 3 insertions, 3989 deletions

diff --git a/widgets/text/Makefile.am b/widgets/text/Makefile.am
index c348e039c6..df2b02c781 100644
--- a/widgets/text/Makefile.am
+++ b/widgets/text/Makefile.am
@@ -12,29 +12,15 @@ INCLUDES =					\
 privsolib_LTLIBRARIES = libetext.la
 
 libetext_la_SOURCES =				\
-	e-entry.c				\
-	e-completion-match.c			\
-	e-completion.c				\
-	e-completion-callbacks.c		\
-	e-completion-view.c			\
-	e-table-text-model.c			\
 	e-text-model-repos.c			\
 	e-text-model.c				\
-	e-text-model-uri.c                      \
 	e-text.c
 
 libetextincludedir = $(privincludedir)/text
 
 libetextinclude_HEADERS = 			\
-	e-entry.h				\
-	e-completion-match.h			\
-	e-completion.h				\
-	e-completion-callbacks.h		\
-	e-completion-view.h			\
-	e-table-text-model.h			\
 	e-text-model-repos.h			\
 	e-text-model.h				\
-	e-text-model-uri.h			\
 	e-text.h
 
 libetext_la_LDFLAGS = $(NO_UNDEFINED)
diff --git a/widgets/text/e-completion-callbacks.c b/widgets/text/e-completion-callbacks.c
deleted file mode 100644
index 938bf42e57..0000000000
--- a/widgets/text/e-completion-callbacks.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-completion-callbacks.c - A callback based ECompletion.
- * Copyright 2003
- *
- * Authors:
- *   Chris Toshok <toshok@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#include <config.h>
-
-#include <string.h>
-#include <stdio.h>
-
-#include <gtk/gtk.h>
-
-#include "e-util/e-util.h"
-
-#include "e-completion-callbacks.h"
-
-static void e_completion_callbacks_class_init (ECompletionCallbacksClass *klass);
-static void e_completion_callbacks_init       (ECompletionCallbacks *complete);
-
-static void     callbacks_request_completion    (ECompletion *comp, const gchar *search_text, gint pos, gint limit);
-static void     callbacks_end_completion        (ECompletion *comp);
-
-G_DEFINE_TYPE (ECompletionCallbacks, e_completion_callbacks, E_COMPLETION_TYPE)
-
-static void
-e_completion_callbacks_class_init (ECompletionCallbacksClass *klass)
-{
-	ECompletionClass *comp_class = (ECompletionClass *) klass;
-
-	comp_class->request_completion = callbacks_request_completion;
-	comp_class->end_completion = callbacks_end_completion;
-}
-
-static void
-e_completion_callbacks_init (ECompletionCallbacks *complete)
-{
-}
-
-static void
-callbacks_request_completion (ECompletion *comp, const gchar *search_text, gint pos, gint limit)
-{
-  ECompletionCallbacks *cc = E_COMPLETION_CALLBACKS (comp);
-
-  cc->request_completion (cc, search_text, pos, limit, cc->data);
-}
-
-static void
-callbacks_end_completion (ECompletion *comp)
-{
-  ECompletionCallbacks *cc = E_COMPLETION_CALLBACKS (comp);
-
-  cc->end_completion (cc, cc->data);
-}
-
-ECompletionCallbacks*
-e_completion_callbacks_new (ECompletionCallbacksRequestCompletionFn request_completion,
-			    ECompletionCallbacksEndCompletionFn end_completion,
-			    gpointer data)
-{
-  ECompletionCallbacks *cc;
-
-  g_return_val_if_fail (request_completion != NULL, NULL);
-  g_return_val_if_fail (end_completion != NULL, NULL);
-
-  cc = g_object_new (E_COMPLETION_CALLBACKS_TYPE, NULL);
-
-  cc->request_completion = request_completion;
-  cc->end_completion = end_completion;
-  cc->data = data;
-
-  return cc;
-}
diff --git a/widgets/text/e-completion-callbacks.h b/widgets/text/e-completion-callbacks.h
deleted file mode 100644
index 88b59b04c7..0000000000
--- a/widgets/text/e-completion-callbacks.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-completion-callback.h - A callback based completion object.
- * Copyright 2003, Ximian, Inc.
- *
- * Authors:
- *   Chris Toshok <toshok@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#ifndef E_COMPLETION_CALLBACKS_H
-#define E_COMPLETION_CALLBACKS_H
-
-#include <gtk/gtkobject.h>
-#include "e-completion.h"
-
-G_BEGIN_DECLS
-
-#define E_COMPLETION_CALLBACKS_TYPE        (e_completion_callbacks_get_type ())
-#define E_COMPLETION_CALLBACKS(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_COMPLETION_CALLBACKS_TYPE, ECompletionCallbacks))
-#define E_COMPLETION_CALLBACKS_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST ((k), E_COMPLETION_CALLBACKS_TYPE, ECompletionCallbacksClass))
-#define E_IS_COMPLETION_CALLBACKS(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_COMPLETION_CALLBACKS_TYPE))
-#define E_IS_COMPLETION_CALLBACKS_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_COMPLETION_CALLBACKS_TYPE))
-
-typedef struct _ECompletionCallbacks ECompletionCallbacks;
-typedef struct _ECompletionCallbacksClass ECompletionCallbacksClass;
-struct _ECompletionCallbacksPrivate;
-
-typedef void (*ECompletionCallbacksRequestCompletionFn) (ECompletionCallbacks *comp, const gchar *search_text, gint pos, gint limit, gpointer data);
-typedef void (*ECompletionCallbacksEndCompletionFn) (ECompletionCallbacks *comp, gpointer data);
-
-struct _ECompletionCallbacks {
-	ECompletion parent;
-
-	ECompletionCallbacksRequestCompletionFn request_completion;
-	ECompletionCallbacksEndCompletionFn end_completion;
-
-	gpointer data;
-};
-
-struct _ECompletionCallbacksClass {
-	ECompletionClass parent_class;
-};
-
-GtkType      e_completion_callbacks_get_type (void);
-
-ECompletionCallbacks* e_completion_callbacks_new (ECompletionCallbacksRequestCompletionFn request_completion,
-					 ECompletionCallbacksEndCompletionFn end_completion,
-					 gpointer data);
-
-G_END_DECLS
-
-
-#endif /* E_COMPLETION_CALLBACKS_H */
-
diff --git a/widgets/text/e-completion-match.c b/widgets/text/e-completion-match.c
deleted file mode 100644
index 91a901ce19..0000000000
--- a/widgets/text/e-completion-match.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-completion-match.c
- * Copyright 2000, 2001, Ximian, Inc.
- *
- * Authors:
- *   Jon Trowbridge <trow@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#include <config.h>
-
-#include <string.h>
-
-#include "misc/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)
-{
-	g_return_if_fail (match != NULL);
-
-	/* We silently drop any entries w/ invalid utf8.
-	   This is not optimal behavior. */
-
-	if (match_text && ! g_utf8_validate (match_text, -1, NULL)) {
-		match_text = NULL;
-	}
-
-	if (menu_text && ! g_utf8_validate (menu_text, -1, NULL)) {
-		menu_text = NULL;
-	}
-
-	if (match->match_text && match->match_text != match_text) {
-		g_free (match->match_text);
-	}
-	match->match_text = g_strdup (match_text);
-
-	if (match->menu_text && match->menu_text != menu_text) {
-		g_free (match->menu_text);
-	}
-	match->menu_text  = g_strdup (menu_text);
-}
-
-const gchar *
-e_completion_match_get_match_text (ECompletionMatch *match)
-{
-	g_return_val_if_fail (match != NULL, NULL);
-	return match->match_text;
-}
-
-const gchar *
-e_completion_match_get_menu_text (ECompletionMatch *match)
-{
-	g_return_val_if_fail (match != NULL, NULL);
-	return match->menu_text;
-}
-
-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 7e1ef70813..0000000000
--- a/widgets/text/e-completion-match.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-completion-match.h
- * Copyright 2000, 2001, Ximian, Inc.
- *
- * Authors:
- *   Jon Trowbridge <trow@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#ifndef __E_COMPLETION_MATCH_H__
-#define __E_COMPLETION_MATCH_H__
-
-#include <glib.h>
-#include <gtk/gtkwidget.h>
-
-G_BEGIN_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);
-
-
-
-
-G_END_DECLS
-
-#endif /* __E_COMPLETION_MATCH_H__ */
-
diff --git a/widgets/text/e-completion-view.c b/widgets/text/e-completion-view.c
deleted file mode 100644
index 6195f8b769..0000000000
--- a/widgets/text/e-completion-view.c
+++ /dev/null
@@ -1,849 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-completion-view.c - A text completion selection widget
- * Copyright 2000, 2001, Ximian, Inc.
- *
- * Authors:
- *   Miguel de Icaza <miguel@ximian.com>
- *   Adapted by Jon Trowbridge <trow@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#include <config.h>
-
-#include <math.h>
-
-#include <gdk/gdkkeysyms.h>
-
-#include "table/e-table-scrolled.h"
-#include "table/e-table-simple.h"
-#include <glib/gi18n.h>
-#include "e-util/e-util-marshal.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_dispose    (GObject *object);
-
-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);
-
-	}
-	
-}
-
-#if 0
-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);
-	}
-}
-#endif
-
-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_send_expose (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;
-	}
-
-	requisition->height = MAX (100, 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);
-	}
-}
-
-G_DEFINE_TYPE (ECompletionView, e_completion_view, GTK_TYPE_EVENT_BOX)
-
-static void
-e_completion_view_class_init (ECompletionViewClass *klass)
-{
-	GObjectClass *object_class = (GObjectClass *) klass;
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-	e_completion_view_signals[E_COMPLETION_VIEW_NONEMPTY] =
-		g_signal_new ("nonempty",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (ECompletionViewClass, nonempty),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
-
-	e_completion_view_signals[E_COMPLETION_VIEW_ADDED] =
-		g_signal_new ("added",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (ECompletionViewClass, added),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
-
-	e_completion_view_signals[E_COMPLETION_VIEW_FULL] =
-		g_signal_new ("full",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (ECompletionViewClass, full),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
-
-	e_completion_view_signals[E_COMPLETION_VIEW_BROWSE] =
-		g_signal_new ("browse",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (ECompletionViewClass, browse),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__POINTER,
-			      G_TYPE_NONE, 1,
-			      G_TYPE_POINTER);
-
-	e_completion_view_signals[E_COMPLETION_VIEW_UNBROWSE] =
-		g_signal_new ("unbrowse",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (ECompletionViewClass, unbrowse),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
-
-	e_completion_view_signals[E_COMPLETION_VIEW_ACTIVATE] =
-		g_signal_new ("activate",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (ECompletionViewClass, activate),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__POINTER,
-			      G_TYPE_NONE, 1,
-			      G_TYPE_POINTER);
-
-	object_class->dispose = e_completion_view_dispose;
-
-	widget_class->key_press_event = e_completion_view_local_key_press_handler;
-	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;
-	completion->choices = g_ptr_array_new ();
-}
-
-static void
-e_completion_view_dispose (GObject *object)
-{
-	ECompletionView *cv = E_COMPLETION_VIEW (object);
-
-	e_completion_view_disconnect (cv);
-
-	if (cv->choices) {
-		e_completion_view_clear_choices (cv);
-
-		g_ptr_array_free (cv->choices, TRUE);
-		cv->choices = NULL;
-	}
-
-	if (cv->key_widget) {
-		g_signal_handler_disconnect (cv->key_widget, cv->key_signal_id);
-		g_object_unref (cv->key_widget);
-		cv->key_widget = NULL;
-	}
-
-	if (cv->completion)
-		g_object_unref (cv->completion);
-	cv->completion = NULL;
-
-	if (G_OBJECT_CLASS (e_completion_view_parent_class)->dispose)
-		(G_OBJECT_CLASS (e_completion_view_parent_class)->dispose) (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)
-		g_signal_handler_disconnect (cv->completion, cv->begin_signal_id);
-	if (cv->comp_signal_id)
-		g_signal_handler_disconnect (cv->completion, cv->comp_signal_id);
-	if (cv->end_signal_id)
-		g_signal_handler_disconnect (cv->completion, cv->end_signal_id);
-
-	cv->begin_signal_id   = 0;
-	cv->comp_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)
-{
-	ECompletionMatch *match;
-	GPtrArray *m;
-	int i;
-
-	g_return_if_fail (E_IS_COMPLETION_VIEW (cv));
-
-	m = cv->choices;
-	for (i = 0; i < m->len; i++) {
-		match = g_ptr_array_index (m, i);
-		e_completion_match_unref (match);
-	}
-	g_ptr_array_set_size (m, 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));
-#ifndef G_DISABLE_CHECKS
-	/* choices->len is unsigned, but it is reasonable for r to be
-	 * < 0 */
-	if (r > 0) {
-		g_return_if_fail (r < cv->choices->len);
-	}
-#endif
-
-	adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (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->choices->len - 1) {		
-		gtk_adjustment_set_value (adj, adj->upper - adj->page_size);
-		return;
-	}
-	
-	fracline = ((adj->upper - adj->lower - adj->page_size) / (gint)cv->choices->len) / 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_return_if_reached();
-}
-
-static void
-e_completion_view_select (ECompletionView *cv, gint r)
-{
-	ECompletionMatch *match;
-
-	match = g_ptr_array_index (cv->choices, r);
-
-	cv->selection = r;
-	e_completion_view_set_cursor_row (cv, r);
-	g_signal_emit (cv, e_completion_view_signals[E_COMPLETION_VIEW_ACTIVATE], 0, 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, complete_key = FALSE, uncomplete_key = FALSE, is_space = FALSE;
-
-	/* FIXME: This is totally lame.
-	   The ECompletionView should be able to specify multiple completion/uncompletion keys, or just
-	   have sensible defaults. */
-	
-	if ((cv->complete_key && key_event->keyval == cv->complete_key)
-	    || ((key_event->keyval == GDK_n || key_event->keyval == GDK_N) && (key_event->state & GDK_CONTROL_MASK)))
-		complete_key = TRUE;
-
-	if ((cv->uncomplete_key && key_event->keyval == cv->uncomplete_key)
-	    || ((key_event->keyval == GDK_p || key_event->keyval == GDK_P) && (key_event->state & GDK_CONTROL_MASK)))
-		uncomplete_key = TRUE;
-	
-	/* Start up a completion.*/
-	if (complete_key && !cv->editable) {
-		g_signal_emit (cv, e_completion_view_signals[E_COMPLETION_VIEW_BROWSE], 0, NULL);
-		goto stop_emission;
-	}
-
-	/* Stop our completion. */
-	if (uncomplete_key && cv->editable && cv->selection < 0) {
-		e_completion_view_set_cursor_row (cv, -1);
-		g_signal_emit (cv, e_completion_view_signals[E_COMPLETION_VIEW_UNBROWSE], 0);
-		goto stop_emission;
-	}
-
-	if (!cv->editable)
-		return FALSE;
-
-	switch (key_event->keyval) {
-
-	case GDK_n:
-	case GDK_N:
-		/* We (heart) emacs: treat ctrl-n as down */
-		if (! (key_event->state & GDK_CONTROL_MASK))
-			return FALSE;
-
-	case GDK_Down:
-	case GDK_KP_Down:
-		dir = 1;
-		break;
-
-	case GDK_p:
-	case GDK_P:
-		/* Treat ctrl-p as up */
-		if (! (key_event->state & GDK_CONTROL_MASK))
-			return FALSE;
-		
-	case GDK_Up:
-	case GDK_KP_Up:
-		dir = -1;
-		break;
-		
-	case GDK_Tab:
-		/* If our cursor is still up in the entry, move down into
-		   the popup.  Otherwise unbrowse. */
-		if (cv->choices->len > 0) {
-			if (cv->selection < 0) {
-				cv->selection = 0;
-				dir = 0;
-			} else {
-				cv->selection = -1;
-				dir = 0;
-				key_handled = FALSE;
-			}
-		}
-		break;
-
-	case GDK_space:
-	case GDK_KP_Space:
-		is_space = TRUE;
-
-	case GDK_Return:
-	case GDK_KP_Enter:
-		if (cv->selection < 0) {
-			/* We don't have a selection yet, move to the first selection if there is
-			   more than one option.  If there is only one option, select it automatically. */
-
-			/* Let space pass through. */
-			if (is_space)
-				return FALSE;
-			
-			if (cv->choices->len == 1) {
-				e_completion_view_select (cv, 0);
-				goto stop_emission;
-			} else {
-				cv->selection = 0;
-				dir = 0;
-			}
-
-		} else {
-			/* Our cursor is down in the pop-up, so we make our selection. */
-			e_completion_view_select (cv, cv->selection);
-			goto stop_emission;
-		}
-		break;
-
-	case GDK_Escape:
-		/* Unbrowse hack */
-		cv->selection = -1;
-		dir = 0;
-		break;
-
-	default:
-		return FALSE;
-	}
-
-	cv->selection += dir;
-
-	if (cv->selection >= (int)cv->choices->len) {
-		cv->selection = cv->choices->len - 1;
-		/* Don't re-emit the browse signal */
-		goto stop_emission;
-	}
-
-	e_completion_view_set_cursor_row (cv, cv->selection);
-
-	if (cv->selection >= 0)
-		g_signal_emit (cv, e_completion_view_signals[E_COMPLETION_VIEW_BROWSE], 0,
-			       g_ptr_array_index (cv->choices, cv->selection));
-	else
-		g_signal_emit (cv, e_completion_view_signals[E_COMPLETION_VIEW_UNBROWSE], 0);
-
- stop_emission:
-	
-	if (key_handled)
-		g_signal_stop_emission_by_name (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_table_model_pre_change (cv->model);
-	e_completion_view_clear_choices (cv);
-	cv->have_all_choices = FALSE;
-
-	e_table_model_changed (cv->model);
-}
-
-static void
-completion_cb (ECompletion *completion, ECompletionMatch *match, gpointer user_data)
-{
-	ECompletionView *cv = E_COMPLETION_VIEW (user_data);
-	gint r = cv->choices->len;
-	gboolean first = (cv->choices->len == 0);
-
-	e_table_model_pre_change (cv->model);
-
-	e_completion_match_ref (match);
-	g_ptr_array_add (cv->choices, match);
-
-	e_table_model_row_inserted (cv->model, r);
-
-	if (first)
-		g_signal_emit (cv, e_completion_view_signals[E_COMPLETION_VIEW_NONEMPTY], 0);
-
-	g_signal_emit (cv, e_completion_view_signals[E_COMPLETION_VIEW_ADDED], 0);
-}
-
-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_pre_change (cv->model);
-	e_table_model_changed (cv->model);
-
-	cv->have_all_choices = TRUE;
-	g_signal_emit (cv, e_completion_view_signals[E_COMPLETION_VIEW_FULL], 0);
-}
-
-/*** Table Callbacks ***/
-
-/* XXX toshok - we need to add sorting to this etable, through the use
-   of undisplayed fields of all the sort keys we want to use */
-static char *simple_spec = 
-"<ETableSpecification no-headers=\"true\" draw-grid=\"false\" cursor-mode=\"line\" alternating-row-colors=\"false\" gettext-domain=\"" GETTEXT_PACKAGE "\">"
-"  <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->choices->len;
-}
-
-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 = g_ptr_array_index (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;
-	g_object_ref (completion);
-
-	cv->begin_signal_id   = g_signal_connect (completion,
-						  "completion_started",
-						  G_CALLBACK (begin_completion_cb),
-						  cv);
-	cv->comp_signal_id    = g_signal_connect (completion,
-						  "completion_found",
-						  G_CALLBACK (completion_cb),
-						  cv);
-	cv->end_signal_id     = g_signal_connect (completion,
-						  "completion_finished",
-						  G_CALLBACK (end_completion_cb),
-						  cv);
-
-	cv->model = e_table_simple_new (table_col_count,
-					table_row_count,
-					NULL,
-
-					table_value_at,
-					NULL,
-					table_is_cell_editable,
-
-					NULL, NULL,
-
-					NULL, NULL, NULL, NULL,
-					table_value_to_string,
-					cv);
-
-	cv->table = e_table_scrolled_new (cv->model, NULL, simple_spec, NULL);
-	g_object_unref (cv->model);
-
-	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (cv->table), GTK_SHADOW_NONE);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (cv->table), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-
-	gtk_container_add (GTK_CONTAINER (cv), cv->table);
-	gtk_widget_show_all (cv->table);
-
-	g_signal_connect (e_completion_view_table (cv),
-			  "click",
-			  G_CALLBACK (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 = g_object_new (E_COMPLETION_VIEW_TYPE, NULL);
-
-	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) {
-		g_signal_handler_disconnect (cv->key_widget, cv->key_signal_id);
-		g_object_unref (cv->key_widget);
-	}
-
-	if (w) {
-		cv->key_widget = w;
-		g_object_ref (w);
-
-		cv->key_signal_id = g_signal_connect (w,
-						      "key_press_event",
-						      G_CALLBACK (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_size_request (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->choices->len);
-	
-	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_size_request (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 5e530cefbd..0000000000
--- a/widgets/text/e-completion-view.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-completion-view.h - A text completion selection widget
- * Copyright 2000, 2001, Ximian, Inc.
- *
- * Authors:
- *   Miguel de Icaza <miguel@ximian.com>
- *   Adapted by Jon Trowbridge <trow@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#ifndef E_COMPLETION_VIEW_H
-#define E_COMPLETION_VIEW_H
-
-#include <gtk/gtk.h>
-#include <table/e-table.h>
-#include "e-completion.h"
-
-G_BEGIN_DECLS
-
-#define E_COMPLETION_VIEW_TYPE        (e_completion_view_get_type ())
-#define E_COMPLETION_VIEW(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_COMPLETION_VIEW_TYPE, ECompletionView))
-#define E_COMPLETION_VIEW_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST ((k), E_COMPLETION_VIEW_TYPE, ECompletionViewClass))
-#define E_IS_COMPLETION_VIEW(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_COMPLETION_VIEW_TYPE))
-#define E_IS_COMPLETION_VIEW_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_COMPLETION_VIEW_TYPE))
-
-typedef struct _ECompletionView ECompletionView;
-typedef struct _ECompletionViewClass ECompletionViewClass;
-
-struct _ECompletionView {
-	GtkEventBox parent;
-	
-	ETableModel *model;
-	GtkWidget *table;
-
-	GPtrArray *choices;
-
-	ECompletion *completion;
-	guint begin_signal_id;
-	guint comp_signal_id;
-	guint end_signal_id;
-
-	GtkWidget *key_widget;
-	guint key_signal_id;
-
-	gint complete_key;
-	gint uncomplete_key;
-
-	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);
-
-G_END_DECLS
-
-
-#endif /* E_COMPLETION_H */
diff --git a/widgets/text/e-completion.c b/widgets/text/e-completion.c
deleted file mode 100644
index 07bdbe754d..0000000000
--- a/widgets/text/e-completion.c
+++ /dev/null
@@ -1,335 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-completion.c - A base class for text completion.
- * Copyright 2000, 2001, Ximian, Inc.
- *
- * Authors:
- *   Miguel de Icaza <miguel@ximian.com>
- *   Adapted by Jon Trowbridge <trow@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#include <config.h>
-
-#include <string.h>
-#include <stdio.h>
-
-#include <gtk/gtk.h>
-
-#include "e-util/e-util-marshal.h"
-#include "e-util/e-util.h"
-
-#include "e-completion.h"
-
-enum {
-	COMPLETION_STARTED,
-	COMPLETION_FOUND,
-	COMPLETION_CANCELED,
-	COMPLETION_FINISHED,
-	LAST_SIGNAL
-};
-
-static guint e_completion_signals[LAST_SIGNAL] = { 0 };
-
-struct _ECompletionPrivate {
-	gboolean searching;
-	gboolean done_search;
-	gchar *search_text;
-	GPtrArray *matches;
-	gint pos;
-	gint limit;
-	double min_score, max_score;
-};
-
-static void e_completion_class_init (ECompletionClass *klass);
-static void e_completion_init       (ECompletion *complete);
-static void e_completion_dispose    (GObject *object);
-
-static void     e_completion_add_match          (ECompletion *complete, ECompletionMatch *);
-static void     e_completion_clear_matches      (ECompletion *complete);
-#if 0
-static gboolean e_completion_sort               (ECompletion *complete);
-#endif
-
-G_DEFINE_TYPE (ECompletion, e_completion, GTK_TYPE_OBJECT)
-
-static void
-e_completion_class_init (ECompletionClass *klass)
-{
-	GObjectClass *object_class = (GObjectClass *) klass;
-
-	e_completion_signals[COMPLETION_STARTED] =
-		g_signal_new ("completion_started",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (ECompletionClass, completion_started),
-			      NULL, NULL,
-			      e_util_marshal_NONE__POINTER_INT_INT,
-			      G_TYPE_NONE, 3,
-			      G_TYPE_POINTER, G_TYPE_INT, G_TYPE_INT);
-
-	e_completion_signals[COMPLETION_FOUND] =
-		g_signal_new ("completion_found",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (ECompletionClass, completion_found),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__POINTER,
-			      G_TYPE_NONE, 1,
-			      G_TYPE_POINTER);
-
-	e_completion_signals[COMPLETION_FINISHED] =
-		g_signal_new ("completion_finished",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (ECompletionClass, completion_finished),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
-
-	object_class->dispose = e_completion_dispose;
-}
-
-static void
-e_completion_init (ECompletion *complete)
-{
-	complete->priv = g_new0 (struct _ECompletionPrivate, 1);
-	complete->priv->matches = g_ptr_array_new ();
-}
-
-static void
-e_completion_dispose (GObject *object)
-{
-	ECompletion *complete = E_COMPLETION (object);
-
-	if (complete->priv) {
-		g_free (complete->priv->search_text);
-		complete->priv->search_text = NULL;
-
-		e_completion_clear_matches (complete);
-
-		g_ptr_array_free (complete->priv->matches, TRUE);
-		complete->priv->matches = NULL;
-
-		g_free (complete->priv);
-		complete->priv = NULL;
-	}
-
-	if (G_OBJECT_CLASS (e_completion_parent_class)->dispose)
-		(G_OBJECT_CLASS (e_completion_parent_class)->dispose) (object);
-}
-
-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);
-
-	g_ptr_array_add (complete->priv->matches, match);
-
-	if (complete->priv->matches->len == 1) {
-
-		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);
-
-	}
-}
-
-static void
-e_completion_clear_matches (ECompletion *complete)
-{
-	ECompletionMatch *match;
-	GPtrArray *m;
-	int i;
-
-	g_return_if_fail (E_IS_COMPLETION (complete));
-
-	m = complete->priv->matches;
-	for (i = 0; i < m->len; i++) {
-		match = g_ptr_array_index (m, i);
-		e_completion_match_unref (match);
-	}
-	g_ptr_array_set_size (m, 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)
-{
-	ECompletionClass *klass;
-
-	g_return_if_fail (complete != NULL);
-	g_return_if_fail (E_IS_COMPLETION (complete));
-	g_return_if_fail (text != NULL);
-
-	klass = E_COMPLETION_CLASS (GTK_OBJECT_GET_CLASS (complete));
-
-	g_free (complete->priv->search_text);
-	complete->priv->search_text = g_strdup (text);
-
-	complete->priv->pos = pos;
-	complete->priv->searching = TRUE;
-	complete->priv->done_search = FALSE;
-
-	e_completion_clear_matches (complete);
-
-	complete->priv->limit = limit > 0 ? limit : G_MAXINT;
-
-	g_signal_emit (complete, e_completion_signals[COMPLETION_STARTED], 0, text, pos, limit);
-	if (klass->request_completion)
-		klass->request_completion (complete, text, pos, limit);
-}
-
-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->matches->len;
-}
-
-void
-e_completion_foreach_match (ECompletion *complete, ECompletionMatchFn fn, gpointer closure)
-{
-	GPtrArray *m;
-	int i;
-
-	g_return_if_fail (complete != NULL);
-	g_return_if_fail (E_IS_COMPLETION (complete));
-
-	if (fn == NULL)
-		return;
-
-	m = complete->priv->matches;
-	for (i = 0; i < m->len; i++) {
-		ECompletionMatch *match = g_ptr_array_index (m, i);
-		fn (match, closure);
-	}
-}
-
-ECompletion *
-e_completion_new (void)
-{
-	return E_COMPLETION (g_object_new (E_COMPLETION_TYPE, NULL));
-}
-
-#if 0
-static gboolean
-e_completion_sort (ECompletion *complete)
-{
-	GPtrArray *m;
-	int i;
-	GList *sort_list = NULL, *j;
-	gboolean diff;
-
-	m = complete->priv->matches;
-
-	for (i = 0; i < m->len; i++)
-		sort_list = g_list_append (sort_list, 
-					   g_ptr_array_index (m, i));
-	
-	sort_list = g_list_sort (sort_list, (GCompareFunc) e_completion_match_compare_alpha);
-
-	diff = FALSE;
-
-	for (i=0, j=sort_list; i < m->len; i++, j = g_list_next (j)) {
-		if (g_ptr_array_index (m, i) == j->data)
-			continue;
-
-		diff = TRUE;
-		g_ptr_array_index (m, i) = j->data;
-	}
-
-	g_list_free (sort_list);
-
-	return diff;
-}
-#endif
-
-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;
-	}
-
-	/* For now, do nothing when we hit the limit --- just don't
-	 * announce the incoming matches. */
-	if (complete->priv->matches->len >= complete->priv->limit) {
-		e_completion_match_unref (match);
-		return;
-	}
-
-	e_completion_add_match (complete, match);
-
-	g_signal_emit (complete, e_completion_signals[COMPLETION_FOUND], 0, match);
-}
-
-void
-e_completion_end_search (ECompletion *comp)
-{
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (E_IS_COMPLETION (comp));
-	g_return_if_fail (comp->priv->searching);
-
-	if (E_COMPLETION_CLASS (GTK_OBJECT_GET_CLASS (comp))->end_completion) {
-		E_COMPLETION_CLASS (GTK_OBJECT_GET_CLASS (comp))->end_completion (comp);
-	}
-	g_signal_emit (comp, e_completion_signals[COMPLETION_FINISHED], 0);
-
-	comp->priv->searching = FALSE;
-	comp->priv->done_search = TRUE;
-}
-
diff --git a/widgets/text/e-completion.h b/widgets/text/e-completion.h
deleted file mode 100644
index 40ea65e9d3..0000000000
--- a/widgets/text/e-completion.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-completion.h - A base class for text completion.
- * Copyright 2000, 2001, Ximian, Inc.
- *
- * Authors:
- *   Miguel de Icaza <miguel@ximian.com>
- *   Adapted by Jon Trowbridge <trow@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#ifndef E_COMPLETION_H
-#define E_COMPLETION_H
-
-#include <gtk/gtkobject.h>
-#include "e-completion-match.h"
-
-G_BEGIN_DECLS
-
-#define E_COMPLETION_TYPE        (e_completion_get_type ())
-#define E_COMPLETION(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_COMPLETION_TYPE, ECompletion))
-#define E_COMPLETION_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST ((k), E_COMPLETION_TYPE, ECompletionClass))
-#define E_IS_COMPLETION(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_COMPLETION_TYPE))
-#define E_IS_COMPLETION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_COMPLETION_TYPE))
-
-typedef struct _ECompletion ECompletion;
-typedef struct _ECompletionClass ECompletionClass;
-struct _ECompletionPrivate;
-
-typedef gboolean (*ECompletionRefineFn) (ECompletion *, ECompletionMatch *, const gchar *search_text, gint pos);
-
-struct _ECompletion {
-	GtkObject parent;
-
-	struct _ECompletionPrivate *priv;
-};
-
-struct _ECompletionClass {
-	GtkObjectClass parent_class;
-
-	/* virtual functions */
-	void     (*request_completion)  (ECompletion *comp, const gchar *search_text, gint pos, gint limit);
-	void     (*end_completion)      (ECompletion *comp);
-
-	/* Signals */
-	void     (*completion_started)  (ECompletion *comp, const gchar *search_text, gint pos, gint limit);
-
-	void     (*completion_found)    (ECompletion *comp, ECompletionMatch *match);
-
-	void     (*completion_finished) (ECompletion *comp);
-};
-
-GtkType      e_completion_get_type (void);
-
-void         e_completion_begin_search    (ECompletion *comp, const gchar *text, gint pos, gint limit);
-
-gboolean     e_completion_searching       (ECompletion *comp);
-gboolean     e_completion_refining        (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);
-
-G_END_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 262fe10c0b..0000000000
--- a/widgets/text/e-entry-test.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-entry-test.c
- * Copyright 2000, 2001, Ximian, Inc.
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#include <config.h>
-
-#include <gnome.h>
-
-#include <glib/gi18n.h>
-#include "e-util/e-util-private.h"
-
-#include "e-entry.h"
-
-static void destroy_callback(gpointer data, GObject *where_object_was)
-{
-  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, EVOLUTION_LOCALEDIR);
-      textdomain (PACKAGE);*/
-
-  gnome_init( "EEntry Test", VERSION, argc, argv);
-  app = gnome_app_new("EEntry Test", NULL);
-
-  entry = e_entry_new();
-  g_object_set(entry,
-	       "editable", TRUE,
-	       "use_ellipsis", TRUE,
-	       NULL);
-  gnome_app_set_contents( GNOME_APP( app ), entry );
-
-  /* Connect the signals */
-  g_object_weak_ref (G_OBJECT (app),
-		     destroy_callback, 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 b4754c6f37..0000000000
--- a/widgets/text/e-entry.c
+++ /dev/null
@@ -1,1341 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-entry.c - An EText-based entry widget
- * Copyright 2000, 2001, Ximian, Inc.
- *
- * Authors:
- *   Chris Lahey     <clahey@ximian.com>
- *   Jon Trowbridge  <trow@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#include <config.h>
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdio.h>
-
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
-#include <libxml/parser.h>
-#include <libgnomecanvas/gnome-canvas.h>
-
-#include <glib/gi18n.h>
-#include "e-util/e-util.h"
-#include "misc/e-canvas.h"
-#include "misc/e-canvas-utils.h"
-
-#include "e-completion-view.h"
-#include "e-entry.h"
-#include "e-text.h"
-
-#define MIN_ENTRY_WIDTH  150
-#define INNER_BORDER 2
-
-#define d(x)
-
-G_DEFINE_TYPE (EEntry, e_entry, GTK_TYPE_TABLE)
-
-enum {
-	E_ENTRY_CHANGED,
-	E_ENTRY_ACTIVATE,
-	E_ENTRY_POPULATE_POPUP,
-	E_ENTRY_COMPLETION_POPUP,
-	E_ENTRY_LAST_SIGNAL
-};
-
-static guint e_entry_signals[E_ENTRY_LAST_SIGNAL] = { 0 };
-
-/* Object argument IDs */
-enum {
-	PROP_0,
-	PROP_MODEL,
-	PROP_EVENT_PROCESSOR,
-	PROP_TEXT,
-	PROP_ANCHOR,
-	PROP_JUSTIFICATION,
-	PROP_X_OFFSET,
-	PROP_Y_OFFSET,
-	PROP_FILL_COLOR,
-	PROP_FILL_COLOR_GDK,
-	PROP_FILL_COLOR_RGBA,
-	PROP_FILL_STIPPLE,
-	PROP_EDITABLE,
-	PROP_USE_ELLIPSIS,
-	PROP_ELLIPSIS,
-	PROP_LINE_WRAP,
-	PROP_BREAK_CHARACTERS,
-	PROP_MAX_LINES,
-	PROP_ALLOW_NEWLINES,
-	PROP_DRAW_BORDERS,
-	PROP_DRAW_BACKGROUND,
-	PROP_DRAW_BUTTON,
-	PROP_EMULATE_LABEL_RESIZE,
-	PROP_CURSOR_POS
-};
-
-typedef struct _EEntryPrivate EEntryPrivate;
-struct _EEntryPrivate {
-	GtkJustification justification;
-
-	guint changed_proxy_tag;
-	guint activate_proxy_tag;
-	guint populate_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;
-	guint emulate_label_resize : 1;
-	guint have_set_transient : 1;
-	guint item_chosen : 1;
-	gint last_width;
-};
-
-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);
-	g_object_set (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;
-	}
-}
-
-#if 0
-static void
-get_borders (EEntry   *entry,
-             gint     *xborder,
-             gint     *yborder)
-{
-  GtkWidget *widget = GTK_WIDGET (entry);
-  gint focus_width;
-  gboolean interior_focus;
-
-  gtk_widget_style_get (widget,
-			"interior-focus", &interior_focus,
-			"focus-line-width", &focus_width,
-			NULL);
-
-  *xborder = widget->style->xthickness;
-  *yborder = widget->style->ythickness;
-
-  if (!interior_focus)
-    {
-      *xborder += focus_width;
-      *yborder += focus_width;
-    }
-}
-#endif
-
-static void
-canvas_size_request (GtkWidget *widget, GtkRequisition *requisition,
-		     EEntry *entry)
-{
-	int xthick, ythick;
-	PangoContext *context;
-	PangoFontMetrics *metrics;
-	
-	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) {
-		/* get_borders (entry, &xthick, &ythick); */
-		xthick = ythick = 3;
-	} else {
-		xthick = ythick = 0;
-	}
-	
-	if (entry->priv->emulate_label_resize) {
-		gdouble width;
-		g_object_get (entry->item,
-			      "text_width", &width,
-			      NULL);
-		requisition->width = 2*xthick + width;
-	} else {
-		requisition->width = MIN_ENTRY_WIDTH + 2*xthick;
-	}
-	if (entry->priv->last_width != requisition->width)
-		gtk_widget_queue_resize (widget);
-	entry->priv->last_width = requisition->width;
-
-	d(g_print("%s: width = %d\n", __FUNCTION__, requisition->width));
-
-	context = gtk_widget_get_pango_context (widget);
-	metrics = pango_context_get_metrics (context, gtk_widget_get_style (widget)->font_desc,
-					     pango_context_get_language (context));
-
-	requisition->height = (PANGO_PIXELS (pango_font_metrics_get_ascent (metrics) +
-					     pango_font_metrics_get_descent (metrics)) +
-			       2 * ythick);
-
-	pango_font_metrics_unref (metrics);
-}
-
-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) {
-		g_source_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->completion_delay >= 0) {
-			int delay;
-			delay = entry->priv->popup_is_visible 
-				? 1 
-				: entry->priv->completion_delay;
-			e_entry_start_delayed_completion (entry, 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
-proxy_changed (EText *text, EEntry *entry)
-{
-	if (entry->priv->changed_since_keypress_tag)
-		g_source_remove (entry->priv->changed_since_keypress_tag);
-	entry->priv->changed_since_keypress = TRUE;
-	entry->priv->changed_since_keypress_tag = g_timeout_add (20, changed_since_keypress_timeout_fn, entry);
-	
-	g_signal_emit (entry, e_entry_signals [E_ENTRY_CHANGED], 0);
-}
-
-static void
-proxy_activate (EText *text, EEntry *entry)
-{
-	g_signal_emit (entry, e_entry_signals [E_ENTRY_ACTIVATE], 0);
-}
-
-static void
-proxy_populate_popup (EText *text, GdkEventButton *ev, gint pos, GtkWidget *menu, EEntry *entry)
-{
-	g_signal_emit (entry, e_entry_signals [E_ENTRY_POPULATE_POPUP], 0, ev, pos, menu);
-}
-
-static void
-e_entry_init (EEntry *entry)
-{
-	GtkTable *gtk_table = GTK_TABLE (entry);
-
-	entry->priv = g_new0 (EEntryPrivate, 1);
-
-	entry->priv->emulate_label_resize = FALSE;
-	
-	entry->canvas = GNOME_CANVAS (e_canvas_new ());
-
-	g_signal_connect (entry->canvas,
-			  "size_allocate",
-			  G_CALLBACK (canvas_size_allocate),
-			  entry);
-
-	g_signal_connect (entry->canvas,
-			  "size_request",
-			  G_CALLBACK (canvas_size_request),
-			  entry);
-
-	g_signal_connect (entry->canvas,
-			  "focus_in_event",
-			  G_CALLBACK(canvas_focus_in_event),
-			  entry);
-
-	entry->priv->draw_borders = TRUE;
-	entry->priv->last_width = -1;
-
-	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,
-		"draw_button", FALSE,
-		"max_lines", 1,
-		"editable", TRUE,
-		"allow_newlines", FALSE,
-		"im_context", E_CANVAS (entry->canvas)->im_context,
-		"handle_popup", TRUE,
-		NULL));
-
-	g_signal_connect (entry->item,
-			  "keypress",
-			  G_CALLBACK (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 = g_signal_connect (entry->item,
-							   "changed",
-							   G_CALLBACK (proxy_changed),
-							   entry);
-	entry->priv->activate_proxy_tag = g_signal_connect (entry->item,
-							    "activate",
-							    G_CALLBACK (proxy_activate),
-							    entry);
-	entry->priv->populate_popup_proxy_tag = g_signal_connect (entry->item,
-								  "populate_popup",
-								  G_CALLBACK (proxy_populate_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 = g_object_new (E_ENTRY_TYPE, NULL);
-	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));
-
-	g_signal_handler_block (entry->item, entry->priv->changed_proxy_tag);
-	e_entry_set_text (entry, txt);
-	g_signal_handler_unblock (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));
-
-	g_object_set (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;
-
-	/* The async query can give us a result after the focus was
-	   lost by the widget.  In that case, we don't want to show
-	   the pop-up.
-
-	   but only return early if we're popping *up* the completion
-	   view.  If we're trying to pop down the view, continue on
-	   regardless of whether or not the canvas has focus. */
-	if (/*visible && */! GTK_WIDGET_HAS_FOCUS (entry->canvas))
-		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;
-
-		fudge = 1;
-		y -= fudge;
-
-		gtk_widget_set_uposition (pop, x, y);
-		e_completion_view_set_width (E_COMPLETION_VIEW (entry->priv->completion_view), dim->width);
-
-		gtk_widget_set_sensitive(pop, TRUE);
-		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);
-		/* hack to force the popup to lose focus, which it gets if you click on it */
-		gtk_widget_set_sensitive(pop, FALSE);
-
-		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);
-
-	if (entry->priv->popup_is_visible != visible) {
-		entry->priv->popup_is_visible = visible;
-		g_signal_emit (entry, e_entry_signals[E_ENTRY_COMPLETION_POPUP], 0, (gint) visible);
-	}
-}
-
-static void
-e_entry_start_completion (EEntry *entry)
-{
-	if (entry->priv->completion == NULL)
-		return;
-
-	if (e_entry_is_empty (entry))
-		return;
-
-	entry->priv->item_chosen = FALSE;
-
-	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 = g_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) {
-		g_source_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
-full_cb (ECompletionView *view, gpointer user_data)
-{
-	EEntry *entry = E_ENTRY (user_data);
-	gboolean show;
-
-	show = GTK_WIDGET_HAS_FOCUS (GTK_WIDGET (entry->canvas)) && view->choices->len > 0 && !entry->priv->item_chosen;
-	e_entry_show_popup (entry, show);
-}
-
-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);
-
-	entry->priv->item_chosen = TRUE;
-
-	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 void
-cancel_completion_cb (ETextModel *model, gpointer user_data)
-{
-	EEntry *entry = E_ENTRY (user_data);
-
-	/* If we get the signal from the underlying text model, unbrowse.
-	   This usually means that the text model itself has done some
-	   sort of completion, or has otherwise transformed its contents
-	   in some way that would render any previous completion invalid. */
-	unbrowse_cb (E_COMPLETION_VIEW (entry->priv->completion_view), entry);
-}
-
-static gint
-key_press_cb (GtkWidget *w, GdkEventKey *ev, gpointer user_data)
-{
-	gint rv = 0;
-	/* Forward signal */
-	g_signal_emit_by_name (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 */
-	g_signal_emit_by_name (user_data, "key_release_event", ev, &rv);
-	return rv;
-}
-
-static void
-e_entry_make_completion_window_transient (EEntry *entry)
-{
-	GtkWidget *w;
-
-	if (entry->priv->have_set_transient || entry->priv->completion_view_popup == NULL)
-		return;
-	
-	w = GTK_WIDGET (entry)->parent;
-	while (w && ! GTK_IS_WINDOW (w))
-		w = w->parent;
-
-	if (w) {
-		gtk_window_set_transient_for (GTK_WINDOW (entry->priv->completion_view_popup),
-					      GTK_WINDOW (w));
-		entry->priv->have_set_transient = 1;
-	}
-}
-
-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;
-	g_object_ref_sink (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);
-
-	g_signal_connect_after (entry->priv->completion_view,
-				"button_press_event",
-				G_CALLBACK (button_press_cb),
-				entry);
-
-	entry->priv->nonempty_signal_id = g_signal_connect (entry->priv->completion_view,
-							    "nonempty",
-							    G_CALLBACK (nonempty_cb),
-							    entry);
-
-	entry->priv->full_signal_id = g_signal_connect (entry->priv->completion_view,
-							"full",
-							G_CALLBACK (full_cb),
-							entry);
-
-	entry->priv->browse_signal_id = g_signal_connect (entry->priv->completion_view,
-							  "browse",
-							  G_CALLBACK (browse_cb),
-							  entry);
-
-	entry->priv->unbrowse_signal_id = g_signal_connect (entry->priv->completion_view,
-							    "unbrowse",
-							    G_CALLBACK (unbrowse_cb),
-							    entry);
-
-	entry->priv->activate_signal_id = g_signal_connect (entry->priv->completion_view,
-							    "activate",
-							    G_CALLBACK (activate_cb),
-							    entry);
-
-	entry->priv->completion_view_popup = gtk_window_new (GTK_WINDOW_POPUP);
-
-	e_entry_make_completion_window_transient (entry);
-
-	g_signal_connect (entry->item->model,
-			  "cancel_completion",
-			  G_CALLBACK (cancel_completion_cb),
-			  entry);
-
-	g_signal_connect (entry->priv->completion_view_popup,
-			  "key_press_event",
-			  G_CALLBACK (key_press_cb),
-			  entry->canvas);
-	g_signal_connect (entry->priv->completion_view_popup,
-			  "key_release_event",
-			  G_CALLBACK (key_release_cb),
-			  entry->canvas);
-
-	e_completion_view_connect_keys (E_COMPLETION_VIEW (entry->priv->completion_view),
-					GTK_WIDGET (entry->canvas));
-
-	g_object_ref_sink (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);
-}
-
-gboolean
-e_entry_completion_popup_is_visible (EEntry *entry)
-{
-	g_return_val_if_fail (E_IS_ENTRY (entry), FALSE);
-
-	return entry->priv->popup_is_visible;
-}
-
-/** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** **/
-
-static void
-et_get_property (GObject *object,
-		 guint prop_id,
-		 GValue *value,
-		 GParamSpec *pspec)
-{
-	EEntry *entry = E_ENTRY (object);
-	GtkObject *item = GTK_OBJECT (entry->item);
-	
-	switch (prop_id){
-	case PROP_MODEL:
-		g_object_get_property (G_OBJECT (item), "model", value);
-		break;
-	case PROP_EVENT_PROCESSOR:
-		g_object_get_property (G_OBJECT (item), "event_processor", value);
-		break;
-	case PROP_TEXT:
-		g_object_get_property (G_OBJECT (item), "text", value);
-		break;
-
-	case PROP_JUSTIFICATION:
-		g_object_get_property (G_OBJECT (item), "justification", value);
-		break;
-
-	case PROP_FILL_COLOR_GDK:
-		g_object_get_property (G_OBJECT (item), "fill_color_gdk", value);
-		break;
-
-	case PROP_FILL_COLOR_RGBA:
-		g_object_get_property (G_OBJECT (item), "fill_color_rgba", value);
-		break;
-
-	case PROP_FILL_STIPPLE:
-		g_object_get_property (G_OBJECT (item), "fill_stiple", value);
-		break;
-
-	case PROP_EDITABLE:
-		g_object_get_property (G_OBJECT (item), "editable", value);
-		break;
-
-	case PROP_USE_ELLIPSIS:
-		g_object_get_property (G_OBJECT (item), "use_ellipsis", value);
-		break;
-
-	case PROP_ELLIPSIS:
-		g_object_get_property (G_OBJECT (item), "ellipsis", value);
-		break;
-
-	case PROP_LINE_WRAP:
-		g_object_get_property (G_OBJECT (item), "line_wrap", value);
-		break;
-		
-	case PROP_BREAK_CHARACTERS:
-		g_object_get_property (G_OBJECT (item), "break_characters", value);
-		break;
-
-	case PROP_MAX_LINES:
-		g_object_get_property (G_OBJECT (item), "max_lines", value);
-		break;
-	case PROP_ALLOW_NEWLINES:
-		g_object_get_property (G_OBJECT (item), "allow_newlines", value);
-		break;
-
-	case PROP_DRAW_BORDERS:
-		g_value_set_boolean (value, entry->priv->draw_borders);
-		break;
-
-	case PROP_DRAW_BACKGROUND:
-		g_object_get_property (G_OBJECT (item), "draw_background", value);
-		break;
-
-	case PROP_DRAW_BUTTON:
-		g_object_get_property (G_OBJECT (item), "draw_button", value);
-		break;
-
-	case PROP_EMULATE_LABEL_RESIZE:
-		g_value_set_boolean (value, entry->priv->emulate_label_resize);
-		break;
-
-	case PROP_CURSOR_POS:
-		g_object_get_property (G_OBJECT (item), "cursor_pos", value);
-		
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-et_set_property (GObject *object,
-		 guint prop_id,
-		 const GValue *value,
-		 GParamSpec *pspec)
-{
-	EEntry *entry = E_ENTRY (object);
-	GtkObject *item = GTK_OBJECT (entry->item);
-	GtkAnchorType anchor;
-	double width, height;
-	gint xthick;
-	gint ythick;
-	GtkWidget *widget = GTK_WIDGET(entry->canvas);
-	
-	d(g_print("%s: prop_id: %d\n", __FUNCTION__, prop_id));
-
-	switch (prop_id){
-	case PROP_MODEL:
-		g_object_set_property (G_OBJECT (item), "model", value);
-		if (entry->priv->emulate_label_resize)
-			gtk_widget_queue_resize (widget);
-		break;
-
-	case PROP_EVENT_PROCESSOR:
-		g_object_set_property (G_OBJECT (item), "event_processor", value);
-		break;
-
-	case PROP_TEXT:
-		g_object_set_property (G_OBJECT (item), "text", value);
-		d(g_print("%s: text: %s\n", __FUNCTION__, g_value_get_string (value)));
-		if (entry->priv->emulate_label_resize)
-			gtk_widget_queue_resize (widget);
-		break;
-
-	case PROP_JUSTIFICATION:
-		entry->priv->justification = g_value_get_enum (value);
-		g_object_get(item,
-			     "clip_width", &width,
-			     "clip_height", &height,
-			     NULL);
-
-		if (entry->priv->draw_borders) {
-			xthick = 0;
-			ythick = 0;
-		} else {
-			xthick = widget->style->xthickness;
-			ythick = widget->style->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;
-		}
-		g_object_set(item,
-			     "justification", entry->priv->justification,
-			     "anchor", anchor,
-			     NULL);
-		break;
-
-	case PROP_FILL_COLOR:
-		g_object_set_property (G_OBJECT (item), "fill_color", value);
-		break;
-
-	case PROP_FILL_COLOR_GDK:
-		g_object_set_property (G_OBJECT (item), "fill_color_gdk", value);
-		break;
-
-	case PROP_FILL_COLOR_RGBA:
-		g_object_set_property (G_OBJECT (item), "fill_color_rgba", value);
-		break;
-
-	case PROP_FILL_STIPPLE:
-		g_object_set_property (G_OBJECT (item), "fill_stiple", value);
-		break;
-
-	case PROP_EDITABLE:
-		g_object_set_property (G_OBJECT (item), "editable", value);
-		break;
-
-	case PROP_USE_ELLIPSIS:
-		g_object_set_property (G_OBJECT (item), "use_ellipsis", value);
-		if (entry->priv->emulate_label_resize)
-			gtk_widget_queue_resize (widget);
-		break;
-
-	case PROP_ELLIPSIS:
-		g_object_set_property (G_OBJECT (item), "ellipsis", value);
-		if (entry->priv->emulate_label_resize)
-			gtk_widget_queue_resize (widget);
-		break;
-
-	case PROP_LINE_WRAP:
-		g_object_set_property (G_OBJECT (item), "line_wrap", value);
-		if (entry->priv->emulate_label_resize)
-			gtk_widget_queue_resize (widget);
-		break;
-		
-	case PROP_BREAK_CHARACTERS:
-		g_object_set_property (G_OBJECT (item), "break_characters", value);
-		if (entry->priv->emulate_label_resize)
-			gtk_widget_queue_resize (widget);
-		break;
-
-	case PROP_MAX_LINES:
-		g_object_set_property (G_OBJECT (item), "max_lines", value);
-		if (entry->priv->emulate_label_resize)
-			gtk_widget_queue_resize (widget);
-		break;
-
-	case PROP_ALLOW_NEWLINES:
-		g_object_set_property (G_OBJECT (item), "allow_newlines", value);
-		break;
-
-	case PROP_DRAW_BORDERS:
-		if (entry->priv->draw_borders != g_value_get_boolean (value)) {
-			entry->priv->draw_borders = g_value_get_boolean (value);
-			g_object_set (item,
-				      "draw_borders", entry->priv->draw_borders,
-				      NULL);
-			gtk_widget_queue_resize (GTK_WIDGET (entry));
-		}
-		break;
-
-	case PROP_CURSOR_POS:
-		g_object_set_property (G_OBJECT (item), "cursor_pos", value);
-		break;
-		
-	case PROP_DRAW_BACKGROUND:
-		g_object_set_property (G_OBJECT (item), "draw_background", value);
-		break;
-
-	case PROP_DRAW_BUTTON:
-		g_object_set_property (G_OBJECT (item), "draw_button", value);
-		break;
-
-	case PROP_EMULATE_LABEL_RESIZE:
-		if (entry->priv->emulate_label_resize != g_value_get_boolean (value)) {
-			entry->priv->emulate_label_resize = g_value_get_boolean (value);
-			gtk_widget_queue_resize (widget);
-		}		
-		break;
-	}
-}
-
-static void
-e_entry_dispose (GObject *object)
-{
-	EEntry *entry = E_ENTRY (object);
-
-	if (entry->priv) {
-		if (entry->priv->completion_delay_tag)
-			g_source_remove (entry->priv->completion_delay_tag);
-
-		if (entry->priv->completion)
-			g_object_unref (entry->priv->completion);
-
-		if (entry->priv->ptr_grab) {
-			gdk_pointer_ungrab (GDK_CURRENT_TIME);
-			gtk_grab_remove (GTK_WIDGET (entry->priv->completion_view));
-		}
-
-		if (entry->priv->completion_view_popup) {
-			gtk_widget_destroy (GTK_WIDGET (entry->priv->completion_view_popup));
-			g_object_unref (entry->priv->completion_view_popup);
-		}
-		g_free (entry->priv->pre_browse_text);
-
-		if (entry->priv->changed_since_keypress_tag)
-			g_source_remove (entry->priv->changed_since_keypress_tag);
-
-		g_free (entry->priv);
-		entry->priv = NULL;
-	}
-
-	if (G_OBJECT_CLASS (e_entry_parent_class)->dispose)
-		(* G_OBJECT_CLASS (e_entry_parent_class)->dispose) (object);
-}
-
-static void
-e_entry_realize (GtkWidget *widget)
-{
-	EEntry *entry;
-
-	if (GTK_WIDGET_CLASS (e_entry_parent_class)->realize)
-		(* GTK_WIDGET_CLASS (e_entry_parent_class)->realize) (widget);
-
-	entry = E_ENTRY (widget);
-
-	e_entry_make_completion_window_transient (entry);
-
-	if (entry->priv->emulate_label_resize) {
-		d(g_print("%s: queue_resize\n", __FUNCTION__));
-		gtk_widget_queue_resize (GTK_WIDGET (entry->canvas));
-	}
-}
-
-static void
-e_entry_class_init (EEntryClass *klass)
-{
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	object_class->set_property = et_set_property;
-	object_class->get_property = et_get_property;
-	object_class->dispose = e_entry_dispose;
-
-	widget_class->realize = e_entry_realize;
-
-	klass->changed = NULL;
-	klass->activate = NULL;
-
-	e_entry_signals[E_ENTRY_CHANGED] =
-		g_signal_new ("changed",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EEntryClass, changed),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
-
-	e_entry_signals[E_ENTRY_ACTIVATE] =
-		g_signal_new ("activate",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EEntryClass, activate),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
-
-	e_entry_signals[E_ENTRY_POPULATE_POPUP] =
-		g_signal_new ("populate_popup",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EEntryClass, populate_popup),
-			      NULL, NULL,
-			      e_util_marshal_NONE__POINTER_INT_OBJECT,
-			      G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_INT, GTK_TYPE_MENU);
-
-	e_entry_signals[E_ENTRY_COMPLETION_POPUP] =
-		g_signal_new ("completion_popup",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EEntryClass, completion_popup),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__INT,
-			      G_TYPE_NONE, 1, G_TYPE_INT);
-
-	g_object_class_install_property (object_class, PROP_MODEL,
-					 g_param_spec_object ("model",
-							      _( "Model" ),
-							      _( "Model" ),
-							      E_TYPE_TEXT_MODEL,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_EVENT_PROCESSOR,
-					 g_param_spec_object ("event_processor",
-							      _( "Event Processor" ),
-							      _( "Event Processor" ),
-							      E_TEXT_EVENT_PROCESSOR_TYPE,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_TEXT,
-					 g_param_spec_string ("text",
-							      _( "Text" ),
-							      _( "Text" ),
-							      NULL,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_JUSTIFICATION,
-					 g_param_spec_enum ("justification",
-							    _( "Justification" ),
-							    _( "Justification" ),
-							    GTK_TYPE_JUSTIFICATION, GTK_JUSTIFY_LEFT,
-							    G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_FILL_COLOR,
-					 g_param_spec_string ("fill_color",
-							      _( "Fill color" ),
-							      _( "Fill color" ),
-							      NULL,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_FILL_COLOR_GDK,
-					 g_param_spec_boxed ("fill_color_gdk",
-							     _( "GDK fill color" ),
-							     _( "GDK fill color" ),
-							     GDK_TYPE_COLOR,
-							     G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_FILL_COLOR_RGBA,
-					 g_param_spec_uint ("fill_color_rgba",
-							    _( "GDK fill color" ),
-							    _( "GDK fill color" ),
-							    0, G_MAXUINT, 0,
-							    G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_FILL_STIPPLE,
-					 g_param_spec_object ("fill_stipple",
-							      _( "Fill stipple" ),
-							      _( "Fill stipple" ),
-							      GDK_TYPE_WINDOW,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_EDITABLE,
-					 g_param_spec_boolean ("editable",
-							       _( "Editable" ),
-							       _( "Editable" ),
-							       FALSE,
-							       G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_USE_ELLIPSIS,
-					 g_param_spec_boolean ("use_ellipsis",
-							       _( "Use ellipsis" ),
-							       _( "Use ellipsis" ),
-							       FALSE,
-							       G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_ELLIPSIS,
-					 g_param_spec_string ("ellipsis",
-							      _( "Ellipsis" ),
-							      _( "Ellipsis" ),
-							      NULL,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_LINE_WRAP,
-					 g_param_spec_boolean ("line_wrap",
-							       _( "Line wrap" ),
-							       _( "Line wrap" ),
-							       FALSE,
-							       G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_BREAK_CHARACTERS,
-					 g_param_spec_string ("break_characters",
-							      _( "Break characters" ),
-							      _( "Break characters" ),
-							      NULL,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_MAX_LINES,
-					 g_param_spec_int ("max_lines",
-							   _( "Max lines" ),
-							   _( "Max lines" ),
-							   0, G_MAXINT, 0,
-							   G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_ALLOW_NEWLINES,
-					 g_param_spec_boolean ("allow_newlines",
-							       _( "Allow newlines" ),
-							       _( "Allow newlines" ),
-							       FALSE,
-							       G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_DRAW_BORDERS,
-					 g_param_spec_boolean ("draw_borders",
-							       _( "Draw borders" ),
-							       _( "Draw borders" ),
-							       FALSE,
-							       G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_DRAW_BACKGROUND,
-					 g_param_spec_boolean ("draw_background",
-							       _( "Draw background" ),
-							       _( "Draw background" ),
-							       FALSE,
-							       G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_DRAW_BUTTON,
-					 g_param_spec_boolean ("draw_button",
-							       _( "Draw button" ),
-							       _( "Draw button" ),
-							       FALSE,
-							       G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_CURSOR_POS,
-					 g_param_spec_int ("cursor_pos",
-							   _( "Cursor position" ),
-							   _( "Cursor position" ),
-							   0, G_MAXINT, 0,
-							   G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_EMULATE_LABEL_RESIZE,
-					 g_param_spec_boolean ("emulate_label_resize",
-							       _( "Emulate label resize" ),
-							       _( "Emulate label resize" ),
-							       FALSE,
-							       G_PARAM_READWRITE));
-}
-
-
diff --git a/widgets/text/e-entry.h b/widgets/text/e-entry.h
deleted file mode 100644
index 7299ddbfd4..0000000000
--- a/widgets/text/e-entry.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-entry.h - An EText-based entry widget
- * Copyright 2000, 2001, Ximian, Inc.
- *
- * Authors:
- *   Chris Lahey     <clahey@ximian.com>
- *   Jon Trowbridge  <trow@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#ifndef _E_ENTRY_H_
-#define _E_ENTRY_H_
-
-#include <libgnomecanvas/gnome-canvas.h>
-#include <gtk/gtktable.h>
-#include <libxml/tree.h>
-#include <text/e-text.h>
-#include "e-completion.h"
-
-G_BEGIN_DECLS
-
-#define E_ENTRY_TYPE        (e_entry_get_type ())
-#define E_ENTRY(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_ENTRY_TYPE, EEntry))
-#define E_ENTRY_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_ENTRY_TYPE, EEntryClass))
-#define E_IS_ENTRY(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_ENTRY_TYPE))
-#define E_IS_ENTRY_CLASS(k) (G_TYPE_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 (* populate_popup)   (EEntry *entry, GdkEventButton *ev, gint pos, GtkMenu *menu);
-	void (* completion_popup) (EEntry *entry, gint visible);
-};
-
-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);
-gboolean     e_entry_completion_popup_is_visible (EEntry *entry);
-
-G_END_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 82ebcf3216..0000000000
--- a/widgets/text/e-table-text-model.c
+++ /dev/null
@@ -1,217 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-table-text-model.c
- * Copyright 2000, 2001, Ximian, Inc.
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#include <config.h>
-
-#include <ctype.h>
-
-#include <gtk/gtk.h>
-
-#include "e-util/e-util.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_dispose (GObject *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);
-
-G_DEFINE_TYPE (ETableTextModel, e_table_text_model, E_TYPE_TEXT_MODEL)
-
-/* Class initialization function for the text item */
-static void
-e_table_text_model_class_init (ETableTextModelClass *klass)
-{
-	GObjectClass *object_class;
-	ETextModelClass *model_class;
-
-	object_class = (GObjectClass *) klass;
-	model_class = (ETextModelClass *) klass;
-
-	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->dispose = e_table_text_model_dispose;
-}
-
-/* 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;
-}
-
-/* Dispose handler for the text item */
-static void
-e_table_text_model_dispose (GObject *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_return_if_fail (GTK_IS_OBJECT (model->model));
-
-	if (model->cell_changed_signal_id)
-		g_signal_handler_disconnect (model->model, 
-					     model->cell_changed_signal_id);
-	model->cell_changed_signal_id = 0;
-
-	if (model->row_changed_signal_id)
-		g_signal_handler_disconnect (model->model, 
-					     model->row_changed_signal_id);
-	model->row_changed_signal_id = 0;
-
-	if (model->model)
-		g_object_unref (model->model);
-	model->model = NULL;
-
-	if (G_OBJECT_CLASS (e_table_text_model_parent_class)->dispose)
-		(* G_OBJECT_CLASS (e_table_text_model_parent_class)->dispose) (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);
-		/* Can't use g_strdup_printf here because on some
-		   systems printf ("%.*s"); is locale dependent. */
-		temp = e_strdup_append_strings (temp, position,
-						text, -1,
-						temp + position, -1,
-						NULL);
-		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);
-		/* Can't use g_strdup_printf here because on some
-		   systems printf ("%.*s"); is locale dependent. */
-		temp = e_strdup_append_strings (temp, position,
-						text, length,
-						temp + position, -1,
-						NULL);
-		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);
-		/* Can't use g_strdup_printf here because on some
-		   systems printf ("%.*s"); is locale dependent. */
-		temp = e_strdup_append_strings (temp, position,
-						temp + position + length, -1,
-						NULL);
-		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 = g_object_new (E_TYPE_TABLE_TEXT_MODEL, NULL);
-	model->model = table_model;
-	if (model->model){
-		g_object_ref (model->model);
-		model->cell_changed_signal_id = 
-			g_signal_connect (model->model,
-					  "model_cell_changed",
-					  G_CALLBACK(cell_changed),
-					  model);
-		model->row_changed_signal_id = 
-			g_signal_connect (model->model,
-					  "model_row_changed",
-					  G_CALLBACK(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 2e2f1aab27..0000000000
--- a/widgets/text/e-table-text-model.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-table-text-model.h
- * Copyright 2000, 2001, Ximian, Inc.
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#ifndef E_TABLE_TEXT_MODEL_H
-#define E_TABLE_TEXT_MODEL_H
-
-#include <text/e-text-model.h>
-#include <table/e-table-model.h>
-
-G_BEGIN_DECLS
-
-#define E_TYPE_TABLE_TEXT_MODEL            (e_table_text_model_get_type ())
-#define E_TABLE_TEXT_MODEL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_TABLE_TEXT_MODEL, ETableTextModel))
-#define E_TABLE_TEXT_MODEL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_TABLE_TEXT_MODEL, ETableTextModelClass))
-#define E_IS_TABLE_TEXT_MODEL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_TABLE_TEXT_MODEL))
-#define E_IS_TABLE_TEXT_MODEL_CLASS(klass) (G_TYPE_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);
-
-G_END_DECLS
-
-#endif
diff --git a/widgets/text/e-text-model-uri.c b/widgets/text/e-text-model-uri.c
deleted file mode 100644
index 936851c5a8..0000000000
--- a/widgets/text/e-text-model-uri.c
+++ /dev/null
@@ -1,336 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-text-model-uri.c - a text model w/ clickable URIs
- * Copyright 2000, 2001, Ximian, Inc.
- *
- * Authors:
- *   Jon Trowbridge <trow@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#include <config.h>
-
-#include <ctype.h>
-#include <sys/types.h>
-#include <regex.h>
-
-#include <gtk/gtkmain.h>
-#include <libgnome/gnome-url.h>
-
-#include "e-util/e-util.h"
-
-#include "e-text-model-uri.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_dispose (GObject *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;
-};
-
-G_DEFINE_TYPE (ETextModelURI, e_text_model_uri, E_TYPE_TEXT_MODEL)
-	     
-static void
-e_text_model_uri_class_init (ETextModelURIClass *klass)
-{
-	GObjectClass *object_class;
-	ETextModelClass *model_class;
-
-	object_class = (GObjectClass *) klass;
-	model_class = E_TEXT_MODEL_CLASS (klass);
-
-	object_class->dispose = e_text_model_uri_dispose;
-
-	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_dispose (GObject *object)
-{
-	ETextModelURI *model_uri = E_TEXT_MODEL_URI (object);
-	GList *iter;
-
-	if (model_uri->objectify_idle) {
-		g_source_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 (G_OBJECT_CLASS (e_text_model_uri_parent_class)->dispose)
-		(* G_OBJECT_CLASS (e_text_model_uri_parent_class)->dispose) (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_return_val_if_fail (model_uri->objectify_idle, FALSE);
-	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 = g_idle_add (objectify_idle_cb, model);
-
-	if (E_TEXT_MODEL_CLASS(e_text_model_uri_parent_class)->objectify)
-		E_TEXT_MODEL_CLASS(e_text_model_uri_parent_class)->objectify (model);
-}
-
-static void
-objectify_idle_flush (ETextModelURI *model_uri)
-{
-	if (model_uri->objectify_idle) {
-		g_source_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 (e_text_model_uri_parent_class)->validate_pos)
-		pos = E_TEXT_MODEL_CLASS (e_text_model_uri_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, NULL);
-	g_free (obj_str);
-}
-
-ETextModel *
-e_text_model_uri_new (void)
-{
-	return E_TEXT_MODEL (g_object_new (E_TYPE_TEXT_MODEL_URI, NULL));
-}
-
-
-/* $Id$ */
diff --git a/widgets/text/e-text-model-uri.h b/widgets/text/e-text-model-uri.h
deleted file mode 100644
index 508d6f1d5b..0000000000
--- a/widgets/text/e-text-model-uri.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-text-model-uri.h - a text model w/ clickable URIs
- * Copyright 2000, 2001, Ximian, Inc.
- *
- * Authors:
- *   Jon Trowbridge <trow@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#ifndef E_TEXT_MODEL_URI_H
-#define E_TEXT_MODEL_URI_H
-
-#include <text/e-text-model.h>
-
-G_BEGIN_DECLS
-
-#define E_TYPE_TEXT_MODEL_URI            (e_text_model_uri_get_type ())
-#define E_TEXT_MODEL_URI(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_TEXT_MODEL_URI, ETextModelURI))
-#define E_TEXT_MODEL_URI_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_TEXT_MODEL_URI, ETextModelURIClass))
-#define E_IS_TEXT_MODEL_URI(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_TEXT_MODEL_URI))
-#define E_IS_TEXT_MODEL_URI_CLASS(klass) (G_TYPE_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);
-
-G_END_DECLS
-
-#endif
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index d4a18a6f9b..d76c608801 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -2199,7 +2199,7 @@ e_text_event (GnomeCanvasItem *item, GdkEvent *event)
 	gint return_val = 0;
 
 	if (!text->model)
-		return FALSE;
+		return 0;
 
 	e_tep_event.type = event->type;
 	switch (event->type) {
@@ -2289,7 +2289,7 @@ e_text_event (GnomeCanvasItem *item, GdkEvent *event)
 			button->time = event->key.time;
 			button->button = 0;
 			e_text_do_popup (text, button, 0);
-			return TRUE;
+			return 1;
 		}
 
 		/* Fall Through */
@@ -2387,7 +2387,7 @@ e_text_event (GnomeCanvasItem *item, GdkEvent *event)
 			if (text->handle_popup) {
 				e_text_do_popup (text, &(event->button),
 						 get_position_from_xy (text, event->button.x, event->button.y));
-				return TRUE;
+				return 1;
 			}
 			else {
 				break;