From 6a074300e533a82fb1a09b470724e54b155f8cd5 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sat, 26 Dec 2009 12:25:48 -0500
Subject: Rename ECalendarTable to ETaskTable.

Since ECalendarTable was only used for tasks anyway, and ETaskTable
pairs nicely with EMemoTable.
---
 calendar/gui/Makefile.am                     |    4 +-
 calendar/gui/e-calendar-table.c              | 1675 --------------------------
 calendar/gui/e-calendar-table.h              |  109 --
 calendar/gui/e-memo-table.c                  |    1 -
 calendar/gui/e-memo-table.h                  |   13 +-
 calendar/gui/e-task-table.c                  | 1674 +++++++++++++++++++++++++
 calendar/gui/e-task-table.h                  |  111 ++
 modules/calendar/e-cal-shell-content.c       |   42 +-
 modules/calendar/e-cal-shell-content.h       |    4 +-
 modules/calendar/e-cal-shell-view-private.c  |    2 +-
 modules/calendar/e-cal-shell-view-taskpad.c  |   48 +-
 modules/calendar/e-task-shell-content.c      |   25 +-
 modules/calendar/e-task-shell-content.h      |    4 +-
 modules/calendar/e-task-shell-view-actions.c |   52 +-
 modules/calendar/e-task-shell-view-private.c |   30 +-
 modules/calendar/e-task-shell-view.c         |    4 +-
 16 files changed, 1898 insertions(+), 1900 deletions(-)
 delete mode 100644 calendar/gui/e-calendar-table.c
 delete mode 100644 calendar/gui/e-calendar-table.h
 create mode 100644 calendar/gui/e-task-table.c
 create mode 100644 calendar/gui/e-task-table.h

diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index ea14f63278..7d2e1f564b 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -114,8 +114,6 @@ libevolution_calendar_la_SOURCES = \
 	e-cal-model-tasks.h			\
 	e-calendar-selector.c			\
 	e-calendar-selector.h			\
-	e-calendar-table.c			\
-	e-calendar-table.h			\
 	e-calendar-view.c			\
 	e-calendar-view.h			\
 	e-cell-date-edit-text.h			\
@@ -159,6 +157,8 @@ libevolution_calendar_la_SOURCES = \
 	e-select-names-renderer.h		\
 	e-task-list-selector.c			\
 	e-task-list-selector.h			\
