Remove ETableMemoryStore.

No longer used.

7 files changed, 0 insertions, 815 deletions

diff --git a/doc/reference/evolution-util/evolution-util-docs.sgml b/doc/reference/evolution-util/evolution-util-docs.sgml
index a9a889e767..27d6075eb3 100644
--- a/doc/reference/evolution-util/evolution-util-docs.sgml
+++ b/doc/reference/evolution-util/evolution-util-docs.sgml
@@ -127,7 +127,6 @@
     <xi:include href="xml/e-table-header-item.xml"/>
     <xi:include href="xml/e-table-header.xml"/>
     <xi:include href="xml/e-table-item.xml"/>
-    <xi:include href="xml/e-table-memory-store.xml"/>
     <xi:include href="xml/e-table-memory.xml"/>
     <xi:include href="xml/e-table-model.xml"/>
     <xi:include href="xml/e-table-one.xml"/>
diff --git a/doc/reference/evolution-util/evolution-util-sections.txt b/doc/reference/evolution-util/evolution-util-sections.txt
index 79204d8765..26c5753491 100644
--- a/doc/reference/evolution-util/evolution-util-sections.txt
+++ b/doc/reference/evolution-util/evolution-util-sections.txt
@@ -3708,41 +3708,6 @@ ETableMemoryPrivate
 </SECTION>
 
 <SECTION>
-<FILE>e-table-memory-store</FILE>
-<TITLE>ETableMemoryStore</TITLE>
-ETableMemoryStore
-ETableMemoryStoreColumnType
-ETableMemoryStoreColumnInfo
-E_TABLE_MEMORY_STORE_TERMINATOR
-E_TABLE_MEMORY_STORE_INTEGER
-E_TABLE_MEMORY_STORE_STRING
-e_table_memory_store_new
-e_table_memory_store_construct
-e_table_memory_store_adopt_value_at
-e_table_memory_store_insert_array
-e_table_memory_store_insert
-e_table_memory_store_insert_adopt
-e_table_memory_store_insert_adopt_array
-e_table_memory_store_change_array
-e_table_memory_store_change
-e_table_memory_store_change_adopt
-e_table_memory_store_change_adopt_array
-e_table_memory_store_remove
-e_table_memory_store_clear
-<SUBSECTION Standard>
-E_TABLE_MEMORY_STORE
-E_IS_TABLE_MEMORY_STORE
-E_TYPE_TABLE_MEMORY_STORE
-E_TABLE_MEMORY_STORE_CLASS
-E_IS_TABLE_MEMORY_STORE_CLASS
-E_TABLE_MEMORY_STORE_GET_CLASS
-ETableMemoryStoreClass
-e_table_memory_store_get_type
-<SUBSECTION Private>
-ETableMemoryStorePrivate
-</SECTION>
-
-<SECTION>
 <FILE>e-table-model</FILE>
 <TITLE>ETableModel</TITLE>
 ETableModel
diff --git a/doc/reference/evolution-util/evolution-util.types b/doc/reference/evolution-util/evolution-util.types
index 576dfcb4d0..b4115bb55f 100644
--- a/doc/reference/evolution-util/evolution-util.types
+++ b/doc/reference/evolution-util/evolution-util.types
@@ -137,7 +137,6 @@ e_table_header_get_type
 e_table_header_item_get_type
 e_table_item_get_type
 e_table_memory_get_type
-e_table_memory_store_get_type
 e_table_model_get_type
 e_table_one_get_type
 e_table_search_get_type
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 894392a8b5..08dc7ad4cd 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -269,7 +269,6 @@ evolution_util_include_HEADERS =  \
 	e-table-header-utils.h \
 	e-table-header.h \
 	e-table-item.h \
-	e-table-memory-store.h \
 	e-table-memory.h \
 	e-table-model.h \
 	e-table-one.h \
@@ -514,7 +513,6 @@ libevolution_util_la_SOURCES = \
 	e-table-header-utils.c \
 	e-table-header.c \
 	e-table-item.c \
-	e-table-memory-store.c \
 	e-table-memory.c \
 	e-table-model.c \
 	e-table-one.c \
diff --git a/e-util/e-table-memory-store.c b/e-util/e-table-memory-store.c
deleted file mode 100644
index 480aacc3ac..0000000000
--- a/e-util/e-table-memory-store.c
+++ /dev/null
@@ -1,607 +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:
- *		Chris Lahey <clahey@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#include <string.h>
-
-#include "e-table-memory-store.h"
-
-#define E_TABLE_MEMORY_STORE_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE \
-	((obj), E_TYPE_TABLE_MEMORY_STORE, ETableMemoryStorePrivate))
-
-#define STORE_LOCATOR(etms, col, row) (*((etms)->priv->store + (row) * (etms)->priv->col_count + (col)))
-
-struct _ETableMemoryStorePrivate {
-	gint col_count;
-	ETableMemoryStoreColumnInfo *columns;
-	gpointer *store;
-};
-
-/* Forward Declarations */
-static void	e_table_memory_store_table_model_init
-					(ETableModelInterface *interface);
-
-G_DEFINE_TYPE_WITH_CODE (
-	ETableMemoryStore,
-	e_table_memory_store,
-	E_TYPE_TABLE_MEMORY,
-	G_IMPLEMENT_INTERFACE (
-		E_TYPE_TABLE_MODEL,
-		e_table_memory_store_table_model_init))
-
-static gpointer
-duplicate_value (ETableMemoryStore *etms,
-                 gint col,
-                 gconstpointer val)
-{
-	switch (etms->priv->columns[col].type) {
-	case E_TABLE_MEMORY_STORE_COLUMN_TYPE_STRING:
-		return g_strdup (val);
-	case E_TABLE_MEMORY_STORE_COLUMN_TYPE_PIXBUF:
-		if (val)
-			g_object_ref ((gpointer) val);
-		return (gpointer) val;
-	default:
-		break;
-	}
-	return (gpointer) val;
-}
-
-static void
-free_value (ETableMemoryStore *etms,
-            gint col,
-            gpointer value)
-{
-	switch (etms->priv->columns[col].type) {
-	case E_TABLE_MEMORY_STORE_COLUMN_TYPE_STRING:
-		g_free (value);
-		break;
-	case E_TABLE_MEMORY_STORE_COLUMN_TYPE_PIXBUF:
-		if (value)
-			g_object_unref (value);
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-table_memory_store_finalize (GObject *object)
-{
-	ETableMemoryStorePrivate *priv;
-
-	priv = E_TABLE_MEMORY_STORE_GET_PRIVATE (object);
-
-	e_table_memory_store_clear (E_TABLE_MEMORY_STORE (object));
-
-	g_free (priv->columns);
-	g_free (priv->store);
-
-	/* Chain up to parent's finalize() method. */
-	G_OBJECT_CLASS (e_table_memory_store_parent_class)->finalize (object);
-}
-
-static gint
-table_memory_store_column_count (ETableModel *etm)
-{
-	ETableMemoryStore *etms = E_TABLE_MEMORY_STORE (etm);
-
-	return etms->priv->col_count;
-}
-
-static void
-table_memory_store_append_row (ETableModel *etm,
-                               ETableModel *source,
-                               gint row)
-{
-	ETableMemoryStore *etms = E_TABLE_MEMORY_STORE (etm);
-	gpointer *new_data;
-	gint i;
-	gint row_count;
-
-	new_data = g_new (gpointer , etms->priv->col_count);
-
-	for (i = 0; i < etms->priv->col_count; i++) {
-		new_data[i] = e_table_model_value_at (source, i, row);
-	}
-
-	row_count = e_table_model_row_count (E_TABLE_MODEL (etms));
-
-	e_table_memory_store_insert_array (etms, row_count, new_data, NULL);
-}
-
-static gpointer
-table_memory_store_value_at (ETableModel *etm,
-                             gint col,
-                             gint row)
-{
-	ETableMemoryStore *etms = E_TABLE_MEMORY_STORE (etm);
-
-	return STORE_LOCATOR (etms, col, row);
-}
-
-static void
-table_memory_store_set_value_at (ETableModel *etm,
-                                 gint col,
-                                 gint row,
-                                 gconstpointer val)
-{
-	ETableMemoryStore *etms = E_TABLE_MEMORY_STORE (etm);
-
-	e_table_model_pre_change (etm);
-
-	STORE_LOCATOR (etms, col, row) = duplicate_value (etms, col, val);
-
-	e_table_model_cell_changed (etm, col, row);
-}
-
-static gboolean
-table_memory_store_is_cell_editable (ETableModel *etm,
-                                     gint col,
-                                     gint row)
-{
-	ETableMemoryStore *etms = E_TABLE_MEMORY_STORE (etm);
-
-	return etms->priv->columns[col].editable;
-}
-
-/* The default for duplicate_value() is to return the raw value. */
-static gpointer
-table_memory_store_duplicate_value (ETableModel *etm,
-                                    gint col,
-                                    gconstpointer value)
-{
-	ETableMemoryStore *etms = E_TABLE_MEMORY_STORE (etm);
-
-	return duplicate_value (etms, col, value);
-}
-
-static void
-table_memory_store_free_value (ETableModel *etm,
-                               gint col,
-                               gpointer value)
-{
-	ETableMemoryStore *etms = E_TABLE_MEMORY_STORE (etm);
-
-	free_value (etms, col, value);
-}
-
-static gpointer
-table_memory_store_initialize_value (ETableModel *etm,
-                                     gint col)
-{
-	ETableMemoryStore *etms = E_TABLE_MEMORY_STORE (etm);
-
-	switch (etms->priv->columns[col].type) {
-		case E_TABLE_MEMORY_STORE_COLUMN_TYPE_STRING:
-			return g_strdup ("");
-		case E_TABLE_MEMORY_STORE_COLUMN_TYPE_PIXBUF:
-			return NULL;
-		default:
-			break;
-	}
-	return NULL;
-}
-
-static gboolean
-table_memory_store_value_is_empty (ETableModel *etm,
-                                   gint col,
-                                   gconstpointer value)
-{
-	ETableMemoryStore *etms = E_TABLE_MEMORY_STORE (etm);
-
-	switch (etms->priv->columns[col].type) {
-		case E_TABLE_MEMORY_STORE_COLUMN_TYPE_STRING:
-			return !(value && *(gchar *) value);
-		case E_TABLE_MEMORY_STORE_COLUMN_TYPE_PIXBUF:
-			return value == NULL;
-		default:
-			break;
-	}
-	return value == NULL;
-}
-
-static gchar *
-table_memory_store_value_to_string (ETableModel *etm,
-                                    gint col,
-                                    gconstpointer value)
-{
-	ETableMemoryStore *etms = E_TABLE_MEMORY_STORE (etm);
-
-	switch (etms->priv->columns[col].type) {
-		case E_TABLE_MEMORY_STORE_COLUMN_TYPE_STRING:
-			return g_strdup (value);
-		case E_TABLE_MEMORY_STORE_COLUMN_TYPE_PIXBUF:
-			return g_strdup ("");
-		default:
-			break;
-	}
-	return g_strdup_printf ("%d", GPOINTER_TO_INT (value));
-}
-
-static void
-e_table_memory_store_class_init (ETableMemoryStoreClass *class)
-{
-	GObjectClass *object_class;
-
-	g_type_class_add_private (class, sizeof (ETableMemoryStorePrivate));
-
-	object_class = G_OBJECT_CLASS (class);
-	object_class->finalize = table_memory_store_finalize;
-}
-
-static void
-e_table_memory_store_table_model_init (ETableModelInterface *interface)
-{
-	interface->column_count = table_memory_store_column_count;
-	interface->append_row = table_memory_store_append_row;
-
-	interface->value_at = table_memory_store_value_at;
-	interface->set_value_at = table_memory_store_set_value_at;
-	interface->is_cell_editable = table_memory_store_is_cell_editable;
-
-	interface->duplicate_value = table_memory_store_duplicate_value;
-	interface->free_value = table_memory_store_free_value;
-	interface->initialize_value = table_memory_store_initialize_value;
-	interface->value_is_empty = table_memory_store_value_is_empty;
-	interface->value_to_string = table_memory_store_value_to_string;
-}
-
-static void
-e_table_memory_store_init (ETableMemoryStore *etms)
-{
-	etms->priv = E_TABLE_MEMORY_STORE_GET_PRIVATE (etms);
-}
-
-/**
- * e_table_memory_store_new:
- * @columns:
- *
- * This initializes a new ETableMemoryStoreModel object.  ETableMemoryStoreModel is
- * an implementaiton of the abstract class ETableModel.  The ETableMemoryStoreModel
- * is designed to allow people to easily create ETableModels without having
- * to create a new GType derived from ETableModel every time they need one.
- *
- * Instead, ETableMemoryStoreModel uses a setup based in callback functions, every
- * callback function signature mimics the signature of each ETableModel method
- * and passes the extra @data pointer to each one of the method to provide them
- * with any context they might want to use.
- *
- * Returns: An ETableMemoryStoreModel object (which is also an ETableModel
- * object).
- */
-ETableModel *
-e_table_memory_store_new (ETableMemoryStoreColumnInfo *columns)
-{
-	ETableMemoryStore *et = g_object_new (E_TYPE_TABLE_MEMORY_STORE, NULL);
-
-	if (e_table_memory_store_construct (et, columns)) {
-		return (ETableModel *) et;
-	} else {
-		g_object_unref (et);
-		return NULL;
-	}
-}
-
-ETableModel *
-e_table_memory_store_construct (ETableMemoryStore *etms,
-                                ETableMemoryStoreColumnInfo *columns)
-{
-	gint i;
-	for (i = 0; columns[i].type != E_TABLE_MEMORY_STORE_COLUMN_TYPE_TERMINATOR; i++)
-		/* Intentionally blank */;
-	etms->priv->col_count = i;
-
-	etms->priv->columns = g_new (ETableMemoryStoreColumnInfo, etms->priv->col_count + 1);
-
-	memcpy (etms->priv->columns, columns, (etms->priv->col_count + 1) * sizeof (ETableMemoryStoreColumnInfo));
-
-	return E_TABLE_MODEL (etms);
-}
-
-void
-e_table_memory_store_adopt_value_at (ETableMemoryStore *etms,
-                                     gint col,
-                                     gint row,
-                                     gpointer value)
-{
-	e_table_model_pre_change (E_TABLE_MODEL (etms));
-
-	STORE_LOCATOR (etms, col, row) = value;
-
-	e_table_model_cell_changed (E_TABLE_MODEL (etms), col, row);
-}
-
-/* The size of these arrays is the number of columns. */
-void
-e_table_memory_store_insert_array (ETableMemoryStore *etms,
-                                   gint row,
-                                   gpointer *store,
-                                   gpointer data)
-{
-	gint row_count;
-	gint i;
-
-	row_count = e_table_model_row_count (E_TABLE_MODEL (etms)) + 1;
-	if (row == -1)
-		row = row_count - 1;
-	etms->priv->store = g_realloc (etms->priv->store, etms->priv->col_count * row_count * sizeof (gpointer));
-	memmove (
-		etms->priv->store + etms->priv->col_count * (row + 1),
-		etms->priv->store + etms->priv->col_count * row,
-		etms->priv->col_count * (row_count - row - 1) * sizeof (gpointer));
-
-	for (i = 0; i < etms->priv->col_count; i++) {
-		STORE_LOCATOR (etms, i, row) = duplicate_value (etms, i, store[i]);
-	}
-
-	e_table_memory_insert (E_TABLE_MEMORY (etms), row, data);
-}
-
-void
-e_table_memory_store_insert (ETableMemoryStore *etms,
-                             gint row,
-                             gpointer data,
-                             ...)
-{
-	gpointer *store;
-	va_list args;
-	gint i;
-
-	store = g_new (gpointer , etms->priv->col_count + 1);
-
-	va_start (args, data);
-	for (i = 0; i < etms->priv->col_count; i++) {
-		store[i] = va_arg (args, gpointer);
-	}
-	va_end (args);
-
-	e_table_memory_store_insert_array (etms, row, store, data);
-
-	g_free (store);
-}
-
-void
-e_table_memory_store_insert_adopt_array (ETableMemoryStore *etms,
-                                         gint row,
-                                         gpointer *store,
-                                         gpointer data)
-{
-	gint row_count;
-	gint i;
-
-	row_count = e_table_model_row_count (E_TABLE_MODEL (etms)) + 1;
-	if (row == -1)
-		row = row_count - 1;
-	etms->priv->store = g_realloc (etms->priv->store, etms->priv->col_count * row_count * sizeof (gpointer));
-	memmove (
-		etms->priv->store + etms->priv->col_count * (row + 1),
-		etms->priv->store + etms->priv->col_count * row,
-		etms->priv->col_count * (row_count - row - 1) * sizeof (gpointer));
-
-	for (i = 0; i < etms->priv->col_count; i++) {
-		STORE_LOCATOR (etms, i, row) = store[i];
-	}
-
-	e_table_memory_insert (E_TABLE_MEMORY (etms), row, data);
-}
-
-void
-e_table_memory_store_insert_adopt (ETableMemoryStore *etms,
-                                   gint row,
-                                   gpointer data,
-                                   ...)
-{
-	gpointer *store;
-	va_list args;
-	gint i;
-
-	store = g_new (gpointer , etms->priv->col_count + 1);
-
-	va_start (args, data);
-	for (i = 0; i < etms->priv->col_count; i++) {
-		store[i] = va_arg (args, gpointer);
-	}
-	va_end (args);
-
-	e_table_memory_store_insert_adopt_array (etms, row, store, data);
-
-	g_free (store);
-}
-
-/**
- * e_table_memory_store_change_array:
- * @etms: the ETabelMemoryStore.
- * @row:  the row we're changing.
- * @store: an array of new values to fill the row
- * @data: the new closure to associate with this row.
- *
- * frees existing values associated with a row and replaces them with
- * duplicates of the values in store.
- *
- */
-void
-e_table_memory_store_change_array (ETableMemoryStore *etms,
-                                   gint row,
-                                   gpointer *store,
-                                   gpointer data)
-{
-	gint i;
-
-	g_return_if_fail (row >= 0 && row < e_table_model_row_count (E_TABLE_MODEL (etms)));
-
-	e_table_model_pre_change (E_TABLE_MODEL (etms));
-
-	for (i = 0; i < etms->priv->col_count; i++) {
-		free_value (etms, i, STORE_LOCATOR (etms, i, row));
-		STORE_LOCATOR (etms, i, row) = duplicate_value (etms, i, store[i]);
-	}
-
-	e_table_memory_set_data (E_TABLE_MEMORY (etms), row, data);
-	e_table_model_row_changed (E_TABLE_MODEL (etms), row);
-}
-
-/**
- * e_table_memory_store_change:
- * @etms: the ETabelMemoryStore.
- * @row:  the row we're changing.
- * @data: the new closure to associate with this row.
- *
- * a varargs version of e_table_memory_store_change_array.  you must
- * pass in etms->col_count args.
- */
-void
-e_table_memory_store_change (ETableMemoryStore *etms,
-                             gint row,
-                             gpointer data,
-                             ...)
-{
-	gpointer *store;
-	va_list args;
-	gint i;
-
-	g_return_if_fail (row >= 0 && row < e_table_model_row_count (E_TABLE_MODEL (etms)));
-
-	store = g_new0 (gpointer , etms->priv->col_count + 1);
-
-	va_start (args, data);
-	for (i = 0; i < etms->priv->col_count; i++) {
-		store[i] = va_arg (args, gpointer);
-	}
-	va_end (args);
-
-	e_table_memory_store_change_array (etms, row, store, data);
-
-	g_free (store);
-}
-
-/**
- * e_table_memory_store_change_adopt_array:
- * @etms: the ETableMemoryStore
- * @row: the row we're changing.
- * @store: an array of new values to fill the row
- * @data: the new closure to associate with this row.
- *
- * frees existing values for the row and stores the values from store
- * into it.  This function differs from
- * e_table_memory_storage_change_adopt_array in that it does not
- * duplicate the data.
- */
-void
-e_table_memory_store_change_adopt_array (ETableMemoryStore *etms,
-                                         gint row,
-                                         gpointer *store,
-                                         gpointer data)
-{
-	gint i;
-
-	g_return_if_fail (row >= 0 && row < e_table_model_row_count (E_TABLE_MODEL (etms)));
-
-	for (i = 0; i < etms->priv->col_count; i++) {
-		free_value (etms, i, STORE_LOCATOR (etms, i, row));
-		STORE_LOCATOR (etms, i, row) = store[i];
-	}
-
-	e_table_memory_set_data (E_TABLE_MEMORY (etms), row, data);
-	e_table_model_row_changed (E_TABLE_MODEL (etms), row);
-}
-
-/**
- * e_table_memory_store_change_adopt
- * @etms: the ETabelMemoryStore.
- * @row:  the row we're changing.
- * @data: the new closure to associate with this row.
- *
- * a varargs version of e_table_memory_store_change_adopt_array.  you
- * must pass in etms->col_count args.
- */
-void
-e_table_memory_store_change_adopt (ETableMemoryStore *etms,
-                                   gint row,
-                                   gpointer data,
-                                   ...)
-{
-	gpointer *store;
-	va_list args;
-	gint i;
-
-	g_return_if_fail (row >= 0 && row < e_table_model_row_count (E_TABLE_MODEL (etms)));
-
-	store = g_new0 (gpointer , etms->priv->col_count + 1);
-
-	va_start (args, data);
-	for (i = 0; i < etms->priv->col_count; i++) {
-		store[i] = va_arg (args, gpointer);
-	}
-	va_end (args);
-
-	e_table_memory_store_change_adopt_array (etms, row, store, data);
-
-	g_free (store);
-}
-
-void
-e_table_memory_store_remove (ETableMemoryStore *etms,
-                             gint row)
-{
-	ETableModel *model;
-	gint column_count, row_count;
-	gint i;
-
-	model = E_TABLE_MODEL (etms);
-	column_count = e_table_model_column_count (model);
-
-	for (i = 0; i < column_count; i++)
-		e_table_model_free_value (model, i, e_table_model_value_at (model, i, row));
-
-	row_count = e_table_model_row_count (E_TABLE_MODEL (etms)) - 1;
-	memmove (
-		etms->priv->store + etms->priv->col_count * row,
-		etms->priv->store + etms->priv->col_count * (row + 1),
-		etms->priv->col_count * (row_count - row) * sizeof (gpointer));
-	etms->priv->store = g_realloc (etms->priv->store, etms->priv->col_count * row_count * sizeof (gpointer));
-
-	e_table_memory_remove (E_TABLE_MEMORY (etms), row);
-}
-
-void
-e_table_memory_store_clear (ETableMemoryStore *etms)
-{
-	ETableModel *model;
-	gint row_count, column_count;
-	gint i, j;
-
-	model = E_TABLE_MODEL (etms);
-	row_count = e_table_model_row_count (model);
-	column_count = e_table_model_column_count (model);
-
-	for (i = 0; i < row_count; i++) {
-		for (j = 0; j < column_count; j++) {
-			e_table_model_free_value (model, j, e_table_model_value_at (model, j, i));
-		}
-	}
-
-	e_table_memory_clear (E_TABLE_MEMORY (etms));
-
-	g_free (etms->priv->store);
-	etms->priv->store = NULL;
-}
diff --git a/e-util/e-table-memory-store.h b/e-util/e-table-memory-store.h
deleted file mode 100644
index 1d3b995873..0000000000
--- a/e-util/e-table-memory-store.h
+++ /dev/null
@@ -1,168 +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:
- *		Chris Lahey <clahey@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#if !defined (__E_UTIL_H_INSIDE__) && !defined (LIBEUTIL_COMPILATION)
-#error "Only <e-util/e-util.h> should be included directly."
-#endif
-
-#ifndef _E_TABLE_MEMORY_STORE_H_
-#define _E_TABLE_MEMORY_STORE_H_
-
-#include <e-util/e-table-memory.h>
-
-/* Standard GObject macros */
-#define E_TYPE_TABLE_MEMORY_STORE \
-	(e_table_memory_store_get_type ())
-#define E_TABLE_MEMORY_STORE(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST \
-	((obj), E_TYPE_TABLE_MEMORY_STORE, ETableMemoryStore))
-#define E_TABLE_MEMORY_STORE_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_CAST \
-	((cls), E_TYPE_TABLE_MEMORY_STORE, ETableMemoryStoreClass))
-#define E_IS_TABLE_MEMORY_STORE(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE \
-	((obj), E_TYPE_TABLE_MEMORY_STORE))
-#define E_IS_TABLE_MEMORY_STORE_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_TYPE \
-	((cls), E_TYPE_TABLE_MEMORY_STORE))
-#define E_TABLE_MEMORY_STORE_GET_CLASS(obj) \
-	(G_TYPE_INSTANCE_GET_CLASS \
-	((obj), E_TYPE_TABLE_MEMORY_STORE, ETableMemoryStoreClass))
-
-G_BEGIN_DECLS
-
-typedef enum {
-	E_TABLE_MEMORY_STORE_COLUMN_TYPE_TERMINATOR,
-	E_TABLE_MEMORY_STORE_COLUMN_TYPE_INTEGER,
-	E_TABLE_MEMORY_STORE_COLUMN_TYPE_STRING,
-	E_TABLE_MEMORY_STORE_COLUMN_TYPE_PIXBUF
-} ETableMemoryStoreColumnType;
-
-typedef gpointer	(*ETableMemoryCallbacksDuplicateValueFn)
-							(ETableModel *etm,
-							 gint col,
-							 gconstpointer val,
-							 gpointer data);
-typedef void		(*ETableMemoryCallbacksFreeValueFn)
-							(ETableModel *etm,
-							 gint col,
-							 gpointer val,
-							 gpointer data);
-typedef gpointer	(*ETableMemoryCallbacksInitializeValueFn)
-							(ETableModel *etm,
-							 gint col,
-							 gpointer data);
-typedef gboolean	(*ETableMemoryCallbacksValueIsEmptyFn)
-							(ETableModel *etm,
-							 gint col,
-							 gconstpointer val,
-							 gpointer data);
-typedef gchar *		(*ETableMemoryCallbacksValueToStringFn)
-							(ETableModel *etm,
-							 gint col,
-							 gconstpointer val,
-							 gpointer data);
-
-typedef struct {
-	ETableMemoryStoreColumnType type;
-	guint editable : 1;
-} ETableMemoryStoreColumnInfo;
-
-#define E_TABLE_MEMORY_STORE_TERMINATOR \
-	{ E_TABLE_MEMORY_STORE_COLUMN_TYPE_TERMINATOR, FALSE }
-#define E_TABLE_MEMORY_STORE_INTEGER \
-	{ E_TABLE_MEMORY_STORE_COLUMN_TYPE_INTEGER, FALSE }
-#define E_TABLE_MEMORY_STORE_STRING \
-	{ E_TABLE_MEMORY_STORE_COLUMN_TYPE_STRING, FALSE }
-
-typedef struct _ETableMemoryStore ETableMemoryStore;
-typedef struct _ETableMemoryStoreClass ETableMemoryStoreClass;
-typedef struct _ETableMemoryStorePrivate ETableMemoryStorePrivate;
-
-struct _ETableMemoryStore {
-	ETableMemory parent;
-	ETableMemoryStorePrivate *priv;
-};
-
-struct _ETableMemoryStoreClass {
-	ETableMemoryClass parent_class;
-};
-
-GType		e_table_memory_store_get_type	(void) G_GNUC_CONST;
-ETableModel *	e_table_memory_store_new	(ETableMemoryStoreColumnInfo *columns);
-ETableModel *	e_table_memory_store_construct	(ETableMemoryStore *store,
-						 ETableMemoryStoreColumnInfo *columns);
-
-/* Adopt a value instead of copying it. */
-void		e_table_memory_store_adopt_value_at
-						(ETableMemoryStore *etms,
-						 gint col,
-						 gint row,
-						 gpointer value);
-
-/* The size of these arrays is the number of columns. */
-void		e_table_memory_store_insert_array
-						(ETableMemoryStore *etms,
-						 gint row,
-						 gpointer *store,
-						 gpointer data);
-void		e_table_memory_store_insert	(ETableMemoryStore *etms,
-						 gint row,
-						 gpointer data,
-						 ...);
-void		e_table_memory_store_insert_adopt
-						(ETableMemoryStore *etms,
-						 gint row,
-						 gpointer data,
-						 ...);
-void		e_table_memory_store_insert_adopt_array
-						(ETableMemoryStore *etms,
-						 gint row,
-						 gpointer *store,
-						 gpointer data);
-void		e_table_memory_store_change_array
-						(ETableMemoryStore *etms,
-						 gint row,
-						 gpointer *store,
-						 gpointer data);
-void		e_table_memory_store_change	(ETableMemoryStore *etms,
-						 gint row,
-						 gpointer data,
-						 ...);
-void		e_table_memory_store_change_adopt
-						(ETableMemoryStore *etms,
-						 gint row,
-						 gpointer data,
-						 ...);
-void		e_table_memory_store_change_adopt_array
-						(ETableMemoryStore *etms,
-						 gint row,
-						 gpointer *store,
-						 gpointer data);
-void		e_table_memory_store_remove	(ETableMemoryStore *etms,
-						 gint row);
-void		e_table_memory_store_clear	(ETableMemoryStore *etms);
-
-G_END_DECLS
-
-#endif /* _E_TABLE_MEMORY_STORE_H_ */
diff --git a/e-util/e-util.h b/e-util/e-util.h
index eef88307a9..428c3b9221 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -184,7 +184,6 @@
 #include <e-util/e-table-header-utils.h>
 #include <e-util/e-table-header.h>
 #include <e-util/e-table-item.h>
-#include <e-util/e-table-memory-store.h>
 #include <e-util/e-table-memory.h>
 #include <e-util/e-table-model.h>
 #include <e-util/e-table-one.h>