+	e-task-table.c				\
+	e-task-table.h				\
 	e-week-view-event-item.c		\
 	e-week-view-event-item.h		\
 	e-week-view-layout.c			\
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
deleted file mode 100644
index 9ac534e333..0000000000
--- a/calendar/gui/e-calendar-table.c
+++ /dev/null
@@ -1,1675 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Authors:
- *		Damon Chaplin <damon@ximian.com>
- *		Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-/*
- * ECalendarTable - displays the ECalComponent objects in a table (an ETable).
- * Used for calendar events and tasks.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <sys/stat.h>
-#include <unistd.h>
-#include <glib/gi18n.h>
-#include <glib/gstdio.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-#include <misc/e-gui-utils.h>
-#include <misc/e-selectable.h>
-#include <table/e-cell-checkbox.h>
-#include <table/e-cell-toggle.h>
-#include <table/e-cell-text.h>
-#include <table/e-cell-combo.h>
-#include <table/e-cell-date.h>
-#include <e-util/e-binding.h>
-#include <e-util/e-selection.h>
-#include <e-util/e-dialog-utils.h>
-#include <e-util/e-util-private.h>
-#include <table/e-cell-date-edit.h>
-#include <table/e-cell-percent.h>
-#include <libecal/e-cal-time-util.h>
-#include <libedataserver/e-time-utils.h>
-
-#include "calendar-config.h"
-#include "dialogs/delete-comp.h"
-#include "dialogs/delete-error.h"
-#include "dialogs/task-editor.h"
-#include "e-cal-model-tasks.h"
-#include "e-calendar-table.h"
-#include "e-calendar-view.h"
-#include "e-cell-date-edit-text.h"
-#include "print.h"
-#include <e-util/e-icon-factory.h>
-#include "misc.h"
-
-#define E_CALENDAR_TABLE_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE \
-	((obj), E_TYPE_CALENDAR_TABLE, ECalendarTablePrivate))
-
-struct _ECalendarTablePrivate {
-	gpointer shell_view;  /* weak pointer */
-	ECalModel *model;
-};
-
-enum {
-	PROP_0,
-	PROP_MODEL,
-	PROP_SHELL_VIEW
-};
-
-enum {
-	OPEN_COMPONENT,
-	POPUP_EVENT,
-	STATUS_MESSAGE,
-	USER_CREATED,
-	LAST_SIGNAL
-};
-
-static struct tm e_calendar_table_get_current_time (ECellDateEdit *ecde, gpointer data);
-
-static gpointer parent_class;
-static guint signals[LAST_SIGNAL];
-
-/* The icons to represent the task. */
-#define NUM_ICONS 4
-static const gchar *icon_names[NUM_ICONS] = {
-	"stock_task",
-	"stock_task-recurring",
-	"stock_task-assigned",
-	"stock_task-assigned-to"
-};
-static GdkPixbuf *icon_pixbufs[NUM_ICONS] = { NULL };
-
-static void
-calendar_table_emit_open_component (ECalendarTable *cal_table,
-                                    ECalModelComponent *comp_data)
-{
-	guint signal_id = signals[OPEN_COMPONENT];
-
-	g_signal_emit (cal_table, signal_id, 0, comp_data);
-}
-
-static void
-calendar_table_emit_popup_event (ECalendarTable *cal_table,
-                                 GdkEvent *event)
-{
-	guint signal_id = signals[POPUP_EVENT];
-
-	g_signal_emit (cal_table, signal_id, 0, event);
-}
-
-static void
-calendar_table_emit_status_message (ECalendarTable *cal_table,
-                                    const gchar *message,
-                                    gdouble percent)
-{
-	guint signal_id = signals[STATUS_MESSAGE];
-
-	g_signal_emit (cal_table, signal_id, 0, message, percent);
-}
-
-static void
-calendar_table_emit_user_created (ECalendarTable *cal_table)
-{
-	guint signal_id = signals[USER_CREATED];
-
-	g_signal_emit (cal_table, signal_id, 0);
-}
-
-static gint
-calendar_table_date_compare_cb (gconstpointer a,
-                                gconstpointer b)
-{
-	ECellDateEditValue *dv1 = (ECellDateEditValue *) a;
-	ECellDateEditValue *dv2 = (ECellDateEditValue *) b;
-	struct icaltimetype tt;
-
-	/* First check if either is NULL. NULL dates sort last. */
-	if (!dv1 || !dv2) {
-		if (dv1 == dv2)
-			return 0;
-		else if (dv1)
-			return -1;
-		else
-			return 1;
-	}
-
-	/* Copy the 2nd value and convert it to the same timezone as the
-	   first. */
-	tt = dv2->tt;
-
-	icaltimezone_convert_time (&tt, dv2->zone, dv1->zone);
-
-	/* Now we can compare them. */
-
-	return icaltime_compare (dv1->tt, tt);
-}
-
-static gint
-calendar_table_percent_compare_cb (gconstpointer a,
-                                   gconstpointer b)
-{
-	gint percent1 = GPOINTER_TO_INT (a);
-	gint percent2 = GPOINTER_TO_INT (b);
-
-	return (percent1 < percent2) ? -1 : (percent1 > percent2);
-}
-
-static gint
-calendar_table_priority_compare_cb (gconstpointer a,
-                                    gconstpointer b)
-{
-	gint priority1, priority2;
-
-	priority1 = e_cal_util_priority_from_string ((const gchar *) a);
-	priority2 = e_cal_util_priority_from_string ((const gchar *) b);
-
-	/* We change undefined priorities so they appear after 'Low'. */
-	if (priority1 <= 0)
-		priority1 = 10;
-	if (priority2 <= 0)
-		priority2 = 10;
-
-	/* We'll just use the ordering of the priority values. */
-	return (priority1 < priority2) ? -1 : (priority1 > priority2);
-}
-
-static gint
-calendar_table_status_compare_cb (gconstpointer a,
-                                  gconstpointer b)
-{
-	const gchar *string_a = a;
-	const gchar *string_b = b;
-	gint status_a = -2;
-	gint status_b = -2;
-
-	if (string_a == NULL || *string_a == '\0')
-		status_a = -1;
-	else if (!g_utf8_collate (string_a, _("Not Started")))
-		status_a = 0;
-	else if (!g_utf8_collate (string_a, _("In Progress")))
-		status_a = 1;
-	else if (!g_utf8_collate (string_a, _("Completed")))
-		status_a = 2;
-	else if (!g_utf8_collate (string_a, _("Canceled")))
-		status_a = 3;
-
-	if (string_b == NULL || *string_b == '\0')
-		status_b = -1;
-	else if (!g_utf8_collate (string_b, _("Not Started")))
-		status_b = 0;
-	else if (!g_utf8_collate (string_b, _("In Progress")))
-		status_b = 1;
-	else if (!g_utf8_collate (string_b, _("Completed")))
-		status_b = 2;
-	else if (!g_utf8_collate (string_b, _("Canceled")))
-		status_b = 3;
-
-	return (status_a < status_b) ? -1 : (status_a > status_b);
-}
-
-static void
-calendar_table_model_cal_view_progress_cb (ECalendarTable *cal_table,
-                                           const gchar *message,
-                                           gint progress,
-                                           ECalSourceType type)
-{
-	gdouble percent = (gdouble) progress;
-
-	calendar_table_emit_status_message (cal_table, message, percent);
-}
-
-static void
-calendar_table_model_cal_view_done_cb (ECalendarTable *cal_table,
-                                       ECalendarStatus status,
-                                       ECalSourceType type)
-{
-	calendar_table_emit_status_message (cal_table, NULL, -1.0);
-}
-
-/* Deletes all of the selected components in the table */
-static void
-delete_selected_components (ECalendarTable *cal_table)
-{
-	GSList *objs, *l;
-	const gchar *status_message;
-
-	objs = e_calendar_table_get_selected (cal_table);
-
-	status_message = _("Deleting selected objects");
-	calendar_table_emit_status_message (cal_table, status_message, -1.0);
-
-	for (l = objs; l; l = l->next) {
-		ECalModelComponent *comp_data = (ECalModelComponent *) l->data;
-		GError *error = NULL;
-
-		e_cal_remove_object (comp_data->client,
-				     icalcomponent_get_uid (comp_data->icalcomp), &error);
-		delete_error_dialog (error, E_CAL_COMPONENT_TODO);
-		g_clear_error (&error);
-	}
-
-	calendar_table_emit_status_message (cal_table, NULL, -1.0);
-
-	g_slist_free (objs);
-}
-static void
-calendar_table_set_model (ECalendarTable *cal_table,
-                          ECalModel *model)
-{
-	g_return_if_fail (cal_table->priv->model == NULL);
-
-	cal_table->priv->model = g_object_ref (model);
-
-	g_signal_connect_swapped (
-		model, "row_appended",
-		G_CALLBACK (calendar_table_emit_user_created), cal_table);
-
-	g_signal_connect_swapped (
-		model, "cal-view-progress",
-		G_CALLBACK (calendar_table_model_cal_view_progress_cb),
-		cal_table);
-
-	g_signal_connect_swapped (
-		model, "cal-view-done",
-		G_CALLBACK (calendar_table_model_cal_view_done_cb),
-		cal_table);
-}
-
-static void
-calendar_table_set_shell_view (ECalendarTable *cal_table,
-                               EShellView *shell_view)
-{
-	g_return_if_fail (cal_table->priv->shell_view == NULL);
-
-	cal_table->priv->shell_view = shell_view;
-
-	g_object_add_weak_pointer (
-		G_OBJECT (shell_view),
-		&cal_table->priv->shell_view);
-}
-
-static void
-calendar_table_set_property (GObject *object,
-                             guint property_id,
-                             const GValue *value,
-                             GParamSpec *pspec)
-{
-	switch (property_id) {
-		case PROP_MODEL:
-			calendar_table_set_model (
-				E_CALENDAR_TABLE (object),
-				g_value_get_object (value));
-			return;
-
-		case PROP_SHELL_VIEW:
-			calendar_table_set_shell_view (
-				E_CALENDAR_TABLE (object),
-				g_value_get_object (value));
-			return;
-	}
-
-	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-}
-
-static void
-calendar_table_get_property (GObject *object,
-                             guint property_id,
-                             GValue *value,
-                             GParamSpec *pspec)
-{
-	switch (property_id) {
-		case PROP_MODEL:
-			g_value_set_object (
-				value, e_calendar_table_get_model (
-				E_CALENDAR_TABLE (object)));
-			return;
-
-		case PROP_SHELL_VIEW:
-			g_value_set_object (
-				value, e_calendar_table_get_shell_view (
-				E_CALENDAR_TABLE (object)));
-			return;
-	}
-
-	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-}
-
-static void
-calendar_table_dispose (GObject *object)
-{
-	ECalendarTablePrivate *priv;
-
-	priv = E_CALENDAR_TABLE_GET_PRIVATE (object);
-
-	if (priv->shell_view != NULL) {
-		g_object_remove_weak_pointer (
-			G_OBJECT (priv->shell_view), &priv->shell_view);
-		priv->shell_view = NULL;
-	}
-
-	if (priv->model != NULL) {
-		g_object_unref (priv->model);
-		priv->model = NULL;
-	}
-
-	/* Chain up to parent's dispose() method. */
-	G_OBJECT_CLASS (parent_class)->dispose (object);
-}
-
-static void
-calendar_table_constructed (GObject *object)
-{
-	ECalendarTable *cal_table;
-	ECalModel *model;
-	ECell *cell, *popup_cell;
-	ETableExtras *extras;
-	gint i;
-	GdkPixbuf *pixbuf;
-	GList *strings;
-	AtkObject *a11y;
-	gchar *etspecfile;
-
-	cal_table = E_CALENDAR_TABLE (object);
-	model = e_calendar_table_get_model (cal_table);
-
-	/* Create the header columns */
-
-	extras = e_table_extras_new ();
-
-	/*
-	 * Normal string fields.
-	 */
-	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
-	g_object_set (cell,
-		      "strikeout_column", E_CAL_MODEL_TASKS_FIELD_STRIKEOUT,
-		      "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE,
-		      "bg_color_column", E_CAL_MODEL_FIELD_COLOR,
-		      NULL);
-
-	e_table_extras_add_cell (extras, "calstring", cell);
-
-	/*
-	 * Date fields.
-	 */
-	cell = e_cell_date_edit_text_new (NULL, GTK_JUSTIFY_LEFT);
-	g_object_set (cell,
-		      "strikeout_column", E_CAL_MODEL_TASKS_FIELD_STRIKEOUT,
-		      "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE,
-		      "bg_color_column", E_CAL_MODEL_FIELD_COLOR,
-		      NULL);
-
-	e_mutual_binding_new (
-		model, "timezone",
-		cell, "timezone");
-
-	e_mutual_binding_new (
-		model, "use-24-hour-format",
-		cell, "use-24-hour-format");
-
-	popup_cell = e_cell_date_edit_new ();
-	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);
-	g_object_unref (cell);
-
-	e_mutual_binding_new (
-		model, "use-24-hour-format",
-		popup_cell, "use-24-hour-format");
-
-	e_table_extras_add_cell (extras, "dateedit", popup_cell);
-	cal_table->dates_cell = E_CELL_DATE_EDIT (popup_cell);
-
-	e_cell_date_edit_set_get_time_callback (
-		E_CELL_DATE_EDIT (popup_cell),
-		e_calendar_table_get_current_time, cal_table, NULL);
-
-	/*
-	 * Combo fields.
-	 */
-
-	/* Classification field. */
-	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
-	g_object_set (cell,
-		      "strikeout_column", E_CAL_MODEL_TASKS_FIELD_STRIKEOUT,
-		      "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE,
-		      "bg_color_column", E_CAL_MODEL_FIELD_COLOR,
-		      "editable", FALSE,
-		      NULL);
-
-	popup_cell = e_cell_combo_new ();
-	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);
-	g_object_unref (cell);
-
-	strings = NULL;
-	strings = g_list_append (strings, (gchar *) _("Public"));
-	strings = g_list_append (strings, (gchar *) _("Private"));
-	strings = g_list_append (strings, (gchar *) _("Confidential"));
-	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),
-					  strings);
-
-	e_table_extras_add_cell (extras, "classification", popup_cell);
-
-	/* Priority field. */
-	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
-	g_object_set (G_OBJECT (cell),
-		      "strikeout_column", E_CAL_MODEL_TASKS_FIELD_STRIKEOUT,
-		      "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE,
-		      "bg_color_column", E_CAL_MODEL_FIELD_COLOR,
-		      "editable", FALSE,
-		      NULL);
-
-	popup_cell = e_cell_combo_new ();
-	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);
-	g_object_unref (cell);
-
-	strings = NULL;
-	strings = g_list_append (strings, (gchar *) _("High"));
-	strings = g_list_append (strings, (gchar *) _("Normal"));
-	strings = g_list_append (strings, (gchar *) _("Low"));
-	strings = g_list_append (strings, (gchar *) _("Undefined"));
-	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),
-					  strings);
-
-	e_table_extras_add_cell (extras, "priority", popup_cell);
-
-	/* Percent field. */
-	cell = e_cell_percent_new (NULL, GTK_JUSTIFY_LEFT);
-	g_object_set (G_OBJECT (cell),
-		      "strikeout_column", E_CAL_MODEL_TASKS_FIELD_STRIKEOUT,
-		      "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE,
-		      "bg_color_column", E_CAL_MODEL_FIELD_COLOR,
-		      NULL);
-
-	popup_cell = e_cell_combo_new ();
-	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);
-	g_object_unref (cell);
-
-	strings = NULL;
-	strings = g_list_append (strings, (gchar *) _("0%"));
-	strings = g_list_append (strings, (gchar *) _("10%"));
-	strings = g_list_append (strings, (gchar *) _("20%"));
-	strings = g_list_append (strings, (gchar *) _("30%"));
-	strings = g_list_append (strings, (gchar *) _("40%"));
-	strings = g_list_append (strings, (gchar *) _("50%"));
-	strings = g_list_append (strings, (gchar *) _("60%"));
-	strings = g_list_append (strings, (gchar *) _("70%"));
-	strings = g_list_append (strings, (gchar *) _("80%"));
-	strings = g_list_append (strings, (gchar *) _("90%"));
-	strings = g_list_append (strings, (gchar *) _("100%"));
-	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),
-					  strings);
-
-	e_table_extras_add_cell (extras, "percent", popup_cell);
-
-	/* Transparency field. */
-	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
-	g_object_set (G_OBJECT (cell),
-		      "strikeout_column", E_CAL_MODEL_TASKS_FIELD_STRIKEOUT,
-		      "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE,
-		      "bg_color_column", E_CAL_MODEL_FIELD_COLOR,
-		      "editable", FALSE,
-		      NULL);
-
-	popup_cell = e_cell_combo_new ();
-	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);
-	g_object_unref (cell);
-
-	strings = NULL;
-	strings = g_list_append (strings, (gchar *) _("Free"));
-	strings = g_list_append (strings, (gchar *) _("Busy"));
-	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),
-					  strings);
-
-	e_table_extras_add_cell (extras, "transparency", popup_cell);
-
-	/* Status field. */
-	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
-	g_object_set (G_OBJECT (cell),
-		      "strikeout_column", E_CAL_MODEL_TASKS_FIELD_STRIKEOUT,
-		      "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE,
-		      "bg_color_column", E_CAL_MODEL_FIELD_COLOR,
-		      "editable", FALSE,
-		      NULL);
-
-	popup_cell = e_cell_combo_new ();
-	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);
-	g_object_unref (cell);
-
-	strings = NULL;
-	strings = g_list_append (strings, (gchar *) _("Not Started"));
-	strings = g_list_append (strings, (gchar *) _("In Progress"));
-	strings = g_list_append (strings, (gchar *) _("Completed"));
-	strings = g_list_append (strings, (gchar *) _("Canceled"));
-	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),
-					  strings);
-
-	e_table_extras_add_cell (extras, "calstatus", popup_cell);
-
-	e_table_extras_add_compare (extras, "date-compare",
-				    calendar_table_date_compare_cb);
-	e_table_extras_add_compare (extras, "percent-compare",
-				    calendar_table_percent_compare_cb);
-	e_table_extras_add_compare (extras, "priority-compare",
-				    calendar_table_priority_compare_cb);
-	e_table_extras_add_compare (extras, "status-compare",
-				    calendar_table_status_compare_cb);
-
-	/* Create pixmaps */
-
-	if (!icon_pixbufs[0])
-		for (i = 0; i < NUM_ICONS; i++) {
-			icon_pixbufs[i] = e_icon_factory_get_icon (icon_names[i], GTK_ICON_SIZE_MENU);
-		}
-
-	cell = e_cell_toggle_new (0, NUM_ICONS, icon_pixbufs);
-	e_table_extras_add_cell(extras, "icon", cell);
-	e_table_extras_add_pixbuf(extras, "icon", icon_pixbufs[0]);
-
-	pixbuf = e_icon_factory_get_icon ("stock_check-filled", GTK_ICON_SIZE_MENU);
-	e_table_extras_add_pixbuf(extras, "complete", pixbuf);
-	g_object_unref(pixbuf);
-
-	/* set proper format component for a default 'date' cell renderer */
-	cell = e_table_extras_get_cell (extras, "date");
-	e_cell_date_set_format_component (E_CELL_DATE (cell), "calendar");
-
-	/* Create the table */
-
-	etspecfile = g_build_filename (
-		EVOLUTION_ETSPECDIR, "e-calendar-table.etspec", NULL);
-	e_table_construct_from_spec_file (
-		E_TABLE (cal_table), E_TABLE_MODEL (model),
-		extras, etspecfile, NULL);
-	g_free (etspecfile);
-
-	gtk_widget_set_has_tooltip (GTK_WIDGET (cal_table), TRUE);
-
-	a11y = gtk_widget_get_accessible (GTK_WIDGET (cal_table));
-	if (a11y)
-		atk_object_set_name (a11y, _("Tasks"));
-}
-
-static gboolean
-calendar_table_popup_menu (GtkWidget *widget)
-{
-	ECalendarTable *cal_table;
-
-	cal_table = E_CALENDAR_TABLE (widget);
-	calendar_table_emit_popup_event (cal_table, NULL);
-
-	return TRUE;
-}
-
-static gboolean
-calendar_table_query_tooltip (GtkWidget *widget,
-                              gint x,
-                              gint y,
-                              gboolean keyboard_mode,
-                              GtkTooltip *tooltip)
-{
-	ECalendarTable *cal_table;
-	ECalModel *model;
-	ECalModelComponent *comp_data;
-	gint row = -1, col = -1;
-	GtkWidget *box, *l, *w;
-	GtkStyle *style = gtk_widget_get_default_style ();
-	gchar *tmp;
-	const gchar *str;
-	GString *tmp2;
-	gchar buff[1001];
-	gboolean free_text = FALSE;
-	gboolean use_24_hour_format;
-	ECalComponent *new_comp;
-	ECalComponentOrganizer organizer;
-	ECalComponentDateTime dtstart, dtdue;
-	icalcomponent *clone;
-	icaltimezone *zone, *default_zone;
-	GSList *desc, *p;
-	gint len;
-	ESelectionModel *esm;
-	struct tm tmp_tm;
-
-	if (keyboard_mode)
-		return FALSE;
-
-	cal_table = E_CALENDAR_TABLE (widget);
-
-	e_table_get_mouse_over_cell (E_TABLE (cal_table), &row, &col);
-	if (row == -1)
-		return FALSE;
-
-	/* Respect sorting option; the 'e_table_get_mouse_over_cell'
-	 * returns sorted row, not the model one. */
-	esm = e_table_get_selection_model (E_TABLE (cal_table));
-	if (esm && esm->sorter && e_sorter_needs_sorting (esm->sorter))
-		row = e_sorter_sorted_to_model (esm->sorter, row);
-
-	model = e_calendar_table_get_model (cal_table);
-	comp_data = e_cal_model_get_component_at (model, row);
-	if (!comp_data || !comp_data->icalcomp)
-		return FALSE;
-
-	new_comp = e_cal_component_new ();
-	clone = icalcomponent_new_clone (comp_data->icalcomp);
-	if (!e_cal_component_set_icalcomponent (new_comp, clone)) {
-		g_object_unref (new_comp);
-		return FALSE;
-	}
-
-	box = gtk_vbox_new (FALSE, 0);
-
-	str = e_calendar_view_get_icalcomponent_summary (
-		comp_data->client, comp_data->icalcomp, &free_text);
-	if (!(str && *str)) {
-		if (free_text)
-			g_free ((gchar *)str);
-		free_text = FALSE;
-		str = _("* No Summary *");
-	}
-
-	l = gtk_label_new (NULL);
-	tmp = g_markup_printf_escaped ("<b>%s</b>", str);
-	gtk_label_set_line_wrap (GTK_LABEL (l), TRUE);
-	gtk_label_set_markup (GTK_LABEL (l), tmp);
-	gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
-	w = gtk_event_box_new ();
-
-	gtk_widget_modify_bg (w, GTK_STATE_NORMAL, &(style->bg[GTK_STATE_SELECTED]));
-	gtk_widget_modify_fg (l, GTK_STATE_NORMAL, &(style->text[GTK_STATE_SELECTED]));
-	gtk_container_add (GTK_CONTAINER (w), l);
-	gtk_box_pack_start (GTK_BOX (box), w, TRUE, TRUE, 0);
-	g_free (tmp);
-
-	if (free_text)
-		g_free ((gchar *)str);
-	free_text = FALSE;
-
-	w = gtk_event_box_new ();
-	gtk_widget_modify_bg (w, GTK_STATE_NORMAL, &(style->bg[GTK_STATE_NORMAL]));
-
-	l = gtk_vbox_new (FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (w), l);
-	gtk_box_pack_start (GTK_BOX (box), w, FALSE, FALSE, 0);
-	w = l;
-
-	e_cal_component_get_organizer (new_comp, &organizer);
-	if (organizer.cn) {
-		gchar *ptr;
-		ptr = strchr( organizer.value, ':');
-
-		if (ptr) {
-			ptr++;
-			/* To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>" */
-			tmp = g_strdup_printf (_("Organizer: %s <%s>"), organizer.cn, ptr);
-		} else {
-			/* With SunOne accounts, there may be no ':' in organiser.value */
-			tmp = g_strdup_printf (_("Organizer: %s"), organizer.cn);
-		}
-
-		l = gtk_label_new (tmp);
-		gtk_label_set_line_wrap (GTK_LABEL (l), FALSE);
-		gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
-		gtk_box_pack_start (GTK_BOX (w), l, FALSE, FALSE, 0);
-		g_free (tmp);
-	}
-
-	e_cal_component_get_dtstart (new_comp, &dtstart);
-	e_cal_component_get_due (new_comp, &dtdue);
-
-	default_zone = e_cal_model_get_timezone (model);
-	use_24_hour_format = e_cal_model_get_use_24_hour_format (model);
-
-	if (dtstart.tzid) {
-		zone = icalcomponent_get_timezone (e_cal_component_get_icalcomponent (new_comp), dtstart.tzid);
-		if (!zone)
-			e_cal_get_timezone (
-				comp_data->client, dtstart.tzid, &zone, NULL);
-		if (!zone)
-			zone = default_zone;
-	} else {
-		zone = NULL;
-	}
-
-	tmp2 = g_string_new ("");
-
-	if (dtstart.value) {
-		buff[0] = 0;
-
-		tmp_tm = icaltimetype_to_tm_with_zone (
-			dtstart.value, zone, default_zone);
-		e_time_format_date_and_time (
-			&tmp_tm, use_24_hour_format,
-			FALSE, FALSE, buff, 1000);
-
-		if (buff [0]) {
-			g_string_append (tmp2, _("Start: "));
-			g_string_append (tmp2, buff);
-		}
-	}
-
-	if (dtdue.value) {
-		buff[0] = 0;
-
-		tmp_tm = icaltimetype_to_tm_with_zone (
-			dtdue.value, zone, default_zone);
-		e_time_format_date_and_time (
-			&tmp_tm, use_24_hour_format,
-			FALSE, FALSE, buff, 1000);
-
-		if (buff [0]) {
-			if (tmp2->len)
-				g_string_append (tmp2, "; ");
-
-			g_string_append (tmp2, _("Due: "));
-			g_string_append (tmp2, buff);
-		}
-	}
-
-	if (tmp2->len) {
-		l = gtk_label_new (tmp2->str);
-		gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
-		gtk_box_pack_start (GTK_BOX (w), l, FALSE, FALSE, 0);
-	}
-
-	g_string_free (tmp2, TRUE);
-
-	e_cal_component_free_datetime (&dtstart);
-	e_cal_component_free_datetime (&dtdue);
-
-	tmp = e_calendar_view_get_attendees_status_info (
-		new_comp, comp_data->client);
-	if (tmp) {
-		l = gtk_label_new (tmp);
-		gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
-		gtk_box_pack_start (GTK_BOX (w), l, FALSE, FALSE, 0);
-
-		g_free (tmp);
-		tmp = NULL;
-	}
-
-	tmp2 = g_string_new ("");
-	e_cal_component_get_description_list (new_comp, &desc);
-	for (len = 0, p = desc; p != NULL; p = p->next) {
-		ECalComponentText *text = p->data;
-
-		if (text->value != NULL) {
-			len += strlen (text->value);
-			g_string_append (tmp2, text->value);
-			if (len > 1024) {
-				g_string_set_size (tmp2, 1020);
-				g_string_append (tmp2, "...");
-				break;
-			}
-		}
-	}
-	e_cal_component_free_text_list (desc);
-
-	if (tmp2->len) {
-		l = gtk_label_new (tmp2->str);
-		gtk_label_set_line_wrap (GTK_LABEL (l), TRUE);
-		gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
-		gtk_box_pack_start (GTK_BOX (box), l, FALSE, FALSE, 0);
-	}
-
-	g_string_free (tmp2, TRUE);
-
-	gtk_widget_show_all (box);
-	gtk_tooltip_set_custom (tooltip, box);
-
-	g_object_unref (new_comp);
-
-	return TRUE;
-}
-
-static void
-calendar_table_double_click (ETable *table,
-                             gint row,
-                             gint col,
-                             GdkEvent *event)
-{
-	ECalendarTable *cal_table;
-	ECalModel *model;
-	ECalModelComponent *comp_data;
-
-	cal_table = E_CALENDAR_TABLE (table);
-	model = e_calendar_table_get_model (cal_table);
-	comp_data = e_cal_model_get_component_at (model, row);
-	calendar_table_emit_open_component (cal_table, comp_data);
-}
-
-static gint
-calendar_table_right_click (ETable *table,
-                            gint row,
-                            gint col,
-                            GdkEvent *event)
-{
-	ECalendarTable *cal_table;
-
-	cal_table = E_CALENDAR_TABLE (table);
-	calendar_table_emit_popup_event (cal_table, event);
-
-	return TRUE;
-}
-
-static void
-calendar_table_update_actions (ESelectable *selectable,
-                               EFocusTracker *focus_tracker,
-                               GdkAtom *clipboard_targets,
-                               gint n_clipboard_targets)
-{
-	ECalendarTable *cal_table;
-	GtkAction *action;
-	GSList *list, *iter;
-	gboolean sources_are_editable = TRUE;
-	gboolean clipboard_has_calendar;
-	gboolean sensitive;
-	const gchar *tooltip;
-	gint n_selected;
-
-	cal_table = E_CALENDAR_TABLE (selectable);
-	n_selected = e_table_selected_count (E_TABLE (cal_table));
-
-	list = e_calendar_table_get_selected (cal_table);
-	for (iter = list; iter != NULL; iter = iter->next) {
-		ECalModelComponent *comp_data = iter->data;
-		gboolean read_only;
-
-		e_cal_is_read_only (comp_data->client, &read_only, NULL);
-		sources_are_editable &= !read_only;
-	}
-	g_slist_free (list);
-
-	clipboard_has_calendar = (clipboard_targets != NULL) &&
-		e_targets_include_calendar (
-		clipboard_targets, n_clipboard_targets);
-
-	action = e_focus_tracker_get_cut_clipboard_action (focus_tracker);
-	sensitive = (n_selected > 0) && sources_are_editable;
-	tooltip = _("Cut selected tasks to the clipboard");
-	gtk_action_set_sensitive (action, sensitive);
-	gtk_action_set_tooltip (action, tooltip);
-
-	action = e_focus_tracker_get_copy_clipboard_action (focus_tracker);
-	sensitive = (n_selected > 0);
-	tooltip = _("Copy selected tasks to the clipboard");
-	gtk_action_set_sensitive (action, sensitive);
-	gtk_action_set_tooltip (action, tooltip);
-
-	action = e_focus_tracker_get_paste_clipboard_action (focus_tracker);
-	sensitive = sources_are_editable && clipboard_has_calendar;
-	tooltip = _("Paste tasks from the clipboard");
-	gtk_action_set_sensitive (action, sensitive);
-	gtk_action_set_tooltip (action, tooltip);
-
-	action = e_focus_tracker_get_select_all_action (focus_tracker);
-	sensitive = TRUE;
-	tooltip = _("Select all visible tasks");
-	gtk_action_set_sensitive (action, sensitive);
-	gtk_action_set_tooltip (action, tooltip);
-}
-
-static void
-calendar_table_cut_clipboard (ESelectable *selectable)
-{
-	ECalendarTable *cal_table;
-
-	cal_table = E_CALENDAR_TABLE (selectable);
-
-	e_selectable_copy_clipboard (selectable);
-	delete_selected_components (cal_table);
-}
-
-/* Helper for calendar_table_copy_clipboard() */
-static void
-copy_row_cb (gint model_row, gpointer data)
-{
-	ECalendarTable *cal_table;
-	ECalModelComponent *comp_data;
-	ECalModel *model;
-	gchar *comp_str;
-	icalcomponent *child;
-
-	cal_table = E_CALENDAR_TABLE (data);
-
-	g_return_if_fail (cal_table->tmp_vcal != NULL);
-
-	model = e_calendar_table_get_model (cal_table);
-	comp_data = e_cal_model_get_component_at (model, model_row);
-	if (!comp_data)
-		return;
-
-	/* Add timezones to the VCALENDAR component. */
-	e_cal_util_add_timezones_from_component (
-		cal_table->tmp_vcal, comp_data->icalcomp);
-
-	/* Add the new component to the VCALENDAR component. */
-	comp_str = icalcomponent_as_ical_string_r (comp_data->icalcomp);
-	child = icalparser_parse_string (comp_str);
-	if (child) {
-		icalcomponent_add_component (
-			cal_table->tmp_vcal,
-			icalcomponent_new_clone (child));
-		icalcomponent_free (child);
-	}
-	g_free (comp_str);
-}
-
-static void
-calendar_table_copy_clipboard (ESelectable *selectable)
-{
-	ECalendarTable *cal_table;
-	GtkClipboard *clipboard;
-	gchar *comp_str;
-
-	cal_table = E_CALENDAR_TABLE (selectable);
-
-	/* Create a temporary VCALENDAR object. */
-	cal_table->tmp_vcal = e_cal_util_new_top_level ();
-
-	e_table_selected_row_foreach (
-		E_TABLE (cal_table), copy_row_cb, cal_table);
-	comp_str = icalcomponent_as_ical_string_r (cal_table->tmp_vcal);
-
-	clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
-	e_clipboard_set_calendar (clipboard, comp_str, -1);
-	gtk_clipboard_store (clipboard);
-
-	g_free (comp_str);
-
-	icalcomponent_free (cal_table->tmp_vcal);
-	cal_table->tmp_vcal = NULL;
-}
-
-/* Helper for calenable_table_paste_clipboard() */
-static void
-clipboard_get_calendar_data (ECalendarTable *cal_table,
-                             const gchar *text)
-{
-	icalcomponent *icalcomp;
-	gchar *uid;
-	ECalComponent *comp;
-	ECalModel *model;
-	ECal *client;
-	icalcomponent_kind kind;
-	const gchar *status_message;
-
-	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));
-
-	if (!text || !*text)
-		return;
-
-	icalcomp = icalparser_parse_string (text);
-	if (!icalcomp)
-		return;
-
-	/* check the type of the component */
-	kind = icalcomponent_isa (icalcomp);
-	if (kind != ICAL_VCALENDAR_COMPONENT &&
-	    kind != ICAL_VEVENT_COMPONENT &&
-	    kind != ICAL_VTODO_COMPONENT &&
-	    kind != ICAL_VJOURNAL_COMPONENT) {
-		return;
-	}
-
-	model = e_calendar_table_get_model (cal_table);
-	client = e_cal_model_get_default_client (model);
-
-	status_message = _("Updating objects");
-	calendar_table_emit_status_message (cal_table, status_message, -1.0);
-
-	if (kind == ICAL_VCALENDAR_COMPONENT) {
-		icalcomponent_kind child_kind;
-		icalcomponent *subcomp;
-		icalcomponent *vcal_comp;
-
-		vcal_comp = icalcomp;
-		subcomp = icalcomponent_get_first_component (
-			vcal_comp, ICAL_ANY_COMPONENT);
-		while (subcomp) {
-			child_kind = icalcomponent_isa (subcomp);
-			if (child_kind == ICAL_VEVENT_COMPONENT ||
-			    child_kind == ICAL_VTODO_COMPONENT ||
-			    child_kind == ICAL_VJOURNAL_COMPONENT) {
-				ECalComponent *tmp_comp;
-
-				uid = e_cal_component_gen_uid ();
-				tmp_comp = e_cal_component_new ();
-				e_cal_component_set_icalcomponent (
-					tmp_comp,
-					icalcomponent_new_clone (subcomp));
-				e_cal_component_set_uid (tmp_comp, uid);
-				free (uid);
-
-				/* FIXME should we convert start/due/complete
-				 * times?  Also, need error handling. */
-				e_cal_create_object (
-					client, e_cal_component_get_icalcomponent (tmp_comp),
-					NULL, NULL);
-
-				g_object_unref (tmp_comp);
-			}
-			subcomp = icalcomponent_get_next_component (
-				vcal_comp, ICAL_ANY_COMPONENT);
-		}
-	} else {
-		comp = e_cal_component_new ();
-		e_cal_component_set_icalcomponent (comp, icalcomp);
-		uid = e_cal_component_gen_uid ();
-		e_cal_component_set_uid (comp, (const gchar *) uid);
-		free (uid);
-
-		e_cal_create_object (
-			client, e_cal_component_get_icalcomponent (comp),
-			NULL, NULL);
-
-		g_object_unref (comp);
-	}
-
-	calendar_table_emit_status_message (cal_table, NULL, -1.0);
-}
-
-static void
-calendar_table_paste_clipboard (ESelectable *selectable)
-{
-	ECalendarTable *cal_table;
-	GtkClipboard *clipboard;
-	GnomeCanvasItem *item;
-	GnomeCanvas *table_canvas;
-
-	cal_table = E_CALENDAR_TABLE (selectable);
-
-	clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
-
-	table_canvas = E_TABLE (cal_table)->table_canvas;
-	item = table_canvas->focused_item;
-
-	/* XXX Should ECellText implement GtkEditable? */
-
-	/* Paste text into a cell being edited. */
-	if (gtk_clipboard_wait_is_text_available (clipboard) &&
-		GTK_WIDGET_HAS_FOCUS (table_canvas) &&
-		E_IS_TABLE_ITEM (item) &&
-		E_TABLE_ITEM (item)->editing_col >= 0 &&
-		E_TABLE_ITEM (item)->editing_row >= 0) {
-
-		ETableItem *etable_item = E_TABLE_ITEM (item);
-
-		e_cell_text_paste_clipboard (
-			etable_item->cell_views[etable_item->editing_col],
-			etable_item->editing_col,
-			etable_item->editing_row);
-
-	/* Paste iCalendar data into the table. */
-	} else if (e_clipboard_wait_is_calendar_available (clipboard)) {
-		gchar *calendar_source;
-
-		calendar_source = e_clipboard_wait_for_calendar (clipboard);
-		clipboard_get_calendar_data (cal_table, calendar_source);
-		g_free (calendar_source);
-	}
-}
-
-static void
-calendar_table_select_all (ESelectable *selectable)
-{
-	e_table_select_all (E_TABLE (selectable));
-}
-
-static void
-calendar_table_class_init (ECalendarTableClass *class)
-{
-	GObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	ETableClass *table_class;
-
-	parent_class = g_type_class_peek_parent (class);
-	g_type_class_add_private (class, sizeof (ECalendarTablePrivate));
-
-	object_class = G_OBJECT_CLASS (class);
-	object_class->set_property = calendar_table_set_property;
-	object_class->get_property = calendar_table_get_property;
-	object_class->dispose = calendar_table_dispose;
-	object_class->constructed = calendar_table_constructed;
-
-	widget_class = GTK_WIDGET_CLASS (class);
-	widget_class->popup_menu = calendar_table_popup_menu;
-	widget_class->query_tooltip = calendar_table_query_tooltip;
-
-	table_class = E_TABLE_CLASS (class);
-	table_class->double_click = calendar_table_double_click;
-	table_class->right_click = calendar_table_right_click;
-
-	g_object_class_install_property (
-		object_class,
-		PROP_MODEL,
-		g_param_spec_object (
-			"model",
-			_("Model"),
-			NULL,
-			E_TYPE_CAL_MODEL,
-			G_PARAM_READWRITE |
-			G_PARAM_CONSTRUCT_ONLY));
-
-	g_object_class_install_property (
-		object_class,
-		PROP_SHELL_VIEW,
-		g_param_spec_object (
-			"shell-view",
-			_("Shell View"),
-			NULL,
-			E_TYPE_SHELL_VIEW,
-			G_PARAM_READWRITE |
-			G_PARAM_CONSTRUCT_ONLY));
-
-	signals[OPEN_COMPONENT] = g_signal_new (
-		"open-component",
-		G_TYPE_FROM_CLASS (class),
-		G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-		G_STRUCT_OFFSET (ECalendarTableClass, open_component),
-		NULL, NULL,
-		g_cclosure_marshal_VOID__OBJECT,
-		G_TYPE_NONE, 1,
-		E_TYPE_CAL_MODEL_COMPONENT);
-
-	signals[POPUP_EVENT] = g_signal_new (
-		"popup-event",
-		G_TYPE_FROM_CLASS (class),
-		G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-		G_STRUCT_OFFSET (ECalendarTableClass, popup_event),
-		NULL, NULL,
-		g_cclosure_marshal_VOID__BOXED,
-		G_TYPE_NONE, 1,
-		GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
-
-	signals[STATUS_MESSAGE] = g_signal_new (
-		"status-message",
-		G_TYPE_FROM_CLASS (class),
-		G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-		G_STRUCT_OFFSET (ECalendarTableClass, status_message),
-		NULL, NULL,
-		e_marshal_VOID__STRING_DOUBLE,
-		G_TYPE_NONE, 2,
-		G_TYPE_STRING, G_TYPE_DOUBLE);
-
-	signals[USER_CREATED] = g_signal_new (
-		"user-created",
-		G_TYPE_FROM_CLASS (class),
-		G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-		G_STRUCT_OFFSET (ECalendarTableClass, user_created),
-		NULL, NULL,
-		g_cclosure_marshal_VOID__VOID,
-		G_TYPE_NONE, 0);
-}
-
-static void
-calendar_table_init (ECalendarTable *cal_table)
-{
-	cal_table->priv = E_CALENDAR_TABLE_GET_PRIVATE (cal_table);
-}
-
-static void
-calendar_table_selectable_init (ESelectableInterface *interface)
-{
-	interface->update_actions = calendar_table_update_actions;
-	interface->cut_clipboard = calendar_table_cut_clipboard;
-	interface->copy_clipboard = calendar_table_copy_clipboard;
-	interface->paste_clipboard = calendar_table_paste_clipboard;
-	interface->select_all = calendar_table_select_all;
-}
-
-GType
-e_calendar_table_get_type (void)
-{
-	static GType type = 0;
-
-	if (G_UNLIKELY (type == 0)) {
-		static const GTypeInfo type_info = {
-			sizeof (ECalendarTableClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) calendar_table_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL,  /* class_data */
-			sizeof (ECalendarTable),
-			0,     /* n_preallocs */
-			(GInstanceInitFunc) calendar_table_init,
-			NULL   /* value_table */
-		};
-
-		static const GInterfaceInfo selectable_info = {
-			(GInterfaceInitFunc) calendar_table_selectable_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL   /* interface_data */
-		};
-
-		type = g_type_register_static (
-			E_TABLE_TYPE, "ECalendarTable", &type_info, 0);
-
-		g_type_add_interface_static (
-			type, E_TYPE_SELECTABLE, &selectable_info);
-	}
-
-	return type;
-}
-
-/**
- * e_calendar_table_new:
- * @shell_view: an #EShellView
- * @model: an #ECalModel for the table
- *
- * Returns a new #ECalendarTable.
- *
- * Returns: a new #ECalendarTable
- **/
-GtkWidget *
-e_calendar_table_new (EShellView *shell_view,
-                      ECalModel *model)
-{
-	g_return_val_if_fail (E_IS_SHELL_VIEW (shell_view), NULL);
-	g_return_val_if_fail (E_IS_CAL_MODEL (model), NULL);
-
-	return g_object_new (
-		E_TYPE_CALENDAR_TABLE,
-		"model", model, "shell-view", shell_view, NULL);
-}
-
-/**
- * e_calendar_table_get_model:
- * @cal_table: A calendar table.
- *
- * Queries the calendar data model that a calendar table is using.
- *
- * Return value: A calendar model.
- **/
-ECalModel *
-e_calendar_table_get_model (ECalendarTable *cal_table)
-{
-	g_return_val_if_fail (E_IS_CALENDAR_TABLE (cal_table), NULL);
-
-	return cal_table->priv->model;
-}
-
-EShellView *
-e_calendar_table_get_shell_view (ECalendarTable *cal_table)
-{
-	g_return_val_if_fail (E_IS_CALENDAR_TABLE (cal_table), NULL);
-
-	return cal_table->priv->shell_view;
-}
-
-/* Used from e_table_selected_row_foreach(); puts the selected row number in an
- * gint pointed to by the closure data.
- */
-static void
-get_selected_row_cb (gint model_row, gpointer data)
-{
-	gint *row;
-
-	row = data;
-	*row = model_row;
-}
-
-/*
- * Returns the component that is selected in the table; only works if there is
- * one and only one selected row.
- */
-static ECalModelComponent *
-get_selected_comp (ECalendarTable *cal_table)
-{
-	ECalModel *model;
-	gint row;
-
-	model = e_calendar_table_get_model (cal_table);
-	if (e_table_selected_count (E_TABLE (cal_table)) != 1)
-		return NULL;
-
-	row = -1;
-	e_table_selected_row_foreach (
-		E_TABLE (cal_table), get_selected_row_cb, &row);
-	g_return_val_if_fail (row != -1, NULL);
-
-	return e_cal_model_get_component_at (model, row);
-}
-
-struct get_selected_uids_closure {
-	ECalendarTable *cal_table;
-	GSList *objects;
-};
-
-/* Used from e_table_selected_row_foreach(), builds a list of the selected UIDs */
-static void
-add_uid_cb (gint model_row, gpointer data)
-{
-	struct get_selected_uids_closure *closure = data;
-	ECalModelComponent *comp_data;
-	ECalModel *model;
-
-	model = e_calendar_table_get_model (closure->cal_table);
-	comp_data = e_cal_model_get_component_at (model, model_row);
-
-	closure->objects = g_slist_prepend (closure->objects, comp_data);
-}
-
-static void
-add_retract_data (ECalComponent *comp, const gchar *retract_comment)
-{
-	icalcomponent *icalcomp = NULL;
-	icalproperty *icalprop = NULL;
-
-	icalcomp = e_cal_component_get_icalcomponent (comp);
-	if (retract_comment && *retract_comment)
-		icalprop = icalproperty_new_x (retract_comment);
-	else
-		icalprop = icalproperty_new_x ("0");
-	icalproperty_set_x_name (icalprop, "X-EVOLUTION-RETRACT-COMMENT");
-	icalcomponent_add_property (icalcomp, icalprop);
-}
-
-static gboolean
-check_for_retract (ECalComponent *comp, ECal *client)
-{
-	ECalComponentOrganizer org;
-	gchar *email = NULL;
-	const gchar *strip = NULL;
-	gboolean ret_val = FALSE;
-
-	if (!(e_cal_component_has_attendees (comp) &&
-				e_cal_get_save_schedules (client)))
-		return ret_val;
-
-	e_cal_component_get_organizer (comp, &org);
-	strip = itip_strip_mailto (org.value);
-
-	if (e_cal_get_cal_address (client, &email, NULL) && !g_ascii_strcasecmp (email, strip)) {
-		ret_val = TRUE;
-	}
-
-	g_free (email);
-	return ret_val;
-}
-
-/**
- * e_calendar_table_delete_selected:
- * @cal_table: A calendar table.
- *
- * Deletes the selected components in the table; asks the user first.
- **/
-void
-e_calendar_table_delete_selected (ECalendarTable *cal_table)
-{
-	gint n_selected;
-	ECalModelComponent *comp_data;
-	ECalComponent *comp = NULL;
-	gboolean delete = FALSE;
-	GError *error = NULL;
-
-	g_return_if_fail (cal_table != NULL);
-	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));
-
-	n_selected = e_table_selected_count (E_TABLE (cal_table));
-	if (n_selected <= 0)
-		return;
-
-	if (n_selected == 1)
-		comp_data = get_selected_comp (cal_table);
-	else
-		comp_data = NULL;
-
-	/* FIXME: this may be something other than a TODO component */
-
-	if (comp_data) {
-		comp = e_cal_component_new ();
-		e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (comp_data->icalcomp));
-	}
-
-	if ((n_selected == 1) && comp && check_for_retract (comp, comp_data->client)) {
-		gchar *retract_comment = NULL;
-		gboolean retract = FALSE;
-
-		delete = prompt_retract_dialog (comp, &retract_comment, GTK_WIDGET (cal_table), &retract);
-		if (retract) {
-			GList *users = NULL;
-			icalcomponent *icalcomp = NULL, *mod_comp = NULL;
-
-			add_retract_data (comp, retract_comment);
-			icalcomp = e_cal_component_get_icalcomponent (comp);
-			icalcomponent_set_method (icalcomp, ICAL_METHOD_CANCEL);
-			if (!e_cal_send_objects (comp_data->client, icalcomp, &users,
-						&mod_comp, &error))	{
-				delete_error_dialog (error, E_CAL_COMPONENT_TODO);
-				g_clear_error (&error);
-				error = NULL;
-			} else {
-
-				if (mod_comp)
-					icalcomponent_free (mod_comp);
-
-				if (users) {
-					g_list_foreach (users, (GFunc) g_free, NULL);
-					g_list_free (users);
-				}
-			}
-
-		}
-	} else {
-		delete = delete_component_dialog (comp, FALSE, n_selected, E_CAL_COMPONENT_TODO, GTK_WIDGET (cal_table));
-	}
-
-	if (delete)
-		delete_selected_components (cal_table);
-
-	/* free memory */
-	if (comp)
-		g_object_unref (comp);
-}
-
-/**
- * e_calendar_table_get_selected:
- * @cal_table:
- *
- * Get the currently selected ECalModelComponent's on the table.
- *
- * Return value: A GSList of the components, which should be
- * g_slist_free'd when finished with.
- **/
-GSList *
-e_calendar_table_get_selected (ECalendarTable *cal_table)
-{
-	struct get_selected_uids_closure closure;
-
-	closure.cal_table = cal_table;
-	closure.objects = NULL;
-
-	e_table_selected_row_foreach (
-		E_TABLE (cal_table), add_uid_cb, &closure);
-
-	return closure.objects;
-}
-
-static void
-hide_completed_rows (ECalModel *model, GList *clients_list, gchar *hide_sexp, GPtrArray *comp_objects)
-{
-	GList *l, *m, *objects;
-	ECal *client;
-	gint pos;
-	gboolean changed = FALSE;
-
-	for (l = clients_list; l != NULL; l = l->next) {
-		client = l->data;
-
-		if (!e_cal_get_object_list (client, hide_sexp, &objects, NULL)) {
-			g_warning (G_STRLOC ": Could not get the objects");
-
-			continue;
-		}
-
-		for (m = objects; m; m = m->next) {
-			ECalModelComponent *comp_data;
-			ECalComponentId *id;
-			ECalComponent *comp = e_cal_component_new ();
-
-			e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (m->data));
-			id = e_cal_component_get_id (comp);
-
-			if ((comp_data =  e_cal_model_get_component_for_uid (model, id))) {
-				e_table_model_pre_change (E_TABLE_MODEL (model));
-				pos = get_position_in_array (comp_objects, comp_data);
-				e_table_model_row_deleted (E_TABLE_MODEL (model), pos);
-				changed = TRUE;
-
-				if (g_ptr_array_remove (comp_objects, comp_data))
-					e_cal_model_free_component_data (comp_data);
-			}
-			e_cal_component_free_id (id);
-			g_object_unref (comp);
-		}
-
-		g_list_foreach (objects, (GFunc) icalcomponent_free, NULL);
-		g_list_free (objects);
-	}
-
-	if (changed) {
-		/* to notify about changes, because in call of row_deleted there are still all events */
-		e_table_model_changed (E_TABLE_MODEL (model));
-	}
-}
-
-static void
-show_completed_rows (ECalModel *model, GList *clients_list, gchar *show_sexp, GPtrArray *comp_objects)
-{
-	GList *l, *m, *objects;
-	ECal *client;
-
-	for (l = clients_list; l != NULL; l = l->next) {
-		client = l->data;
-
-		if (!e_cal_get_object_list (client, show_sexp, &objects, NULL)) {
-			g_warning (G_STRLOC ": Could not get the objects");
-
-			continue;
-		}
-
-		for (m = objects; m; m = m->next) {
-			ECalModelComponent *comp_data;
-			ECalComponentId *id;
-			ECalComponent *comp = e_cal_component_new ();
-
-			e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (m->data));
-			id = e_cal_component_get_id (comp);
-
-			if (!(e_cal_model_get_component_for_uid (model, id))) {
-				e_table_model_pre_change (E_TABLE_MODEL (model));
-				comp_data = g_object_new (E_TYPE_CAL_MODEL_COMPONENT, NULL);
-				comp_data->client = g_object_ref (client);
-				comp_data->icalcomp = icalcomponent_new_clone (m->data);
-				e_cal_model_set_instance_times (comp_data,
-						e_cal_model_get_timezone (model));
-				comp_data->dtstart = comp_data->dtend = comp_data->due = comp_data->completed = NULL;
-				comp_data->color = NULL;
-
-				g_ptr_array_add (comp_objects, comp_data);
-				e_table_model_row_inserted (E_TABLE_MODEL (model), comp_objects->len - 1);
-			}
-			e_cal_component_free_id (id);
-			g_object_unref (comp);
-		}
-	}
-}
-
-/* Returns the current time, for the ECellDateEdit items.
-   FIXME: Should probably use the timezone of the item rather than the
-   current timezone, though that may be difficult to get from here. */
-static struct tm
-e_calendar_table_get_current_time (ECellDateEdit *ecde, gpointer data)
-{
-	ECalendarTable *cal_table = data;
-	ECalModel *model;
-	icaltimezone *zone;
-	struct tm tmp_tm = { 0 };
-	struct icaltimetype tt;
-
-	/* Get the current timezone. */
-	model = e_calendar_table_get_model (cal_table);
-	zone = e_cal_model_get_timezone (model);
-
-	tt = icaltime_from_timet_with_zone (time (NULL), FALSE, zone);
-
-	/* Now copy it to the struct tm and return it. */
-	tmp_tm.tm_year  = tt.year - 1900;
-	tmp_tm.tm_mon   = tt.month - 1;
-	tmp_tm.tm_mday  = tt.day;
-	tmp_tm.tm_hour  = tt.hour;
-	tmp_tm.tm_min   = tt.minute;
-	tmp_tm.tm_sec   = tt.second;
-	tmp_tm.tm_isdst = -1;
-
-	return tmp_tm;
-}
-
-/**
- * e_calendar_table_hide_completed_tasks:
- * @table: A calendar table model.
- * @client_list: Clients List
- *
- * Hide completed tasks.
- */
-void
-e_calendar_table_process_completed_tasks (ECalendarTable *table,
-                                          GList *clients_list,
-                                          gboolean config_changed)
-{
-	ECalModel *model;
-	static GMutex *mutex = NULL;
-	gchar *hide_sexp, *show_sexp;
-	GPtrArray *comp_objects = NULL;
-
-	if (!mutex)
-		mutex = g_mutex_new ();
-
-	g_mutex_lock (mutex);
-
-	model = e_calendar_table_get_model (table);
-	comp_objects = e_cal_model_get_object_array (model);
-
-	hide_sexp = calendar_config_get_hide_completed_tasks_sexp (TRUE);
-	show_sexp = calendar_config_get_hide_completed_tasks_sexp (FALSE);
-
-	/* If hide option is unchecked */
-	if (!(hide_sexp && show_sexp))
-		show_sexp = g_strdup ("(is-completed?)");
-
-	/* Delete rows from model*/
-	if (hide_sexp) {
-		hide_completed_rows (model, clients_list, hide_sexp, comp_objects);
-	}
-
-	/* Insert rows into model */
-	if (config_changed) {
-		show_completed_rows (model, clients_list, show_sexp, comp_objects);
-	}
-
-	g_free (hide_sexp);
-	g_free (show_sexp);
-	g_mutex_unlock (mutex);
-}
diff --git a/calendar/gui/e-calendar-table.h b/calendar/gui/e-calendar-table.h
deleted file mode 100644
index 71c7b716f2..0000000000
--- a/calendar/gui/e-calendar-table.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Authors:
- *		Damon Chaplin <damon@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifndef _E_CALENDAR_TABLE_H_
-#define _E_CALENDAR_TABLE_H_
-
-#include <table/e-table.h>
-#include <table/e-cell-date-edit.h>
-#include <shell/e-shell-view.h>
-#include "e-cal-model.h"
-
-/*
- * ECalendarTable - displays the iCalendar objects in a table (an ETable).
- * Used for calendar events and tasks.
- */
-
-/* Standard GObject macros */
-#define E_TYPE_CALENDAR_TABLE \
-	(e_calendar_table_get_type ())
-#define E_CALENDAR_TABLE(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST \
-	((obj), E_TYPE_CALENDAR_TABLE, ECalendarTable))
-#define E_CALENDAR_TABLE_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_CAST \
-	((cls), E_TYPE_CALENDAR_TABLE, ECalendarTableClass))
-#define E_IS_CALENDAR_TABLE(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE \
-	((obj), E_TYPE_CALENDAR_TABLE))
-#define E_IS_CALENDAR_TABLE_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_TYPE \
-	((cls), E_TYPE_CALENDAR_TABLE))
-#define E_CALENDAR_TABLE_GET_CLASS(obj) \
-	(G_TYPE_INSTANCE_GET_CLASS \
-	((obj), E_TYPE_CALENDAR_TABLE, ECalendarTableClass))
-
-G_BEGIN_DECLS
-
-typedef struct _ECalendarTable ECalendarTable;
-typedef struct _ECalendarTableClass ECalendarTableClass;
-typedef struct _ECalendarTablePrivate ECalendarTablePrivate;
-
-struct _ECalendarTable {
-	ETable parent;
-
-	/* The ECell used to view & edit dates. */
-	ECellDateEdit *dates_cell;
-
-	/* Fields used for cut/copy/paste */
-	icalcomponent *tmp_vcal;
-
-	ECalendarTablePrivate *priv;
-};
-
-struct _ECalendarTableClass {
-	ETableClass parent_class;
-
-	/* Signals */
-	void	(*open_component)		(ECalendarTable *cal_table,
-						 ECalModelComponent *comp_data);
-	void	(*popup_event)			(ECalendarTable *cal_table,
-						 GdkEvent *event);
-	void	(*status_message)		(ECalendarTable *cal_table,
-						 const gchar *message,
-						 gdouble percent);
-	void	(*user_created)			(ECalendarTable *cal_table);
-};
-
-GType		e_calendar_table_get_type	(void);
-GtkWidget *	e_calendar_table_new		(EShellView *shell_view,
-						 ECalModel *model);
-ECalModel *	e_calendar_table_get_model	(ECalendarTable *cal_table);
-EShellView *	e_calendar_table_get_shell_view	(ECalendarTable *cal_table);
-void		e_calendar_table_delete_selected(ECalendarTable *cal_table);
-GSList *	e_calendar_table_get_selected	(ECalendarTable *cal_table);
-
-ECalModelComponent *
-		e_calendar_table_get_selected_comp
-						(ECalendarTable *cal_table);
-void		e_calendar_table_hide_completed_tasks
-						(ECalendarTable *table,
-						 GList *clients_list,
-						 gboolean config_changed);
-void		e_calendar_table_process_completed_tasks
-						(ECalendarTable *table,
-						 GList *clients_list,
-						 gboolean config_changed);
-
-G_END_DECLS
-
-#endif /* _E_CALENDAR_TABLE_H_ */
diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c
index 4df17c5487..8461734164 100644
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@ -24,7 +24,6 @@
 
 /*
  * EMemoTable - displays the ECalComponent objects in a table (an ETable).
- * Used for calendar events and tasks.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/calendar/gui/e-memo-table.h b/calendar/gui/e-memo-table.h
index b55ddc5e66..a5707ec22f 100644
--- a/calendar/gui/e-memo-table.h
+++ b/calendar/gui/e-memo-table.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _E_MEMO_TABLE_H_
-#define _E_MEMO_TABLE_H_
+#ifndef E_MEMO_TABLE_H
+#define E_MEMO_TABLE_H
 
 #include <table/e-table.h>
 #include <table/e-cell-date-edit.h>
@@ -32,11 +32,10 @@
 
 /*
  * EMemoTable - displays the iCalendar objects in a table (an ETable).
- * Used for memo events and tasks.
  *
- * XXX We should look at merging this back into ECalendarTable, or at
- *     least making ECalendarTable subclassable so we don't have so
- *     much duplicate code.
+ * XXX EMemoTable and ETaskTable have lots of duplicate code.  We should
+ *     look at merging them, or at least bringing back ECalendarTable as
+ *     a common base class.
  */
 
 /* Standard GObject macros */
@@ -108,4 +107,4 @@ GSList *	e_memo_table_get_selected	(EMemoTable *memo_table);
 
 G_END_DECLS
 
-#endif /* _E_MEMO_TABLE_H_ */
+#endif /* E_MEMO_TABLE_H */
diff --git a/calendar/gui/e-task-table.c b/calendar/gui/e-task-table.c
new file mode 100644
index 0000000000..77e50c6ae6
--- /dev/null
+++ b/calendar/gui/e-task-table.c
@@ -0,0 +1,1674 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ *		Damon Chaplin <damon@ximian.com>
+ *		Rodrigo Moya <rodrigo@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
+/*
+ * ETaskTable - displays the ECalComponent objects in a table (an ETable).
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <sys/stat.h>
+#include <unistd.h>
+#include <glib/gi18n.h>
+#include <glib/gstdio.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+#include <misc/e-gui-utils.h>
+#include <misc/e-selectable.h>
+#include <table/e-cell-checkbox.h>
+#include <table/e-cell-toggle.h>
+#include <table/e-cell-text.h>
+#include <table/e-cell-combo.h>
+#include <table/e-cell-date.h>
+#include <e-util/e-binding.h>
+#include <e-util/e-selection.h>
+#include <e-util/e-dialog-utils.h>
+#include <e-util/e-util-private.h>
+#include <table/e-cell-date-edit.h>
+#include <table/e-cell-percent.h>
+#include <libecal/e-cal-time-util.h>
+#include <libedataserver/e-time-utils.h>
+
+#include "calendar-config.h"
+#include "dialogs/delete-comp.h"
+#include "dialogs/delete-error.h"
+#include "dialogs/task-editor.h"
+#include "e-cal-model-tasks.h"
+#include "e-task-table.h"
+#include "e-calendar-view.h"
+#include "e-cell-date-edit-text.h"
+#include "print.h"
+#include <e-util/e-icon-factory.h>
+#include "misc.h"
+
+#define E_TASK_TABLE_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), E_TYPE_TASK_TABLE, ETaskTablePrivate))
+
+struct _ETaskTablePrivate {
+	gpointer shell_view;  /* weak pointer */
+	ECalModel *model;
+};
+
+enum {
+	PROP_0,
+	PROP_MODEL,
+	PROP_SHELL_VIEW
+};
+
+enum {
+	OPEN_COMPONENT,
+	POPUP_EVENT,
+	STATUS_MESSAGE,
+	USER_CREATED,
+	LAST_SIGNAL
+};
+
+static struct tm e_task_table_get_current_time (ECellDateEdit *ecde, gpointer data);
+
+static gpointer parent_class;
+static guint signals[LAST_SIGNAL];
+
+/* The icons to represent the task. */
+#define NUM_ICONS 4
+static const gchar *icon_names[NUM_ICONS] = {
+	"stock_task",
+	"stock_task-recurring",
+	"stock_task-assigned",
+	"stock_task-assigned-to"
+};
+static GdkPixbuf *icon_pixbufs[NUM_ICONS] = { NULL };
+
+static void
+task_table_emit_open_component (ETaskTable *task_table,
+                                ECalModelComponent *comp_data)
+{
+	guint signal_id = signals[OPEN_COMPONENT];
+
+	g_signal_emit (task_table, signal_id, 0, comp_data);
+}
+
+static void
+task_table_emit_popup_event (ETaskTable *task_table,
+                             GdkEvent *event)
+{
+	guint signal_id = signals[POPUP_EVENT];
+
+	g_signal_emit (task_table, signal_id, 0, event);
+}
+
+static void
+task_table_emit_status_message (ETaskTable *task_table,
+                                const gchar *message,
+                                gdouble percent)
+{
+	guint signal_id = signals[STATUS_MESSAGE];
+
+	g_signal_emit (task_table, signal_id, 0, message, percent);
+}
+
+static void
+task_table_emit_user_created (ETaskTable *task_table)
+{
+	guint signal_id = signals[USER_CREATED];
+
+	g_signal_emit (task_table, signal_id, 0);
+}
+
+static gint
+task_table_date_compare_cb (gconstpointer a,
+                            gconstpointer b)
+{
+	ECellDateEditValue *dv1 = (ECellDateEditValue *) a;
+	ECellDateEditValue *dv2 = (ECellDateEditValue *) b;
+	struct icaltimetype tt;
+
+	/* First check if either is NULL. NULL dates sort last. */
+	if (!dv1 || !dv2) {
+		if (dv1 == dv2)
+			return 0;
+		else if (dv1)
+			return -1;
+		else
+			return 1;
+	}
+
+	/* Copy the 2nd value and convert it to the same timezone as the
+	   first. */
+	tt = dv2->tt;
+
+	icaltimezone_convert_time (&tt, dv2->zone, dv1->zone);
+
+	/* Now we can compare them. */
+
+	return icaltime_compare (dv1->tt, tt);
+}
+
+static gint
+task_table_percent_compare_cb (gconstpointer a,
+                               gconstpointer b)
+{
+	gint percent1 = GPOINTER_TO_INT (a);
+	gint percent2 = GPOINTER_TO_INT (b);
+
+	return (percent1 < percent2) ? -1 : (percent1 > percent2);
+}
+
+static gint
+task_table_priority_compare_cb (gconstpointer a,
+                                gconstpointer b)
+{
+	gint priority1, priority2;
+
+	priority1 = e_cal_util_priority_from_string ((const gchar *) a);
+	priority2 = e_cal_util_priority_from_string ((const gchar *) b);
+
+	/* We change undefined priorities so they appear after 'Low'. */
+	if (priority1 <= 0)
+		priority1 = 10;
+	if (priority2 <= 0)
+		priority2 = 10;
+
+	/* We'll just use the ordering of the priority values. */
+	return (priority1 < priority2) ? -1 : (priority1 > priority2);
+}
+
+static gint
+task_table_status_compare_cb (gconstpointer a,
+                              gconstpointer b)
+{
+	const gchar *string_a = a;
+	const gchar *string_b = b;
+	gint status_a = -2;
+	gint status_b = -2;
+
+	if (string_a == NULL || *string_a == '\0')
+		status_a = -1;
+	else if (!g_utf8_collate (string_a, _("Not Started")))
+		status_a = 0;
+	else if (!g_utf8_collate (string_a, _("In Progress")))
+		status_a = 1;
+	else if (!g_utf8_collate (string_a, _("Completed")))
+		status_a = 2;
+	else if (!g_utf8_collate (string_a, _("Canceled")))
+		status_a = 3;
+
+	if (string_b == NULL || *string_b == '\0')
+		status_b = -1;
+	else if (!g_utf8_collate (string_b, _("Not Started")))
+		status_b = 0;
+	else if (!g_utf8_collate (string_b, _("In Progress")))
+		status_b = 1;
+	else if (!g_utf8_collate (string_b, _("Completed")))
+		status_b = 2;
+	else if (!g_utf8_collate (string_b, _("Canceled")))
+		status_b = 3;
+
+	return (status_a < status_b) ? -1 : (status_a > status_b);
+}
+
+static void
+task_table_model_cal_view_progress_cb (ETaskTable *task_table,
+                                       const gchar *message,
+                                       gint progress,
+                                       ECalSourceType type)
+{
+	gdouble percent = (gdouble) progress;
+
+	task_table_emit_status_message (task_table, message, percent);
+}
+
+static void
+task_table_model_cal_view_done_cb (ETaskTable *task_table,
+                                   ECalendarStatus status,
+                                   ECalSourceType type)
+{
+	task_table_emit_status_message (task_table, NULL, -1.0);
+}
+
+/* Deletes all of the selected components in the table */
+static void
+delete_selected_components (ETaskTable *task_table)
+{
+	GSList *objs, *l;
+	const gchar *status_message;
+
+	objs = e_task_table_get_selected (task_table);
+
+	status_message = _("Deleting selected objects");
+	task_table_emit_status_message (task_table, status_message, -1.0);
+
+	for (l = objs; l; l = l->next) {
+		ECalModelComponent *comp_data = (ECalModelComponent *) l->data;
+		GError *error = NULL;
+
+		e_cal_remove_object (comp_data->client,
+				     icalcomponent_get_uid (comp_data->icalcomp), &error);
+		delete_error_dialog (error, E_CAL_COMPONENT_TODO);
+		g_clear_error (&error);
+	}
+
+	task_table_emit_status_message (task_table, NULL, -1.0);
+
+	g_slist_free (objs);
+}
+static void
+task_table_set_model (ETaskTable *task_table,
+                      ECalModel *model)
+{
+	g_return_if_fail (task_table->priv->model == NULL);
+
+	task_table->priv->model = g_object_ref (model);
+
+	g_signal_connect_swapped (
+		model, "row_appended",
+		G_CALLBACK (task_table_emit_user_created), task_table);
+
+	g_signal_connect_swapped (
+		model, "cal-view-progress",
+		G_CALLBACK (task_table_model_cal_view_progress_cb),
+		task_table);
+
+	g_signal_connect_swapped (
+		model, "cal-view-done",
+		G_CALLBACK (task_table_model_cal_view_done_cb),
+		task_table);
+}
+
+static void
+task_table_set_shell_view (ETaskTable *task_table,
+                           EShellView *shell_view)
+{
+	g_return_if_fail (task_table->priv->shell_view == NULL);
+
+	task_table->priv->shell_view = shell_view;
+
+	g_object_add_weak_pointer (
+		G_OBJECT (shell_view),
+		&task_table->priv->shell_view);
+}
+
+static void
+task_table_set_property (GObject *object,
+                         guint property_id,
+                         const GValue *value,
+                         GParamSpec *pspec)
+{
+	switch (property_id) {
+		case PROP_MODEL:
+			task_table_set_model (
+				E_TASK_TABLE (object),
+				g_value_get_object (value));
+			return;
+
+		case PROP_SHELL_VIEW:
+			task_table_set_shell_view (
+				E_TASK_TABLE (object),
+				g_value_get_object (value));
+			return;
+	}
+
+	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+}
+
+static void
+task_table_get_property (GObject *object,
+                         guint property_id,
+                         GValue *value,
+                         GParamSpec *pspec)
+{
+	switch (property_id) {
+		case PROP_MODEL:
+			g_value_set_object (
+				value, e_task_table_get_model (
+				E_TASK_TABLE (object)));
+			return;
+
+		case PROP_SHELL_VIEW:
+			g_value_set_object (
+				value, e_task_table_get_shell_view (
+				E_TASK_TABLE (object)));
+			return;
+	}
+
+	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+}
+
+static void
+task_table_dispose (GObject *object)
+{
+	ETaskTablePrivate *priv;
+
+	priv = E_TASK_TABLE_GET_PRIVATE (object);
+
+	if (priv->shell_view != NULL) {
+		g_object_remove_weak_pointer (
+			G_OBJECT (priv->shell_view), &priv->shell_view);
+		priv->shell_view = NULL;
+	}
+
+	if (priv->model != NULL) {
+		g_object_unref (priv->model);
+		priv->model = NULL;
+	}
+
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+task_table_constructed (GObject *object)
+{
+	ETaskTable *task_table;
+	ECalModel *model;
+	ECell *cell, *popup_cell;
+	ETableExtras *extras;
+	gint i;
+	GdkPixbuf *pixbuf;
+	GList *strings;
+	AtkObject *a11y;
+	gchar *etspecfile;
+
+	task_table = E_TASK_TABLE (object);
+	model = e_task_table_get_model (task_table);
+
+	/* Create the header columns */
+
+	extras = e_table_extras_new ();
+
+	/*
+	 * Normal string fields.
+	 */
+	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
+	g_object_set (cell,
+		      "strikeout_column", E_CAL_MODEL_TASKS_FIELD_STRIKEOUT,
+		      "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE,
+		      "bg_color_column", E_CAL_MODEL_FIELD_COLOR,
+		      NULL);
+
+	e_table_extras_add_cell (extras, "calstring", cell);
+
+	/*
+	 * Date fields.
+	 */
+	cell = e_cell_date_edit_text_new (NULL, GTK_JUSTIFY_LEFT);
+	g_object_set (cell,
+		      "strikeout_column", E_CAL_MODEL_TASKS_FIELD_STRIKEOUT,
+		      "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE,
+		      "bg_color_column", E_CAL_MODEL_FIELD_COLOR,
+		      NULL);
+
+	e_mutual_binding_new (
+		model, "timezone",
+		cell, "timezone");
+
+	e_mutual_binding_new (
+		model, "use-24-hour-format",
+		cell, "use-24-hour-format");
+
+	popup_cell = e_cell_date_edit_new ();
+	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);
+	g_object_unref (cell);
+
+	e_mutual_binding_new (
+		model, "use-24-hour-format",
+		popup_cell, "use-24-hour-format");
+
+	e_table_extras_add_cell (extras, "dateedit", popup_cell);
+	task_table->dates_cell = E_CELL_DATE_EDIT (popup_cell);
+
+	e_cell_date_edit_set_get_time_callback (
+		E_CELL_DATE_EDIT (popup_cell),
+		e_task_table_get_current_time, task_table, NULL);
+
+	/*
+	 * Combo fields.
+	 */
+
+	/* Classification field. */
+	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
+	g_object_set (cell,
+		      "strikeout_column", E_CAL_MODEL_TASKS_FIELD_STRIKEOUT,
+		      "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE,
+		      "bg_color_column", E_CAL_MODEL_FIELD_COLOR,
+		      "editable", FALSE,
+		      NULL);
+
+	popup_cell = e_cell_combo_new ();
+	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);
+	g_object_unref (cell);
+
+	strings = NULL;
+	strings = g_list_append (strings, (gchar *) _("Public"));
+	strings = g_list_append (strings, (gchar *) _("Private"));
+	strings = g_list_append (strings, (gchar *) _("Confidential"));
+	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),
+					  strings);
+
+	e_table_extras_add_cell (extras, "classification", popup_cell);
+
+	/* Priority field. */
+	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
+	g_object_set (G_OBJECT (cell),
+		      "strikeout_column", E_CAL_MODEL_TASKS_FIELD_STRIKEOUT,
+		      "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE,
+		      "bg_color_column", E_CAL_MODEL_FIELD_COLOR,
+		      "editable", FALSE,
+		      NULL);
+
+	popup_cell = e_cell_combo_new ();
+	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);
+	g_object_unref (cell);
+
+	strings = NULL;
+	strings = g_list_append (strings, (gchar *) _("High"));
+	strings = g_list_append (strings, (gchar *) _("Normal"));
+	strings = g_list_append (strings, (gchar *) _("Low"));
+	strings = g_list_append (strings, (gchar *) _("Undefined"));
+	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),
+					  strings);
+
+	e_table_extras_add_cell (extras, "priority", popup_cell);
+
+	/* Percent field. */
+	cell = e_cell_percent_new (NULL, GTK_JUSTIFY_LEFT);
+	g_object_set (G_OBJECT (cell),
+		      "strikeout_column", E_CAL_MODEL_TASKS_FIELD_STRIKEOUT,
+		      "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE,
+		      "bg_color_column", E_CAL_MODEL_FIELD_COLOR,
+		      NULL);
+
+	popup_cell = e_cell_combo_new ();
+	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);
+	g_object_unref (cell);
+
+	strings = NULL;
+	strings = g_list_append (strings, (gchar *) _("0%"));
+	strings = g_list_append (strings, (gchar *) _("10%"));
+	strings = g_list_append (strings, (gchar *) _("20%"));
+	strings = g_list_append (strings, (gchar *) _("30%"));
+	strings = g_list_append (strings, (gchar *) _("40%"));
+	strings = g_list_append (strings, (gchar *) _("50%"));
+	strings = g_list_append (strings, (gchar *) _("60%"));
+	strings = g_list_append (strings, (gchar *) _("70%"));
+	strings = g_list_append (strings, (gchar *) _("80%"));
+	strings = g_list_append (strings, (gchar *) _("90%"));
+	strings = g_list_append (strings, (gchar *) _("100%"));
+	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),
+					  strings);
+
+	e_table_extras_add_cell (extras, "percent", popup_cell);
+
+	/* Transparency field. */
+	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
+	g_object_set (G_OBJECT (cell),
+		      "strikeout_column", E_CAL_MODEL_TASKS_FIELD_STRIKEOUT,
+		      "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE,
+		      "bg_color_column", E_CAL_MODEL_FIELD_COLOR,
+		      "editable", FALSE,
+		      NULL);
+
+	popup_cell = e_cell_combo_new ();
+	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);
+	g_object_unref (cell);
+
+	strings = NULL;
+	strings = g_list_append (strings, (gchar *) _("Free"));
+	strings = g_list_append (strings, (gchar *) _("Busy"));
+	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),
+					  strings);
+
+	e_table_extras_add_cell (extras, "transparency", popup_cell);
+
+	/* Status field. */
+	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
+	g_object_set (G_OBJECT (cell),
+		      "strikeout_column", E_CAL_MODEL_TASKS_FIELD_STRIKEOUT,
+		      "bold_column", E_CAL_MODEL_TASKS_FIELD_OVERDUE,
+		      "bg_color_column", E_CAL_MODEL_FIELD_COLOR,
+		      "editable", FALSE,
+		      NULL);
+
+	popup_cell = e_cell_combo_new ();
+	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);
+	g_object_unref (cell);
+
+	strings = NULL;
+	strings = g_list_append (strings, (gchar *) _("Not Started"));
+	strings = g_list_append (strings, (gchar *) _("In Progress"));
+	strings = g_list_append (strings, (gchar *) _("Completed"));
+	strings = g_list_append (strings, (gchar *) _("Canceled"));
+	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),
+					  strings);
+
+	e_table_extras_add_cell (extras, "calstatus", popup_cell);
+
+	e_table_extras_add_compare (extras, "date-compare",
+				    task_table_date_compare_cb);
+	e_table_extras_add_compare (extras, "percent-compare",
+				    task_table_percent_compare_cb);
+	e_table_extras_add_compare (extras, "priority-compare",
+				    task_table_priority_compare_cb);
+	e_table_extras_add_compare (extras, "status-compare",
+				    task_table_status_compare_cb);
+
+	/* Create pixmaps */
+
+	if (!icon_pixbufs[0])
+		for (i = 0; i < NUM_ICONS; i++) {
+			icon_pixbufs[i] = e_icon_factory_get_icon (icon_names[i], GTK_ICON_SIZE_MENU);
+		}
+
+	cell = e_cell_toggle_new (0, NUM_ICONS, icon_pixbufs);
+	e_table_extras_add_cell(extras, "icon", cell);
+	e_table_extras_add_pixbuf(extras, "icon", icon_pixbufs[0]);
+
+	pixbuf = e_icon_factory_get_icon ("stock_check-filled", GTK_ICON_SIZE_MENU);
+	e_table_extras_add_pixbuf(extras, "complete", pixbuf);
+	g_object_unref(pixbuf);
+
+	/* set proper format component for a default 'date' cell renderer */
+	cell = e_table_extras_get_cell (extras, "date");
+	e_cell_date_set_format_component (E_CELL_DATE (cell), "calendar");
+
+	/* Create the table */
+
+	etspecfile = g_build_filename (
+		EVOLUTION_ETSPECDIR, "e-calendar-table.etspec", NULL);
+	e_table_construct_from_spec_file (
+		E_TABLE (task_table), E_TABLE_MODEL (model),
+		extras, etspecfile, NULL);
+	g_free (etspecfile);
+
+	gtk_widget_set_has_tooltip (GTK_WIDGET (task_table), TRUE);
+
+	a11y = gtk_widget_get_accessible (GTK_WIDGET (task_table));
+	if (a11y)
+		atk_object_set_name (a11y, _("Tasks"));
+}
+
+static gboolean
+task_table_popup_menu (GtkWidget *widget)
+{
+	ETaskTable *task_table;
+
+	task_table = E_TASK_TABLE (widget);
+	task_table_emit_popup_event (task_table, NULL);
+
+	return TRUE;
+}
+
+static gboolean
+task_table_query_tooltip (GtkWidget *widget,
+                              gint x,
+                              gint y,
+                              gboolean keyboard_mode,
+                              GtkTooltip *tooltip)
+{
+	ETaskTable *task_table;
+	ECalModel *model;
+	ECalModelComponent *comp_data;
+	gint row = -1, col = -1;
+	GtkWidget *box, *l, *w;
+	GtkStyle *style = gtk_widget_get_default_style ();
+	gchar *tmp;
+	const gchar *str;
+	GString *tmp2;
+	gchar buff[1001];
+	gboolean free_text = FALSE;
+	gboolean use_24_hour_format;
+	ECalComponent *new_comp;
+	ECalComponentOrganizer organizer;
+	ECalComponentDateTime dtstart, dtdue;
+	icalcomponent *clone;
+	icaltimezone *zone, *default_zone;
+	GSList *desc, *p;
+	gint len;
+	ESelectionModel *esm;
+	struct tm tmp_tm;
+
+	if (keyboard_mode)
+		return FALSE;
+
+	task_table = E_TASK_TABLE (widget);
+
+	e_table_get_mouse_over_cell (E_TABLE (task_table), &row, &col);
+	if (row == -1)
+		return FALSE;
+
+	/* Respect sorting option; the 'e_table_get_mouse_over_cell'
+	 * returns sorted row, not the model one. */
+	esm = e_table_get_selection_model (E_TABLE (task_table));
+	if (esm && esm->sorter && e_sorter_needs_sorting (esm->sorter))
+		row = e_sorter_sorted_to_model (esm->sorter, row);
+
+	model = e_task_table_get_model (task_table);
+	comp_data = e_cal_model_get_component_at (model, row);
+	if (!comp_data || !comp_data->icalcomp)
+		return FALSE;
+
+	new_comp = e_cal_component_new ();
+	clone = icalcomponent_new_clone (comp_data->icalcomp);
+	if (!e_cal_component_set_icalcomponent (new_comp, clone)) {
+		g_object_unref (new_comp);
+		return FALSE;
+	}
+
+	box = gtk_vbox_new (FALSE, 0);
+
+	str = e_calendar_view_get_icalcomponent_summary (
+		comp_data->client, comp_data->icalcomp, &free_text);
+	if (!(str && *str)) {
+		if (free_text)
+			g_free ((gchar *)str);
+		free_text = FALSE;
+		str = _("* No Summary *");
+	}
+
+	l = gtk_label_new (NULL);
+	tmp = g_markup_printf_escaped ("<b>%s</b>", str);
+	gtk_label_set_line_wrap (GTK_LABEL (l), TRUE);
+	gtk_label_set_markup (GTK_LABEL (l), tmp);
+	gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
+	w = gtk_event_box_new ();
+
+	gtk_widget_modify_bg (w, GTK_STATE_NORMAL, &(style->bg[GTK_STATE_SELECTED]));
+	gtk_widget_modify_fg (l, GTK_STATE_NORMAL, &(style->text[GTK_STATE_SELECTED]));
+	gtk_container_add (GTK_CONTAINER (w), l);
+	gtk_box_pack_start (GTK_BOX (box), w, TRUE, TRUE, 0);
+	g_free (tmp);
+
+	if (free_text)
+		g_free ((gchar *)str);
+	free_text = FALSE;
+
+	w = gtk_event_box_new ();
+	gtk_widget_modify_bg (w, GTK_STATE_NORMAL, &(style->bg[GTK_STATE_NORMAL]));
+
+	l = gtk_vbox_new (FALSE, 0);
+	gtk_container_add (GTK_CONTAINER (w), l);
+	gtk_box_pack_start (GTK_BOX (box), w, FALSE, FALSE, 0);
+	w = l;
+
+	e_cal_component_get_organizer (new_comp, &organizer);
+	if (organizer.cn) {
+		gchar *ptr;
+		ptr = strchr( organizer.value, ':');
+
+		if (ptr) {
+			ptr++;
+			/* To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>" */
+			tmp = g_strdup_printf (_("Organizer: %s <%s>"), organizer.cn, ptr);
+		} else {
+			/* With SunOne accounts, there may be no ':' in organiser.value */
+			tmp = g_strdup_printf (_("Organizer: %s"), organizer.cn);
+		}
+
+		l = gtk_label_new (tmp);
+		gtk_label_set_line_wrap (GTK_LABEL (l), FALSE);
+		gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
+		gtk_box_pack_start (GTK_BOX (w), l, FALSE, FALSE, 0);
+		g_free (tmp);
+	}
+
+	e_cal_component_get_dtstart (new_comp, &dtstart);
+	e_cal_component_get_due (new_comp, &dtdue);
+
+	default_zone = e_cal_model_get_timezone (model);
+	use_24_hour_format = e_cal_model_get_use_24_hour_format (model);
+
+	if (dtstart.tzid) {
+		zone = icalcomponent_get_timezone (e_cal_component_get_icalcomponent (new_comp), dtstart.tzid);
+		if (!zone)
+			e_cal_get_timezone (
+				comp_data->client, dtstart.tzid, &zone, NULL);
+		if (!zone)
+			zone = default_zone;
+	} else {
+		zone = NULL;
+	}
+
+	tmp2 = g_string_new ("");
+
+	if (dtstart.value) {
+		buff[0] = 0;
+
+		tmp_tm = icaltimetype_to_tm_with_zone (
+			dtstart.value, zone, default_zone);
+		e_time_format_date_and_time (
+			&tmp_tm, use_24_hour_format,
+			FALSE, FALSE, buff, 1000);
+
+		if (buff [0]) {
+			g_string_append (tmp2, _("Start: "));
+			g_string_append (tmp2, buff);
+		}
+	}
+
+	if (dtdue.value) {
+		buff[0] = 0;
+
+		tmp_tm = icaltimetype_to_tm_with_zone (
+			dtdue.value, zone, default_zone);
+		e_time_format_date_and_time (
+			&tmp_tm, use_24_hour_format,
+			FALSE, FALSE, buff, 1000);
+
+		if (buff [0]) {
+			if (tmp2->len)
+				g_string_append (tmp2, "; ");
+
+			g_string_append (tmp2, _("Due: "));
+			g_string_append (tmp2, buff);
+		}
+	}
+
+	if (tmp2->len) {
+		l = gtk_label_new (tmp2->str);
+		gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
+		gtk_box_pack_start (GTK_BOX (w), l, FALSE, FALSE, 0);
+	}
+
+	g_string_free (tmp2, TRUE);
+
+	e_cal_component_free_datetime (&dtstart);
+	e_cal_component_free_datetime (&dtdue);
+
+	tmp = e_calendar_view_get_attendees_status_info (
+		new_comp, comp_data->client);
+	if (tmp) {
+		l = gtk_label_new (tmp);
+		gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
+		gtk_box_pack_start (GTK_BOX (w), l, FALSE, FALSE, 0);
+
+		g_free (tmp);
+		tmp = NULL;
+	}
+
+	tmp2 = g_string_new ("");
+	e_cal_component_get_description_list (new_comp, &desc);
+	for (len = 0, p = desc; p != NULL; p = p->next) {
+		ECalComponentText *text = p->data;
+
+		if (text->value != NULL) {
+			len += strlen (text->value);
+			g_string_append (tmp2, text->value);
+			if (len > 1024) {
+				g_string_set_size (tmp2, 1020);
+				g_string_append (tmp2, "...");
+				break;
+			}
+		}
+	}
+	e_cal_component_free_text_list (desc);
+
+	if (tmp2->len) {
+		l = gtk_label_new (tmp2->str);
+		gtk_label_set_line_wrap (GTK_LABEL (l), TRUE);
+		gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
+		gtk_box_pack_start (GTK_BOX (box), l, FALSE, FALSE, 0);
+	}
+
+	g_string_free (tmp2, TRUE);
+
+	gtk_widget_show_all (box);
+	gtk_tooltip_set_custom (tooltip, box);
+
+	g_object_unref (new_comp);
+
+	return TRUE;
+}
+
+static void
+task_table_double_click (ETable *table,
+                         gint row,
+                         gint col,
+                         GdkEvent *event)
+{
+	ETaskTable *task_table;
+	ECalModel *model;
+	ECalModelComponent *comp_data;
+
+	task_table = E_TASK_TABLE (table);
+	model = e_task_table_get_model (task_table);
+	comp_data = e_cal_model_get_component_at (model, row);
+	task_table_emit_open_component (task_table, comp_data);
+}
+
+static gint
+task_table_right_click (ETable *table,
+                        gint row,
+                        gint col,
+                        GdkEvent *event)
+{
+	ETaskTable *task_table;
+
+	task_table = E_TASK_TABLE (table);
+	task_table_emit_popup_event (task_table, event);
+
+	return TRUE;
+}
+
+static void
+task_table_update_actions (ESelectable *selectable,
+                           EFocusTracker *focus_tracker,
+                           GdkAtom *clipboard_targets,
+                           gint n_clipboard_targets)
+{
+	ETaskTable *task_table;
+	GtkAction *action;
+	GSList *list, *iter;
+	gboolean sources_are_editable = TRUE;
+	gboolean clipboard_has_calendar;
+	gboolean sensitive;
+	const gchar *tooltip;
+	gint n_selected;
+
+	task_table = E_TASK_TABLE (selectable);
+	n_selected = e_table_selected_count (E_TABLE (task_table));
+
+	list = e_task_table_get_selected (task_table);
+	for (iter = list; iter != NULL; iter = iter->next) {
+		ECalModelComponent *comp_data = iter->data;
+		gboolean read_only;
+
+		e_cal_is_read_only (comp_data->client, &read_only, NULL);
+		sources_are_editable &= !read_only;
+	}
+	g_slist_free (list);
+
+	clipboard_has_calendar = (clipboard_targets != NULL) &&
+		e_targets_include_calendar (
+		clipboard_targets, n_clipboard_targets);
+
+	action = e_focus_tracker_get_cut_clipboard_action (focus_tracker);
+	sensitive = (n_selected > 0) && sources_are_editable;
+	tooltip = _("Cut selected tasks to the clipboard");
+	gtk_action_set_sensitive (action, sensitive);
+	gtk_action_set_tooltip (action, tooltip);
+
+	action = e_focus_tracker_get_copy_clipboard_action (focus_tracker);
+	sensitive = (n_selected > 0);
+	tooltip = _("Copy selected tasks to the clipboard");
+	gtk_action_set_sensitive (action, sensitive);
+	gtk_action_set_tooltip (action, tooltip);
+
+	action = e_focus_tracker_get_paste_clipboard_action (focus_tracker);
+	sensitive = sources_are_editable && clipboard_has_calendar;
+	tooltip = _("Paste tasks from the clipboard");
+	gtk_action_set_sensitive (action, sensitive);
+	gtk_action_set_tooltip (action, tooltip);
+
+	action = e_focus_tracker_get_select_all_action (focus_tracker);
+	sensitive = TRUE;
+	tooltip = _("Select all visible tasks");
+	gtk_action_set_sensitive (action, sensitive);
+	gtk_action_set_tooltip (action, tooltip);
+}
+
+static void
+task_table_cut_clipboard (ESelectable *selectable)
+{
+	ETaskTable *task_table;
+
+	task_table = E_TASK_TABLE (selectable);
+
+	e_selectable_copy_clipboard (selectable);
+	delete_selected_components (task_table);
+}
+
+/* Helper for task_table_copy_clipboard() */
+static void
+copy_row_cb (gint model_row, gpointer data)
+{
+	ETaskTable *task_table;
+	ECalModelComponent *comp_data;
+	ECalModel *model;
+	gchar *comp_str;
+	icalcomponent *child;
+
+	task_table = E_TASK_TABLE (data);
+
+	g_return_if_fail (task_table->tmp_vcal != NULL);
+
+	model = e_task_table_get_model (task_table);
+	comp_data = e_cal_model_get_component_at (model, model_row);
+	if (!comp_data)
+		return;
+
+	/* Add timezones to the VCALENDAR component. */
+	e_cal_util_add_timezones_from_component (
+		task_table->tmp_vcal, comp_data->icalcomp);
+
+	/* Add the new component to the VCALENDAR component. */
+	comp_str = icalcomponent_as_ical_string_r (comp_data->icalcomp);
+	child = icalparser_parse_string (comp_str);
+	if (child) {
+		icalcomponent_add_component (
+			task_table->tmp_vcal,
+			icalcomponent_new_clone (child));
+		icalcomponent_free (child);
+	}
+	g_free (comp_str);
+}
+
+static void
+task_table_copy_clipboard (ESelectable *selectable)
+{
+	ETaskTable *task_table;
+	GtkClipboard *clipboard;
+	gchar *comp_str;
+
+	task_table = E_TASK_TABLE (selectable);
+
+	/* Create a temporary VCALENDAR object. */
+	task_table->tmp_vcal = e_cal_util_new_top_level ();
+
+	e_table_selected_row_foreach (
+		E_TABLE (task_table), copy_row_cb, task_table);
+	comp_str = icalcomponent_as_ical_string_r (task_table->tmp_vcal);
+
+	clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+	e_clipboard_set_calendar (clipboard, comp_str, -1);
+	gtk_clipboard_store (clipboard);
+
+	g_free (comp_str);
+
+	icalcomponent_free (task_table->tmp_vcal);
+	task_table->tmp_vcal = NULL;
+}
+
+/* Helper for calenable_table_paste_clipboard() */
+static void
+clipboard_get_calendar_data (ETaskTable *task_table,
+                             const gchar *text)
+{
+	icalcomponent *icalcomp;
+	gchar *uid;
+	ECalComponent *comp;
+	ECalModel *model;
+	ECal *client;
+	icalcomponent_kind kind;
+	const gchar *status_message;
+
+	g_return_if_fail (E_IS_CALENDAR_TABLE (task_table));
+
+	if (!text || !*text)
+		return;
+
+	icalcomp = icalparser_parse_string (text);
+	if (!icalcomp)
+		return;
+
+	/* check the type of the component */
+	kind = icalcomponent_isa (icalcomp);
+	if (kind != ICAL_VCALENDAR_COMPONENT &&
+	    kind != ICAL_VEVENT_COMPONENT &&
+	    kind != ICAL_VTODO_COMPONENT &&
+	    kind != ICAL_VJOURNAL_COMPONENT) {
+		return;
+	}
+
+	model = e_task_table_get_model (task_table);
+	client = e_cal_model_get_default_client (model);
+
+	status_message = _("Updating objects");
+	task_table_emit_status_message (task_table, status_message, -1.0);
+
+	if (kind == ICAL_VCALENDAR_COMPONENT) {
+		icalcomponent_kind child_kind;
+		icalcomponent *subcomp;
+		icalcomponent *vcal_comp;
+
+		vcal_comp = icalcomp;
+		subcomp = icalcomponent_get_first_component (
+			vcal_comp, ICAL_ANY_COMPONENT);
+		while (subcomp) {
+			child_kind = icalcomponent_isa (subcomp);
+			if (child_kind == ICAL_VEVENT_COMPONENT ||
+			    child_kind == ICAL_VTODO_COMPONENT ||
+			    child_kind == ICAL_VJOURNAL_COMPONENT) {
+				ECalComponent *tmp_comp;
+
+				uid = e_cal_component_gen_uid ();
+				tmp_comp = e_cal_component_new ();
+				e_cal_component_set_icalcomponent (
+					tmp_comp,
+					icalcomponent_new_clone (subcomp));
+				e_cal_component_set_uid (tmp_comp, uid);
+				free (uid);
+
+				/* FIXME should we convert start/due/complete
+				 * times?  Also, need error handling. */
+				e_cal_create_object (
+					client, e_cal_component_get_icalcomponent (tmp_comp),
+					NULL, NULL);
+
+				g_object_unref (tmp_comp);
+			}
+			subcomp = icalcomponent_get_next_component (
+				vcal_comp, ICAL_ANY_COMPONENT);
+		}
+	} else {
+		comp = e_cal_component_new ();
+		e_cal_component_set_icalcomponent (comp, icalcomp);
+		uid = e_cal_component_gen_uid ();
+		e_cal_component_set_uid (comp, (const gchar *) uid);
+		free (uid);
+
+		e_cal_create_object (
+			client, e_cal_component_get_icalcomponent (comp),
+			NULL, NULL);
+
+		g_object_unref (comp);
+	}
+
+	task_table_emit_status_message (task_table, NULL, -1.0);
+}
+
+static void
+task_table_paste_clipboard (ESelectable *selectable)
+{
+	ETaskTable *task_table;
+	GtkClipboard *clipboard;
+	GnomeCanvasItem *item;
+	GnomeCanvas *table_canvas;
+
+	task_table = E_TASK_TABLE (selectable);
+
+	clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+
+	table_canvas = E_TABLE (task_table)->table_canvas;
+	item = table_canvas->focused_item;
+
+	/* XXX Should ECellText implement GtkEditable? */
+
+	/* Paste text into a cell being edited. */
+	if (gtk_clipboard_wait_is_text_available (clipboard) &&
+		GTK_WIDGET_HAS_FOCUS (table_canvas) &&
+		E_IS_TABLE_ITEM (item) &&
+		E_TABLE_ITEM (item)->editing_col >= 0 &&
+		E_TABLE_ITEM (item)->editing_row >= 0) {
+
+		ETableItem *etable_item = E_TABLE_ITEM (item);
+
+		e_cell_text_paste_clipboard (
+			etable_item->cell_views[etable_item->editing_col],
+			etable_item->editing_col,
+			etable_item->editing_row);
+
+	/* Paste iCalendar data into the table. */
+	} else if (e_clipboard_wait_is_calendar_available (clipboard)) {
+		gchar *calendar_source;
+
+		calendar_source = e_clipboard_wait_for_calendar (clipboard);
+		clipboard_get_calendar_data (task_table, calendar_source);
+		g_free (calendar_source);
+	}
+}
+
+static void
+task_table_select_all (ESelectable *selectable)
+{
+	e_table_select_all (E_TABLE (selectable));
+}
+
+static void
+task_table_class_init (ETaskTableClass *class)
+{
+	GObjectClass *object_class;
+	GtkWidgetClass *widget_class;
+	ETableClass *table_class;
+
+	parent_class = g_type_class_peek_parent (class);
+	g_type_class_add_private (class, sizeof (ETaskTablePrivate));
+
+	object_class = G_OBJECT_CLASS (class);
+	object_class->set_property = task_table_set_property;
+	object_class->get_property = task_table_get_property;
+	object_class->dispose = task_table_dispose;
+	object_class->constructed = task_table_constructed;
+
+	widget_class = GTK_WIDGET_CLASS (class);
+	widget_class->popup_menu = task_table_popup_menu;
+	widget_class->query_tooltip = task_table_query_tooltip;
+
+	table_class = E_TABLE_CLASS (class);
+	table_class->double_click = task_table_double_click;
+	table_class->right_click = task_table_right_click;
+
+	g_object_class_install_property (
+		object_class,
+		PROP_MODEL,
+		g_param_spec_object (
+			"model",
+			_("Model"),
+			NULL,
+			E_TYPE_CAL_MODEL,
+			G_PARAM_READWRITE |
+			G_PARAM_CONSTRUCT_ONLY));
+
+	g_object_class_install_property (
+		object_class,
+		PROP_SHELL_VIEW,
+		g_param_spec_object (
+			"shell-view",
+			_("Shell View"),
+			NULL,
+			E_TYPE_SHELL_VIEW,
+			G_PARAM_READWRITE |
+			G_PARAM_CONSTRUCT_ONLY));
+
+	signals[OPEN_COMPONENT] = g_signal_new (
+		"open-component",
+		G_TYPE_FROM_CLASS (class),
+		G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+		G_STRUCT_OFFSET (ETaskTableClass, open_component),
+		NULL, NULL,
+		g_cclosure_marshal_VOID__OBJECT,
+		G_TYPE_NONE, 1,
+		E_TYPE_CAL_MODEL_COMPONENT);
+
+	signals[POPUP_EVENT] = g_signal_new (
+		"popup-event",
+		G_TYPE_FROM_CLASS (class),
+		G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+		G_STRUCT_OFFSET (ETaskTableClass, popup_event),
+		NULL, NULL,
+		g_cclosure_marshal_VOID__BOXED,
+		G_TYPE_NONE, 1,
+		GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+
+	signals[STATUS_MESSAGE] = g_signal_new (
+		"status-message",
+		G_TYPE_FROM_CLASS (class),
+		G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+		G_STRUCT_OFFSET (ETaskTableClass, status_message),
+		NULL, NULL,
+		e_marshal_VOID__STRING_DOUBLE,
+		G_TYPE_NONE, 2,
+		G_TYPE_STRING, G_TYPE_DOUBLE);
+
+	signals[USER_CREATED] = g_signal_new (
+		"user-created",
+		G_TYPE_FROM_CLASS (class),
+		G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+		G_STRUCT_OFFSET (ETaskTableClass, user_created),
+		NULL, NULL,
+		g_cclosure_marshal_VOID__VOID,
+		G_TYPE_NONE, 0);
+}
+
+static void
+task_table_init (ETaskTable *task_table)
+{
+	task_table->priv = E_TASK_TABLE_GET_PRIVATE (task_table);
+}
+
+static void
+task_table_selectable_init (ESelectableInterface *interface)
+{
+	interface->update_actions = task_table_update_actions;
+	interface->cut_clipboard = task_table_cut_clipboard;
+	interface->copy_clipboard = task_table_copy_clipboard;
+	interface->paste_clipboard = task_table_paste_clipboard;
+	interface->select_all = task_table_select_all;
+}
+
+GType
+e_task_table_get_type (void)
+{
+	static GType type = 0;
+
+	if (G_UNLIKELY (type == 0)) {
+		static const GTypeInfo type_info = {
+			sizeof (ETaskTableClass),
+			(GBaseInitFunc) NULL,
+			(GBaseFinalizeFunc) NULL,
+			(GClassInitFunc) task_table_class_init,
+			(GClassFinalizeFunc) NULL,
+			NULL,  /* class_data */
+			sizeof (ETaskTable),
+			0,     /* n_preallocs */
+			(GInstanceInitFunc) task_table_init,
+			NULL   /* value_table */
+		};
+
+		static const GInterfaceInfo selectable_info = {
+			(GInterfaceInitFunc) task_table_selectable_init,
+			(GInterfaceFinalizeFunc) NULL,
+			NULL   /* interface_data */
+		};
+
+		type = g_type_register_static (
+			E_TABLE_TYPE, "ETaskTable", &type_info, 0);
+
+		g_type_add_interface_static (
+			type, E_TYPE_SELECTABLE, &selectable_info);
+	}
+
+	return type;
+}
+
+/**
+ * e_task_table_new:
+ * @shell_view: an #EShellView
+ * @model: an #ECalModel for the table
+ *
+ * Returns a new #ETaskTable.
+ *
+ * Returns: a new #ETaskTable
+ **/
+GtkWidget *
+e_task_table_new (EShellView *shell_view,
+                  ECalModel *model)
+{
+	g_return_val_if_fail (E_IS_SHELL_VIEW (shell_view), NULL);
+	g_return_val_if_fail (E_IS_CAL_MODEL (model), NULL);
+
+	return g_object_new (
+		E_TYPE_TASK_TABLE,
+		"model", model, "shell-view", shell_view, NULL);
+}
+
+/**
+ * e_task_table_get_model:
+ * @task_table: A calendar table.
+ *
+ * Queries the calendar data model that a calendar table is using.
+ *
+ * Return value: A calendar model.
+ **/
+ECalModel *
+e_task_table_get_model (ETaskTable *task_table)
+{
+	g_return_val_if_fail (E_IS_CALENDAR_TABLE (task_table), NULL);
+
+	return task_table->priv->model;
+}
+
+EShellView *
+e_task_table_get_shell_view (ETaskTable *task_table)
+{
+	g_return_val_if_fail (E_IS_CALENDAR_TABLE (task_table), NULL);
+
+	return task_table->priv->shell_view;
+}
+
+/* Used from e_table_selected_row_foreach(); puts the selected row number in an
+ * gint pointed to by the closure data.
+ */
+static void
+get_selected_row_cb (gint model_row, gpointer data)
+{
+	gint *row;
+
+	row = data;
+	*row = model_row;
+}
+
+/*
+ * Returns the component that is selected in the table; only works if there is
+ * one and only one selected row.
+ */
+static ECalModelComponent *
+get_selected_comp (ETaskTable *task_table)
+{
+	ECalModel *model;
+	gint row;
+
+	model = e_task_table_get_model (task_table);
+	if (e_table_selected_count (E_TABLE (task_table)) != 1)
+		return NULL;
+
+	row = -1;
+	e_table_selected_row_foreach (
+		E_TABLE (task_table), get_selected_row_cb, &row);
+	g_return_val_if_fail (row != -1, NULL);
+
+	return e_cal_model_get_component_at (model, row);
+}
+
+struct get_selected_uids_closure {
+	ETaskTable *task_table;
+	GSList *objects;
+};
+
+/* Used from e_table_selected_row_foreach(), builds a list of the selected UIDs */
+static void
+add_uid_cb (gint model_row, gpointer data)
+{
+	struct get_selected_uids_closure *closure = data;
+	ECalModelComponent *comp_data;
+	ECalModel *model;
+
+	model = e_task_table_get_model (closure->task_table);
+	comp_data = e_cal_model_get_component_at (model, model_row);
+
+	closure->objects = g_slist_prepend (closure->objects, comp_data);
+}
+
+static void
+add_retract_data (ECalComponent *comp, const gchar *retract_comment)
+{
+	icalcomponent *icalcomp = NULL;
+	icalproperty *icalprop = NULL;
+
+	icalcomp = e_cal_component_get_icalcomponent (comp);
+	if (retract_comment && *retract_comment)
+		icalprop = icalproperty_new_x (retract_comment);
+	else
+		icalprop = icalproperty_new_x ("0");
+	icalproperty_set_x_name (icalprop, "X-EVOLUTION-RETRACT-COMMENT");
+	icalcomponent_add_property (icalcomp, icalprop);
+}
+
+static gboolean
+check_for_retract (ECalComponent *comp, ECal *client)
+{
+	ECalComponentOrganizer org;
+	gchar *email = NULL;
+	const gchar *strip = NULL;
+	gboolean ret_val = FALSE;
+
+	if (!(e_cal_component_has_attendees (comp) &&
+				e_cal_get_save_schedules (client)))
+		return ret_val;
+
+	e_cal_component_get_organizer (comp, &org);
+	strip = itip_strip_mailto (org.value);
+
+	if (e_cal_get_cal_address (client, &email, NULL) && !g_ascii_strcasecmp (email, strip)) {
+		ret_val = TRUE;
+	}
+
+	g_free (email);
+	return ret_val;
+}
+
+/**
+ * e_task_table_delete_selected:
+ * @task_table: A calendar table.
+ *
+ * Deletes the selected components in the table; asks the user first.
+ **/
+void
+e_task_table_delete_selected (ETaskTable *task_table)
+{
+	gint n_selected;
+	ECalModelComponent *comp_data;
+	ECalComponent *comp = NULL;
+	gboolean delete = FALSE;
+	GError *error = NULL;
+
+	g_return_if_fail (task_table != NULL);
+	g_return_if_fail (E_IS_CALENDAR_TABLE (task_table));
+
+	n_selected = e_table_selected_count (E_TABLE (task_table));
+	if (n_selected <= 0)
+		return;
+
+	if (n_selected == 1)
+		comp_data = get_selected_comp (task_table);
+	else
+		comp_data = NULL;
+
+	/* FIXME: this may be something other than a TODO component */
+
+	if (comp_data) {
+		comp = e_cal_component_new ();
+		e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (comp_data->icalcomp));
+	}
+
+	if ((n_selected == 1) && comp && check_for_retract (comp, comp_data->client)) {
+		gchar *retract_comment = NULL;
+		gboolean retract = FALSE;
+
+		delete = prompt_retract_dialog (comp, &retract_comment, GTK_WIDGET (task_table), &retract);
+		if (retract) {
+			GList *users = NULL;
+			icalcomponent *icalcomp = NULL, *mod_comp = NULL;
+
+			add_retract_data (comp, retract_comment);
+			icalcomp = e_cal_component_get_icalcomponent (comp);
+			icalcomponent_set_method (icalcomp, ICAL_METHOD_CANCEL);
+			if (!e_cal_send_objects (comp_data->client, icalcomp, &users,
+						&mod_comp, &error))	{
+				delete_error_dialog (error, E_CAL_COMPONENT_TODO);
+				g_clear_error (&error);
+				error = NULL;
+			} else {
+
+				if (mod_comp)
+					icalcomponent_free (mod_comp);
+
+				if (users) {
+					g_list_foreach (users, (GFunc) g_free, NULL);
+					g_list_free (users);
+				}
+			}
+
+		}
+	} else {
+		delete = delete_component_dialog (comp, FALSE, n_selected, E_CAL_COMPONENT_TODO, GTK_WIDGET (task_table));
+	}
+
+	if (delete)
+		delete_selected_components (task_table);
+
+	/* free memory */
+	if (comp)
+		g_object_unref (comp);
+}
+
+/**
+ * e_task_table_get_selected:
+ * @task_table:
+ *
+ * Get the currently selected ECalModelComponent's on the table.
+ *
+ * Return value: A GSList of the components, which should be
+ * g_slist_free'd when finished with.
+ **/
+GSList *
+e_task_table_get_selected (ETaskTable *task_table)
+{
+	struct get_selected_uids_closure closure;
+
+	closure.task_table = task_table;
+	closure.objects = NULL;
+
+	e_table_selected_row_foreach (
+		E_TABLE (task_table), add_uid_cb, &closure);
+
+	return closure.objects;
+}
+
+static void
+hide_completed_rows (ECalModel *model, GList *clients_list, gchar *hide_sexp, GPtrArray *comp_objects)
+{
+	GList *l, *m, *objects;
+	ECal *client;
+	gint pos;
+	gboolean changed = FALSE;
+
+	for (l = clients_list; l != NULL; l = l->next) {
+		client = l->data;
+
+		if (!e_cal_get_object_list (client, hide_sexp, &objects, NULL)) {
+			g_warning (G_STRLOC ": Could not get the objects");
+
+			continue;
+		}
+
+		for (m = objects; m; m = m->next) {
+			ECalModelComponent *comp_data;
+			ECalComponentId *id;
+			ECalComponent *comp = e_cal_component_new ();
+
+			e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (m->data));
+			id = e_cal_component_get_id (comp);
+
+			if ((comp_data =  e_cal_model_get_component_for_uid (model, id))) {
+				e_table_model_pre_change (E_TABLE_MODEL (model));
+				pos = get_position_in_array (comp_objects, comp_data);
+				e_table_model_row_deleted (E_TABLE_MODEL (model), pos);
+				changed = TRUE;
+
+				if (g_ptr_array_remove (comp_objects, comp_data))
+					e_cal_model_free_component_data (comp_data);
+			}
+			e_cal_component_free_id (id);
+			g_object_unref (comp);
+		}
+
+		g_list_foreach (objects, (GFunc) icalcomponent_free, NULL);
+		g_list_free (objects);
+	}
+
+	if (changed) {
+		/* to notify about changes, because in call of row_deleted there are still all events */
+		e_table_model_changed (E_TABLE_MODEL (model));
+	}
+}
+
+static void
+show_completed_rows (ECalModel *model, GList *clients_list, gchar *show_sexp, GPtrArray *comp_objects)
+{
+	GList *l, *m, *objects;
+	ECal *client;
+
+	for (l = clients_list; l != NULL; l = l->next) {
+		client = l->data;
+
+		if (!e_cal_get_object_list (client, show_sexp, &objects, NULL)) {
+			g_warning (G_STRLOC ": Could not get the objects");
+
+			continue;
+		}
+
+		for (m = objects; m; m = m->next) {
+			ECalModelComponent *comp_data;
+			ECalComponentId *id;
+			ECalComponent *comp = e_cal_component_new ();
+
+			e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (m->data));
+			id = e_cal_component_get_id (comp);
+
+			if (!(e_cal_model_get_component_for_uid (model, id))) {
+				e_table_model_pre_change (E_TABLE_MODEL (model));
+				comp_data = g_object_new (E_TYPE_CAL_MODEL_COMPONENT, NULL);
+				comp_data->client = g_object_ref (client);
+				comp_data->icalcomp = icalcomponent_new_clone (m->data);
+				e_cal_model_set_instance_times (comp_data,
+						e_cal_model_get_timezone (model));
+				comp_data->dtstart = comp_data->dtend = comp_data->due = comp_data->completed = NULL;
+				comp_data->color = NULL;
+
+				g_ptr_array_add (comp_objects, comp_data);
+				e_table_model_row_inserted (E_TABLE_MODEL (model), comp_objects->len - 1);
+			}
+			e_cal_component_free_id (id);
+			g_object_unref (comp);
+		}
+	}
+}
+
+/* Returns the current time, for the ECellDateEdit items.
+   FIXME: Should probably use the timezone of the item rather than the
+   current timezone, though that may be difficult to get from here. */
+static struct tm
+e_task_table_get_current_time (ECellDateEdit *ecde, gpointer data)
+{
+	ETaskTable *task_table = data;
+	ECalModel *model;
+	icaltimezone *zone;
+	struct tm tmp_tm = { 0 };
+	struct icaltimetype tt;
+
+	/* Get the current timezone. */
+	model = e_task_table_get_model (task_table);
+	zone = e_cal_model_get_timezone (model);
+
+	tt = icaltime_from_timet_with_zone (time (NULL), FALSE, zone);
+
+	/* Now copy it to the struct tm and return it. */
+	tmp_tm.tm_year  = tt.year - 1900;
+	tmp_tm.tm_mon   = tt.month - 1;
+	tmp_tm.tm_mday  = tt.day;
+	tmp_tm.tm_hour  = tt.hour;
+	tmp_tm.tm_min   = tt.minute;
+	tmp_tm.tm_sec   = tt.second;
+	tmp_tm.tm_isdst = -1;
+
+	return tmp_tm;
+}
+
+/**
+ * e_task_table_hide_completed_tasks:
+ * @table: A calendar table model.
+ * @client_list: Clients List
+ *
+ * Hide completed tasks.
+ */
+void
+e_task_table_process_completed_tasks (ETaskTable *task_table,
+                                      GList *clients_list,
+                                      gboolean config_changed)
+{
+	ECalModel *model;
+	static GMutex *mutex = NULL;
+	gchar *hide_sexp, *show_sexp;
+	GPtrArray *comp_objects = NULL;
+
+	if (!mutex)
+		mutex = g_mutex_new ();
+
+	g_mutex_lock (mutex);
+
+	model = e_task_table_get_model (task_table);
+	comp_objects = e_cal_model_get_object_array (model);
+
+	hide_sexp = calendar_config_get_hide_completed_tasks_sexp (TRUE);
+	show_sexp = calendar_config_get_hide_completed_tasks_sexp (FALSE);
+
+	/* If hide option is unchecked */
+	if (!(hide_sexp && show_sexp))
+		show_sexp = g_strdup ("(is-completed?)");
+
+	/* Delete rows from model*/
+	if (hide_sexp) {
+		hide_completed_rows (model, clients_list, hide_sexp, comp_objects);
+	}
+
+	/* Insert rows into model */
+	if (config_changed) {
+		show_completed_rows (model, clients_list, show_sexp, comp_objects);
+	}
+
+	g_free (hide_sexp);
+	g_free (show_sexp);
+	g_mutex_unlock (mutex);
+}
diff --git a/calendar/gui/e-task-table.h b/calendar/gui/e-task-table.h
new file mode 100644
index 0000000000..8564d9901b
--- /dev/null
+++ b/calendar/gui/e-task-table.h
@@ -0,0 +1,111 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ *		Damon Chaplin <damon@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
+#ifndef E_TASK_TABLE_H
+#define E_TASK_TABLE_H
+
+#include <table/e-table.h>
+#include <table/e-cell-date-edit.h>
+#include <shell/e-shell-view.h>
+#include "e-cal-model.h"
+
+/*
+ * ETaskTable - displays the iCalendar objects in a table (an ETable).
+ *
+ * XXX ETaskTable and EMemoTable have lots of duplicate code.  We should
+ *     look at merging them, or at least bringing back ECalendarTable as
+ *     a common base class.
+ */
+
+/* Standard GObject macros */
+#define E_TYPE_TASK_TABLE \
+	(e_task_table_get_type ())
+#define E_TASK_TABLE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TASK_TABLE, ETaskTable))
+#define E_TASK_TABLE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TASK_TABLE, ETaskTableClass))
+#define E_IS_CALENDAR_TABLE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TASK_TABLE))
+#define E_IS_CALENDAR_TABLE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TASK_TABLE))
+#define E_TASK_TABLE_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TASK_TABLE, ETaskTableClass))
+
+G_BEGIN_DECLS
+
+typedef struct _ETaskTable ETaskTable;
+typedef struct _ETaskTableClass ETaskTableClass;
+typedef struct _ETaskTablePrivate ETaskTablePrivate;
+
+struct _ETaskTable {
+	ETable parent;
+
+	/* The ECell used to view & edit dates. */
+	ECellDateEdit *dates_cell;
+
+	/* Fields used for cut/copy/paste */
+	icalcomponent *tmp_vcal;
+
+	ETaskTablePrivate *priv;
+};
+
+struct _ETaskTableClass {
+	ETableClass parent_class;
+
+	/* Signals */
+	void	(*open_component)		(ETaskTable *task_table,
+						 ECalModelComponent *comp_data);
+	void	(*popup_event)			(ETaskTable *task_table,
+						 GdkEvent *event);
+	void	(*status_message)		(ETaskTable *task_table,
+						 const gchar *message,
+						 gdouble percent);
+	void	(*user_created)			(ETaskTable *task_table);
+};
+
+GType		e_task_table_get_type		(void);
+GtkWidget *	e_task_table_new		(EShellView *shell_view,
+						 ECalModel *model);
+ECalModel *	e_task_table_get_model		(ETaskTable *task_table);
+EShellView *	e_task_table_get_shell_view	(ETaskTable *task_table);
+void		e_task_table_delete_selected	(ETaskTable *task_table);
+GSList *	e_task_table_get_selected	(ETaskTable *task_table);
+ECalModelComponent *
+		e_task_table_get_selected_comp
+						(ETaskTable *task_table);
+void		e_task_table_hide_completed_tasks
+						(ETaskTable *table,
+						 GList *clients_list,
+						 gboolean config_changed);
+void		e_task_table_process_completed_tasks
+						(ETaskTable *table,
+						 GList *clients_list,
+						 gboolean config_changed);
+
+G_END_DECLS
+
+#endif /* E_TASK_TABLE_H */
diff --git a/modules/calendar/e-cal-shell-content.c b/modules/calendar/e-cal-shell-content.c
index 49b2f7f536..1ab680eec4 100644
--- a/modules/calendar/e-cal-shell-content.c
+++ b/modules/calendar/e-cal-shell-content.c
@@ -33,7 +33,6 @@
 #include "calendar/gui/calendar-view.h"
 #include "calendar/gui/e-cal-list-view.h"
 #include "calendar/gui/e-cal-model-calendar.h"
-#include "calendar/gui/e-calendar-table.h"
 #include "calendar/gui/e-calendar-view.h"
 #include "calendar/gui/e-day-view.h"
 #include "calendar/gui/e-week-view.h"
@@ -61,8 +60,8 @@ struct _ECalShellContentPrivate {
 enum {
 	PROP_0,
 	PROP_CALENDAR,
-	PROP_TASK_TABLE,
-	PROP_MEMO_TABLE
+	PROP_MEMO_TABLE,
+	PROP_TASK_TABLE
 };
 
 /* Used to indicate who has the focus within the calendar view. */
@@ -146,8 +145,8 @@ cal_shell_content_get_focus_location (ECalShellContent *cal_shell_content)
 	GnomeCalendar *calendar;
 	GnomeCalendarViewType view_type;
 	ECalendarView *calendar_view;
-	ECalendarTable *task_table;
 	EMemoTable *memo_table;
+	ETaskTable *task_table;
 	ETable *table;
 
 	/* XXX This function is silly.  Certainly there are better ways
@@ -159,7 +158,7 @@ cal_shell_content_get_focus_location (ECalShellContent *cal_shell_content)
 	calendar_view = gnome_calendar_get_calendar_view (calendar, view_type);
 
 	memo_table = E_MEMO_TABLE (cal_shell_content->priv->memo_table);
-	task_table = E_CALENDAR_TABLE (cal_shell_content->priv->task_table);
+	task_table = E_TASK_TABLE (cal_shell_content->priv->task_table);
 
 	table = E_TABLE (memo_table);
 	if (gtk_widget_is_focus (GTK_WIDGET (table->table_canvas)))
@@ -239,14 +238,16 @@ cal_shell_content_get_property (GObject *object,
 				value, e_cal_shell_content_get_calendar (
 				E_CAL_SHELL_CONTENT (object)));
 			return;
-		case PROP_TASK_TABLE:
+
+		case PROP_MEMO_TABLE:
 			g_value_set_object (
-				value, e_cal_shell_content_get_task_table (
+				value, e_cal_shell_content_get_memo_table (
 				E_CAL_SHELL_CONTENT (object)));
 			return;
-		case PROP_MEMO_TABLE:
+
+		case PROP_TASK_TABLE:
 			g_value_set_object (
-				value, e_cal_shell_content_get_memo_table (
+				value, e_cal_shell_content_get_task_table (
 				E_CAL_SHELL_CONTENT (object)));
 			return;
 	}
@@ -457,7 +458,7 @@ cal_shell_content_constructed (GObject *object)
 
 	container = widget;
 
-	widget = e_calendar_table_new (shell_view, task_model);
+	widget = e_task_table_new (shell_view, task_model);
 	gtk_container_add (GTK_CONTAINER (container), widget);
 	priv->task_table = g_object_ref (widget);
 	gtk_widget_show (widget);
@@ -591,24 +592,23 @@ cal_shell_content_class_init (ECalShellContentClass *class)
 
 	g_object_class_install_property (
 		object_class,
-		PROP_TASK_TABLE,
+		PROP_MEMO_TABLE,
 		g_param_spec_object (
-			"task-table",
+			"memo-table",
 			NULL,
 			NULL,
-			E_TYPE_CALENDAR_TABLE,
+			E_TYPE_MEMO_TABLE,
 			G_PARAM_READABLE));
 
 	g_object_class_install_property (
 		object_class,
-		PROP_MEMO_TABLE,
+		PROP_TASK_TABLE,
 		g_param_spec_object (
-			"memo-table",
+			"task-table",
 			NULL,
 			NULL,
-			E_TYPE_MEMO_TABLE,
+			E_TYPE_TASK_TABLE,
 			G_PARAM_READABLE));
-
 }
 
 static void
@@ -688,13 +688,13 @@ e_cal_shell_content_get_memo_table (ECalShellContent *cal_shell_content)
 	return E_MEMO_TABLE (cal_shell_content->priv->memo_table);
 }
 
-ECalendarTable *
+ETaskTable *
 e_cal_shell_content_get_task_table (ECalShellContent *cal_shell_content)
 {
 	g_return_val_if_fail (
 		E_IS_CAL_SHELL_CONTENT (cal_shell_content), NULL);
 
-	return E_CALENDAR_TABLE (cal_shell_content->priv->task_table);
+	return E_TASK_TABLE (cal_shell_content->priv->task_table);
 }
 
 EShellSearchbar *
@@ -726,7 +726,7 @@ e_cal_shell_content_delete_selection (ECalShellContent *cal_shell_content)
 {
 	GnomeCalendar *calendar;
 	EMemoTable *memo_table;
-	ECalendarTable *task_table;
+	ETaskTable *task_table;
 	GnomeCalendarViewType view_type;
 	ECalendarView *calendar_view;
 
@@ -749,7 +749,7 @@ e_cal_shell_content_delete_selection (ECalShellContent *cal_shell_content)
 			break;
 
 		case FOCUS_TASK_TABLE:
-			e_calendar_table_delete_selected (task_table);
+			e_task_table_delete_selected (task_table);
 			break;
 
 		default:
diff --git a/modules/calendar/e-cal-shell-content.h b/modules/calendar/e-cal-shell-content.h
index db82889eab..78c2199c50 100644
--- a/modules/calendar/e-cal-shell-content.h
+++ b/modules/calendar/e-cal-shell-content.h
@@ -26,8 +26,8 @@
 #include <shell/e-shell-searchbar.h>
 #include <shell/e-shell-view.h>
 
-#include <calendar/gui/e-calendar-table.h>
 #include <calendar/gui/e-memo-table.h>
+#include <calendar/gui/e-task-table.h>
 #include <calendar/gui/gnome-cal.h>
 #include <menus/gal-view-instance.h>
 
@@ -89,7 +89,7 @@ GnomeCalendar *	e_cal_shell_content_get_calendar
 					(ECalShellContent *cal_shell_content);
 EMemoTable *	e_cal_shell_content_get_memo_table
 					(ECalShellContent *cal_shell_content);
-ECalendarTable *e_cal_shell_content_get_task_table
+ETaskTable *	e_cal_shell_content_get_task_table
 					(ECalShellContent *cal_shell_content);
 EShellSearchbar *
 		e_cal_shell_content_get_searchbar
diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c
index ddf9dd7204..0a12f73743 100644
--- a/modules/calendar/e-cal-shell-view-private.c
+++ b/modules/calendar/e-cal-shell-view-private.c
@@ -443,7 +443,7 @@ e_cal_shell_view_private_constructed (ECalShellView *cal_shell_view)
 	GnomeCalendar *calendar;
 	ECalendar *date_navigator;
 	EMemoTable *memo_table;
-	ECalendarTable *task_table;
+	ETaskTable *task_table;
 	ESourceSelector *selector;
 	ECalModel *model;
 	gint ii;
diff --git a/modules/calendar/e-cal-shell-view-taskpad.c b/modules/calendar/e-cal-shell-view-taskpad.c
index 33b21aeb55..67a355a9bd 100644
--- a/modules/calendar/e-cal-shell-view-taskpad.c
+++ b/modules/calendar/e-cal-shell-view-taskpad.c
@@ -28,14 +28,14 @@ action_calendar_taskpad_assign_cb (GtkAction *action,
                                    ECalShellView *cal_shell_view)
 {
 	ECalShellContent *cal_shell_content;
-	ECalendarTable *task_table;
 	ECalModelComponent *comp_data;
+	ETaskTable *task_table;
 	GSList *list;
 
 	cal_shell_content = cal_shell_view->priv->cal_shell_content;
 	task_table = e_cal_shell_content_get_task_table (cal_shell_content);
 
-	list = e_calendar_table_get_selected (task_table);
+	list = e_task_table_get_selected (task_table);
 	g_return_if_fail (list != NULL);
 	comp_data = list->data;
 	g_slist_free (list);
@@ -51,14 +51,14 @@ action_calendar_taskpad_delete_cb (GtkAction *action,
                                    ECalShellView *cal_shell_view)
 {
 	ECalShellContent *cal_shell_content;
-	ECalendarTable *task_table;
+	ETaskTable *task_table;
 
 	cal_shell_content = cal_shell_view->priv->cal_shell_content;
 	task_table = e_cal_shell_content_get_task_table (cal_shell_content);
 
 	e_cal_shell_view_taskpad_set_status_message (
 		cal_shell_view, _("Deleting selected tasks..."), -1.0);
-	e_calendar_table_delete_selected (task_table);
+	e_task_table_delete_selected (task_table);
 	e_cal_shell_view_taskpad_set_status_message (
 		cal_shell_view, NULL, -1.0);
 }
@@ -68,8 +68,8 @@ action_calendar_taskpad_forward_cb (GtkAction *action,
                                     ECalShellView *cal_shell_view)
 {
 	ECalShellContent *cal_shell_content;
-	ECalendarTable *task_table;
 	ECalModelComponent *comp_data;
+	ETaskTable *task_table;
 	ECalComponent *comp;
 	icalcomponent *clone;
 	GSList *list;
@@ -77,7 +77,7 @@ action_calendar_taskpad_forward_cb (GtkAction *action,
 	cal_shell_content = cal_shell_view->priv->cal_shell_content;
 	task_table = e_cal_shell_content_get_task_table (cal_shell_content);
 
-	list = e_calendar_table_get_selected (task_table);
+	list = e_task_table_get_selected (task_table);
 	g_return_if_fail (list != NULL);
 	comp_data = list->data;
 	g_slist_free (list);
@@ -97,14 +97,14 @@ action_calendar_taskpad_mark_complete_cb (GtkAction *action,
                                           ECalShellView *cal_shell_view)
 {
 	ECalShellContent *cal_shell_content;
-	ECalendarTable *task_table;
+	ETaskTable *task_table;
 	ECalModel *model;
 	GSList *list, *iter;
 
 	cal_shell_content = cal_shell_view->priv->cal_shell_content;
 	task_table = e_cal_shell_content_get_task_table (cal_shell_content);
-	list = e_calendar_table_get_selected (task_table);
-	model = e_calendar_table_get_model (task_table);
+	list = e_task_table_get_selected (task_table);
+	model = e_task_table_get_model (task_table);
 
 	for (iter = list; iter != NULL; iter = iter->next) {
 		ECalModelComponent *comp_data = iter->data;
@@ -120,14 +120,14 @@ action_calendar_taskpad_mark_incomplete_cb (GtkAction *action,
                                             ECalShellView *cal_shell_view)
 {
 	ECalShellContent *cal_shell_content;
-	ECalendarTable *task_table;
+	ETaskTable *task_table;
 	ECalModel *model;
 	GSList *list, *iter;
 
 	cal_shell_content = cal_shell_view->priv->cal_shell_content;
 	task_table = e_cal_shell_content_get_task_table (cal_shell_content);
-	list = e_calendar_table_get_selected (task_table);
-	model = e_calendar_table_get_model (task_table);
+	list = e_task_table_get_selected (task_table);
+	model = e_task_table_get_model (task_table);
 
 	for (iter = list; iter != NULL; iter = iter->next) {
 		ECalModelComponent *comp_data = iter->data;
@@ -146,8 +146,8 @@ action_calendar_taskpad_new_cb (GtkAction *action,
 	EShellView *shell_view;
 	EShellWindow *shell_window;
 	ECalShellContent *cal_shell_content;
-	ECalendarTable *task_table;
 	ECalModelComponent *comp_data;
+	ETaskTable *task_table;
 	ECal *client;
 	ECalComponent *comp;
 	CompEditor *editor;
@@ -160,7 +160,7 @@ action_calendar_taskpad_new_cb (GtkAction *action,
 	cal_shell_content = cal_shell_view->priv->cal_shell_content;
 	task_table = e_cal_shell_content_get_task_table (cal_shell_content);
 
-	list = e_calendar_table_get_selected (task_table);
+	list = e_task_table_get_selected (task_table);
 	g_return_if_fail (list != NULL);
 	comp_data = list->data;
 	g_slist_free (list);
@@ -181,14 +181,14 @@ action_calendar_taskpad_open_cb (GtkAction *action,
                                  ECalShellView *cal_shell_view)
 {
 	ECalShellContent *cal_shell_content;
-	ECalendarTable *task_table;
 	ECalModelComponent *comp_data;
+	ETaskTable *task_table;
 	GSList *list;
 
 	cal_shell_content = cal_shell_view->priv->cal_shell_content;
 	task_table = e_cal_shell_content_get_task_table (cal_shell_content);
 
-	list = e_calendar_table_get_selected (task_table);
+	list = e_task_table_get_selected (task_table);
 	g_return_if_fail (list != NULL);
 	comp_data = list->data;
 	g_slist_free (list);
@@ -204,8 +204,8 @@ action_calendar_taskpad_open_url_cb (GtkAction *action,
 	EShellView *shell_view;
 	EShellWindow *shell_window;
 	ECalShellContent *cal_shell_content;
-	ECalendarTable *task_table;
 	ECalModelComponent *comp_data;
+	ETaskTable *task_table;
 	icalproperty *prop;
 	const gchar *uri;
 	GSList *list;
@@ -216,7 +216,7 @@ action_calendar_taskpad_open_url_cb (GtkAction *action,
 	cal_shell_content = cal_shell_view->priv->cal_shell_content;
 	task_table = e_cal_shell_content_get_task_table (cal_shell_content);
 
-	list = e_calendar_table_get_selected (task_table);
+	list = e_task_table_get_selected (task_table);
 	g_return_if_fail (list != NULL);
 	comp_data = list->data;
 
@@ -234,8 +234,8 @@ action_calendar_taskpad_print_cb (GtkAction *action,
                                   ECalShellView *cal_shell_view)
 {
 	ECalShellContent *cal_shell_content;
-	ECalendarTable *task_table;
 	ECalModelComponent *comp_data;
+	ETaskTable *task_table;
 	ECalComponent *comp;
 	icalcomponent *clone;
 	GtkPrintOperationAction print_action;
@@ -244,7 +244,7 @@ action_calendar_taskpad_print_cb (GtkAction *action,
 	cal_shell_content = cal_shell_view->priv->cal_shell_content;
 	task_table = e_cal_shell_content_get_task_table (cal_shell_content);
 
-	list = e_calendar_table_get_selected (task_table);
+	list = e_task_table_get_selected (task_table);
 	g_return_if_fail (list != NULL);
 	comp_data = list->data;
 	g_slist_free (list);
@@ -267,8 +267,8 @@ action_calendar_taskpad_save_as_cb (GtkAction *action,
 	EShellWindow *shell_window;
 	EShellBackend *shell_backend;
 	ECalShellContent *cal_shell_content;
-	ECalendarTable *task_table;
 	ECalModelComponent *comp_data;
+	ETaskTable *task_table;
 	EActivity *activity;
 	GSList *list;
 	GFile *file;
@@ -282,7 +282,7 @@ action_calendar_taskpad_save_as_cb (GtkAction *action,
 	cal_shell_content = cal_shell_view->priv->cal_shell_content;
 	task_table = e_cal_shell_content_get_task_table (cal_shell_content);
 
-	list = e_calendar_table_get_selected (task_table);
+	list = e_task_table_get_selected (task_table);
 	g_return_if_fail (list != NULL);
 	comp_data = list->data;
 	g_slist_free (list);
@@ -425,7 +425,7 @@ e_cal_shell_view_taskpad_actions_update (ECalShellView *cal_shell_view)
 	ECalShellContent *cal_shell_content;
 	EShellWindow *shell_window;
 	EShellView *shell_view;
-	ECalendarTable *task_table;
+	ETaskTable *task_table;
 	GtkAction *action;
 	GSList *list, *iter;
 	const gchar *label;
@@ -445,7 +445,7 @@ e_cal_shell_view_taskpad_actions_update (ECalShellView *cal_shell_view)
 
 	n_selected = e_table_selected_count (E_TABLE (task_table));
 
-	list = e_calendar_table_get_selected (task_table);
+	list = e_task_table_get_selected (task_table);
 	for (iter = list; iter != NULL; iter = iter->next) {
 		ECalModelComponent *comp_data = iter->data;
 		icalproperty *prop;
diff --git a/modules/calendar/e-task-shell-content.c b/modules/calendar/e-task-shell-content.c
index e50b67bf5a..6727dd1bcd 100644
--- a/modules/calendar/e-task-shell-content.c
+++ b/modules/calendar/e-task-shell-content.c
@@ -32,13 +32,12 @@
 
 #include "calendar/gui/comp-util.h"
 #include "calendar/gui/e-cal-model-tasks.h"
-#include "calendar/gui/e-calendar-table.h"
 
 #define E_TASK_SHELL_CONTENT_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_TASK_SHELL_CONTENT, ETaskShellContentPrivate))
 
-#define E_CALENDAR_TABLE_DEFAULT_STATE \
+#define E_TASK_TABLE_DEFAULT_STATE \
 	"<?xml version=\"1.0\"?>" \
 	"<ETableState>" \
 	"  <column source=\"13\"/>" \
@@ -85,7 +84,7 @@ static void
 task_shell_content_display_view_cb (ETaskShellContent *task_shell_content,
                                     GalView *gal_view)
 {
-	ECalendarTable *task_table;
+	ETaskTable *task_table;
 
 	if (!GAL_IS_VIEW_ETABLE (gal_view))
 		return;
@@ -144,7 +143,7 @@ task_shell_content_table_drag_data_get_cb (ETaskShellContent *task_shell_content
                                            guint info,
                                            guint time)
 {
-	ECalendarTable *task_table;
+	ETaskTable *task_table;
 
 	struct {
 		ECalModel *model;
@@ -156,7 +155,7 @@ task_shell_content_table_drag_data_get_cb (ETaskShellContent *task_shell_content
 
 	task_table = e_task_shell_content_get_task_table (task_shell_content);
 
-	foreach_data.model = e_calendar_table_get_model (task_table);
+	foreach_data.model = e_task_table_get_model (task_table);
 	foreach_data.list = NULL;
 
 	e_table_selected_row_foreach (
@@ -190,7 +189,7 @@ task_shell_content_cursor_change_cb (ETaskShellContent *task_shell_content,
                                      ETable *table)
 {
 	ECalComponentPreview *task_preview;
-	ECalendarTable *task_table;
+	ETaskTable *task_table;
 	ECalModel *task_model;
 	ECalModelComponent *comp_data;
 	ECalComponent *comp;
@@ -239,7 +238,7 @@ task_shell_content_model_row_changed_cb (ETaskShellContent *task_shell_content,
                                          ETableModel *model)
 {
 	ECalModelComponent *comp_data;
-	ECalendarTable *task_table;
+	ETaskTable *task_table;
 	const gchar *current_uid;
 	const gchar *uid;
 
@@ -438,7 +437,7 @@ task_shell_content_constructed (GObject *object)
 
 	container = widget;
 
-	widget = e_calendar_table_new (shell_view, priv->task_model);
+	widget = e_task_table_new (shell_view, priv->task_model);
 	gtk_container_add (GTK_CONTAINER (container), widget);
 	priv->task_table = g_object_ref (widget);
 	gtk_widget_show (widget);
@@ -474,7 +473,7 @@ task_shell_content_constructed (GObject *object)
 	/* Configure the task table. */
 
 	e_table_set_state (
-		E_TABLE (priv->task_table), E_CALENDAR_TABLE_DEFAULT_STATE);
+		E_TABLE (priv->task_table), E_TASK_TABLE_DEFAULT_STATE);
 
 	e_table_drag_source_set (
 		E_TABLE (priv->task_table),
@@ -533,7 +532,7 @@ static guint32
 task_shell_content_check_state (EShellContent *shell_content)
 {
 	ETaskShellContent *task_shell_content;
-	ECalendarTable *task_table;
+	ETaskTable *task_table;
 	GSList *list, *iter;
 	gboolean assignable = TRUE;
 	gboolean editable = TRUE;
@@ -548,7 +547,7 @@ task_shell_content_check_state (EShellContent *shell_content)
 
 	n_selected = e_table_selected_count (E_TABLE (task_table));
 
-	list = e_calendar_table_get_selected (task_table);
+	list = e_task_table_get_selected (task_table);
 	for (iter = list; iter != NULL; iter = iter->next) {
 		ECalModelComponent *comp_data = iter->data;
 		icalproperty *prop;
@@ -716,13 +715,13 @@ e_task_shell_content_get_task_preview (ETaskShellContent *task_shell_content)
 		task_shell_content->priv->task_preview);
 }
 
-ECalendarTable *
+ETaskTable *
 e_task_shell_content_get_task_table (ETaskShellContent *task_shell_content)
 {
 	g_return_val_if_fail (
 		E_IS_TASK_SHELL_CONTENT (task_shell_content), NULL);
 
-	return E_CALENDAR_TABLE (task_shell_content->priv->task_table);
+	return E_TASK_TABLE (task_shell_content->priv->task_table);
 }
 
 gboolean
diff --git a/modules/calendar/e-task-shell-content.h b/modules/calendar/e-task-shell-content.h
index 7a5e8efd81..dd39f8c6ce 100644
--- a/modules/calendar/e-task-shell-content.h
+++ b/modules/calendar/e-task-shell-content.h
@@ -27,8 +27,8 @@
 #include <shell/e-shell-view.h>
 
 #include <calendar/gui/e-cal-model.h>
-#include <calendar/gui/e-calendar-table.h>
 #include <calendar/gui/e-cal-component-preview.h>
+#include <calendar/gui/e-task-table.h>
 
 #include <menus/gal-view-instance.h>
 
@@ -85,7 +85,7 @@ ECalModel *	e_task_shell_content_get_task_model
 ECalComponentPreview *
 		e_task_shell_content_get_task_preview
 					(ETaskShellContent *task_shell_content);
-ECalendarTable *e_task_shell_content_get_task_table
+ETaskTable *	e_task_shell_content_get_task_table
 					(ETaskShellContent *task_shell_content);
 gboolean	e_task_shell_content_get_preview_visible
 					(ETaskShellContent *task_shell_content);
diff --git a/modules/calendar/e-task-shell-view-actions.c b/modules/calendar/e-task-shell-view-actions.c
index 3d14678f7b..2b25f3373e 100644
--- a/modules/calendar/e-task-shell-view-actions.c
+++ b/modules/calendar/e-task-shell-view-actions.c
@@ -55,14 +55,14 @@ action_task_assign_cb (GtkAction *action,
                        ETaskShellView *task_shell_view)
 {
 	ETaskShellContent *task_shell_content;
-	ECalendarTable *task_table;
 	ECalModelComponent *comp_data;
+	ETaskTable *task_table;
 	GSList *list;
 
 	task_shell_content = task_shell_view->priv->task_shell_content;
 	task_table = e_task_shell_content_get_task_table (task_shell_content);
 
-	list = e_calendar_table_get_selected (task_table);
+	list = e_task_table_get_selected (task_table);
 	g_return_if_fail (list != NULL);
 	comp_data = list->data;
 	g_slist_free (list);
@@ -79,7 +79,7 @@ action_task_delete_cb (GtkAction *action,
 {
 	ETaskShellContent *task_shell_content;
 	ECalComponentPreview *task_preview;
-	ECalendarTable *task_table;
+	ETaskTable *task_table;
 
 	task_shell_content = task_shell_view->priv->task_shell_content;
 	task_table = e_task_shell_content_get_task_table (task_shell_content);
@@ -87,7 +87,7 @@ action_task_delete_cb (GtkAction *action,
 
 	e_task_shell_view_set_status_message (
 		task_shell_view, _("Deleting selected tasks..."), -1.0);
-	e_calendar_table_delete_selected (task_table);
+	e_task_table_delete_selected (task_table);
 	e_task_shell_view_set_status_message (task_shell_view, NULL, -1.0);
 
 	e_cal_component_preview_clear (task_preview);
@@ -98,8 +98,8 @@ action_task_forward_cb (GtkAction *action,
                         ETaskShellView *task_shell_view)
 {
 	ETaskShellContent *task_shell_content;
-	ECalendarTable *task_table;
 	ECalModelComponent *comp_data;
+	ETaskTable *task_table;
 	ECalComponent *comp;
 	icalcomponent *clone;
 	GSList *list;
@@ -107,7 +107,7 @@ action_task_forward_cb (GtkAction *action,
 	task_shell_content = task_shell_view->priv->task_shell_content;
 	task_table = e_task_shell_content_get_task_table (task_shell_content);
 
-	list = e_calendar_table_get_selected (task_table);
+	list = e_task_table_get_selected (task_table);
 	g_return_if_fail (list != NULL);
 	comp_data = list->data;
 	g_slist_free (list);
@@ -154,7 +154,7 @@ action_task_list_delete_cb (GtkAction *action,
 	ETaskShellSidebar *task_shell_sidebar;
 	EShellWindow *shell_window;
 	EShellView *shell_view;
-	ECalendarTable *task_table;
+	ETaskTable *task_table;
 	ECal *client;
 	ECalModel *model;
 	ESourceSelector *selector;
@@ -173,7 +173,7 @@ action_task_list_delete_cb (GtkAction *action,
 
 	task_shell_content = task_shell_view->priv->task_shell_content;
 	task_table = e_task_shell_content_get_task_table (task_shell_content);
-	model = e_calendar_table_get_model (task_table);
+	model = e_task_table_get_model (task_table);
 
 	task_shell_sidebar = task_shell_view->priv->task_shell_sidebar;
 	selector = e_task_shell_sidebar_get_selector (task_shell_sidebar);
@@ -234,7 +234,7 @@ action_task_list_print_cb (GtkAction *action,
                            ETaskShellView *task_shell_view)
 {
 	ETaskShellContent *task_shell_content;
-	ECalendarTable *task_table;
+	ETaskTable *task_table;
 
 	task_shell_content = task_shell_view->priv->task_shell_content;
 	task_table = e_task_shell_content_get_task_table (task_shell_content);
@@ -249,7 +249,7 @@ action_task_list_print_preview_cb (GtkAction *action,
                                    ETaskShellView *task_shell_view)
 {
 	ETaskShellContent *task_shell_content;
-	ECalendarTable *task_table;
+	ETaskTable *task_table;
 
 	task_shell_content = task_shell_view->priv->task_shell_content;
 	task_table = e_task_shell_content_get_task_table (task_shell_content);
@@ -368,14 +368,14 @@ action_task_mark_complete_cb (GtkAction *action,
                               ETaskShellView *task_shell_view)
 {
 	ETaskShellContent *task_shell_content;
-	ECalendarTable *task_table;
+	ETaskTable *task_table;
 	ECalModel *model;
 	GSList *list, *iter;
 
 	task_shell_content = task_shell_view->priv->task_shell_content;
 	task_table = e_task_shell_content_get_task_table (task_shell_content);
-	list = e_calendar_table_get_selected (task_table);
-	model = e_calendar_table_get_model (task_table);
+	list = e_task_table_get_selected (task_table);
+	model = e_task_table_get_model (task_table);
 
 	for (iter = list; iter != NULL; iter = iter->next) {
 		ECalModelComponent *comp_data = iter->data;
@@ -391,14 +391,14 @@ action_task_mark_incomplete_cb (GtkAction *action,
                                 ETaskShellView *task_shell_view)
 {
 	ETaskShellContent *task_shell_content;
-	ECalendarTable *task_table;
+	ETaskTable *task_table;
 	ECalModel *model;
 	GSList *list, *iter;
 
 	task_shell_content = task_shell_view->priv->task_shell_content;
 	task_table = e_task_shell_content_get_task_table (task_shell_content);
-	list = e_calendar_table_get_selected (task_table);
-	model = e_calendar_table_get_model (task_table);
+	list = e_task_table_get_selected (task_table);
+	model = e_task_table_get_model (task_table);
 
 	for (iter = list; iter != NULL; iter = iter->next) {
 		ECalModelComponent *comp_data = iter->data;
@@ -417,8 +417,8 @@ action_task_new_cb (GtkAction *action,
 	EShellView *shell_view;
 	EShellWindow *shell_window;
 	ETaskShellContent *task_shell_content;
-	ECalendarTable *task_table;
 	ECalModelComponent *comp_data;
+	ETaskTable *task_table;
 	ECal *client;
 	ECalComponent *comp;
 	CompEditor *editor;
@@ -431,7 +431,7 @@ action_task_new_cb (GtkAction *action,
 	task_shell_content = task_shell_view->priv->task_shell_content;
 	task_table = e_task_shell_content_get_task_table (task_shell_content);
 
-	list = e_calendar_table_get_selected (task_table);
+	list = e_task_table_get_selected (task_table);
 	g_return_if_fail (list != NULL);
 	comp_data = list->data;
 	g_slist_free (list);
@@ -452,14 +452,14 @@ action_task_open_cb (GtkAction *action,
                      ETaskShellView *task_shell_view)
 {
 	ETaskShellContent *task_shell_content;
-	ECalendarTable *task_table;
 	ECalModelComponent *comp_data;
+	ETaskTable *task_table;
 	GSList *list;
 
 	task_shell_content = task_shell_view->priv->task_shell_content;
 	task_table = e_task_shell_content_get_task_table (task_shell_content);
 
-	list = e_calendar_table_get_selected (task_table);
+	list = e_task_table_get_selected (task_table);
 	g_return_if_fail (list != NULL);
 	comp_data = list->data;
 	g_slist_free (list);
@@ -475,8 +475,8 @@ action_task_open_url_cb (GtkAction *action,
 	EShellView *shell_view;
 	EShellWindow *shell_window;
 	ETaskShellContent *task_shell_content;
-	ECalendarTable *task_table;
 	ECalModelComponent *comp_data;
+	ETaskTable *task_table;
 	icalproperty *prop;
 	const gchar *uri;
 	GSList *list;
@@ -487,7 +487,7 @@ action_task_open_url_cb (GtkAction *action,
 	task_shell_content = task_shell_view->priv->task_shell_content;
 	task_table = e_task_shell_content_get_task_table (task_shell_content);
 
-	list = e_calendar_table_get_selected (task_table);
+	list = e_task_table_get_selected (task_table);
 	g_return_if_fail (list != NULL);
 	comp_data = list->data;
 
@@ -517,9 +517,9 @@ action_task_print_cb (GtkAction *action,
                       ETaskShellView *task_shell_view)
 {
 	ETaskShellContent *task_shell_content;
-	ECalendarTable *task_table;
 	ECalModelComponent *comp_data;
 	ECalComponent *comp;
+	ETaskTable *task_table;
 	icalcomponent *clone;
 	GtkPrintOperationAction print_action;
 	GSList *list;
@@ -527,7 +527,7 @@ action_task_print_cb (GtkAction *action,
 	task_shell_content = task_shell_view->priv->task_shell_content;
 	task_table = e_task_shell_content_get_task_table (task_shell_content);
 
-	list = e_calendar_table_get_selected (task_table);
+	list = e_task_table_get_selected (task_table);
 	g_return_if_fail (list != NULL);
 	comp_data = list->data;
 	g_slist_free (list);
@@ -599,8 +599,8 @@ action_task_save_as_cb (GtkAction *action,
 	EShellWindow *shell_window;
 	EShellBackend *shell_backend;
 	ETaskShellContent *task_shell_content;
-	ECalendarTable *task_table;
 	ECalModelComponent *comp_data;
+	ETaskTable *task_table;
 	EActivity *activity;
 	GSList *list;
 	GFile *file;
@@ -614,7 +614,7 @@ action_task_save_as_cb (GtkAction *action,
 	task_shell_content = task_shell_view->priv->task_shell_content;
 	task_table = e_task_shell_content_get_task_table (task_shell_content);
 
-	list = e_calendar_table_get_selected (task_table);
+	list = e_task_table_get_selected (task_table);
 	g_return_if_fail (list != NULL);
 	comp_data = list->data;
 	g_slist_free (list);
diff --git a/modules/calendar/e-task-shell-view-private.c b/modules/calendar/e-task-shell-view-private.c
index 533a36d3eb..dfa00f73ba 100644
--- a/modules/calendar/e-task-shell-view-private.c
+++ b/modules/calendar/e-task-shell-view-private.c
@@ -28,7 +28,7 @@ task_shell_view_process_completed_tasks (ETaskShellView *task_shell_view)
 {
 	ETaskShellContent *task_shell_content;
 	ETaskShellSidebar *task_shell_sidebar;
-	ECalendarTable *task_table;
+	ETaskTable *task_table;
 	GList *clients;
 
 	task_shell_content = task_shell_view->priv->task_shell_content;
@@ -37,7 +37,7 @@ task_shell_view_process_completed_tasks (ETaskShellView *task_shell_view)
 	task_shell_sidebar = task_shell_view->priv->task_shell_sidebar;
 	clients = e_task_shell_sidebar_get_clients (task_shell_sidebar);
 
-	e_calendar_table_process_completed_tasks (task_table, clients, TRUE);
+	e_task_table_process_completed_tasks (task_table, clients, TRUE);
 
 	/* Search query takes whether to show completed tasks into account,
 	 * so if the preference has changed we need to update the query. */
@@ -58,7 +58,7 @@ task_shell_view_table_popup_event_cb (EShellView *shell_view,
 
 static void
 task_shell_view_table_user_created_cb (ETaskShellView *task_shell_view,
-                                       ECalendarTable *task_table)
+                                       ETaskTable *task_table)
 {
 	ETaskShellSidebar *task_shell_sidebar;
 	ECalModel *model;
@@ -67,7 +67,7 @@ task_shell_view_table_user_created_cb (ETaskShellView *task_shell_view,
 
 	/* This is the "Click to Add" handler. */
 
-	model = e_calendar_table_get_model (task_table);
+	model = e_task_table_get_model (task_table);
 	client = e_cal_model_get_default_client (model);
 	source = e_cal_get_source (client);
 
@@ -82,12 +82,12 @@ task_shell_view_selector_client_added_cb (ETaskShellView *task_shell_view,
                                           ECal *client)
 {
 	ETaskShellContent *task_shell_content;
-	ECalendarTable *task_table;
+	ETaskTable *task_table;
 	ECalModel *model;
 
 	task_shell_content = task_shell_view->priv->task_shell_content;
 	task_table = e_task_shell_content_get_task_table (task_shell_content);
-	model = e_calendar_table_get_model (task_table);
+	model = e_task_table_get_model (task_table);
 
 	e_cal_model_add_client (model, client);
 	e_task_shell_view_update_timezone (task_shell_view);
@@ -98,12 +98,12 @@ task_shell_view_selector_client_removed_cb (ETaskShellView *task_shell_view,
                                             ECal *client)
 {
 	ETaskShellContent *task_shell_content;
-	ECalendarTable *task_table;
+	ETaskTable *task_table;
 	ECalModel *model;
 
 	task_shell_content = task_shell_view->priv->task_shell_content;
 	task_table = e_task_shell_content_get_task_table (task_shell_content);
-	model = e_calendar_table_get_model (task_table);
+	model = e_task_table_get_model (task_table);
 
 	e_cal_model_remove_client (model, client);
 }
@@ -126,18 +126,18 @@ task_shell_view_update_timeout_cb (ETaskShellView *task_shell_view)
 {
 	ETaskShellContent *task_shell_content;
 	ETaskShellSidebar *task_shell_sidebar;
-	ECalendarTable *task_table;
+	ETaskTable *task_table;
 	ECalModel *model;
 	GList *clients;
 
 	task_shell_content = task_shell_view->priv->task_shell_content;
 	task_table = e_task_shell_content_get_task_table (task_shell_content);
-	model = e_calendar_table_get_model (task_table);
+	model = e_task_table_get_model (task_table);
 
 	task_shell_sidebar = task_shell_view->priv->task_shell_sidebar;
 	clients = e_task_shell_sidebar_get_clients (task_shell_sidebar);
 
-	e_calendar_table_process_completed_tasks (task_table, clients, FALSE);
+	e_task_table_process_completed_tasks (task_table, clients, FALSE);
 	e_cal_model_tasks_update_due_tasks (E_CAL_MODEL_TASKS (model));
 
 	g_list_free (clients);
@@ -221,7 +221,7 @@ e_task_shell_view_private_constructed (ETaskShellView *task_shell_view)
 	EShellTaskbar *shell_taskbar;
 	EShellSettings *shell_settings;
 	EShellWindow *shell_window;
-	ECalendarTable *task_table;
+	ETaskTable *task_table;
 	ECalModel *model;
 	ESourceSelector *selector;
 
@@ -245,7 +245,7 @@ e_task_shell_view_private_constructed (ETaskShellView *task_shell_view)
 
 	task_shell_content = E_TASK_SHELL_CONTENT (shell_content);
 	task_table = e_task_shell_content_get_task_table (task_shell_content);
-	model = e_calendar_table_get_model (task_table);
+	model = e_task_table_get_model (task_table);
 
 	task_shell_sidebar = E_TASK_SHELL_SIDEBAR (shell_sidebar);
 	selector = e_task_shell_sidebar_get_selector (task_shell_sidebar);
@@ -542,7 +542,7 @@ e_task_shell_view_update_sidebar (ETaskShellView *task_shell_view)
 	ETaskShellContent *task_shell_content;
 	EShellView *shell_view;
 	EShellSidebar *shell_sidebar;
-	ECalendarTable *task_table;
+	ETaskTable *task_table;
 	ECalModel *model;
 	GString *string;
 	const gchar *format;
@@ -555,7 +555,7 @@ e_task_shell_view_update_sidebar (ETaskShellView *task_shell_view)
 	task_shell_content = task_shell_view->priv->task_shell_content;
 	task_table = e_task_shell_content_get_task_table (task_shell_content);
 
-	model = e_calendar_table_get_model (task_table);
+	model = e_task_table_get_model (task_table);
 
 	n_rows = e_table_model_row_count (E_TABLE_MODEL (model));
 	n_selected = e_table_selected_count (E_TABLE (task_table));
diff --git a/modules/calendar/e-task-shell-view.c b/modules/calendar/e-task-shell-view.c
index 07fb12e369..42fa4dd9d0 100644
--- a/modules/calendar/e-task-shell-view.c
+++ b/modules/calendar/e-task-shell-view.c
@@ -100,7 +100,7 @@ task_shell_view_execute_search (EShellView *shell_view)
 	EActionComboBox *combo_box;
 	GtkRadioAction *action;
 	ECalComponentPreview *task_preview;
-	ECalendarTable *task_table;
+	ETaskTable *task_table;
 	ECalModel *model;
 	time_t start_range;
 	time_t end_range;
@@ -264,7 +264,7 @@ task_shell_view_execute_search (EShellView *shell_view)
 	/* Submit the query. */
 	task_shell_content = E_TASK_SHELL_CONTENT (shell_content);
 	task_table = e_task_shell_content_get_task_table (task_shell_content);
-	model = e_calendar_table_get_model (task_table);
+	model = e_task_table_get_model (task_table);
 	e_cal_model_set_search_query (model, query);
 	g_free (query);
 
-- 
cgit v1.2.3