Added check for gnome-app-lib. Removed directories that have been moved to

2000-09-18  Christopher James Lahey  <clahey@helixcode.com>

	* configure.in: Added check for gnome-app-lib.  Removed
	directories that have been moved to gal.

From addressbook/ChangeLog:

2000-09-18  Christopher James Lahey  <clahey@helixcode.com>

	* backend/ebook/Makefile.am, contact-editor/Makefile.am,
	ename/Makefile.am, gui/component/Makefile.am,
	gui/widgets/Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.

	* backend/ebook/e-card.c, backend/pas/pas-backend-file.c,
	contact-editor/e-contact-editor-address.c,
	contact-editor/e-contact-editor-categories.c,
	contact-editor/e-contact-editor-categories.h,
	contact-editor/e-contact-editor-fullname.c,
	contact-editor/e-contact-editor.c,
	contact-editor/e-contact-save-as.c, ename/e-address-western.c,
	ename/test-ename-western-gtk.c,
	gui/component/addressbook-factory.c, gui/component/addressbook.c,
	gui/component/e-cardlist-model.h, gui/component/e-ldap-storage.c,
	gui/component/select-names/e-select-names-bonobo.c,
	gui/component/select-names/e-select-names-manager.c,
	gui/component/select-names/e-select-names-model.c,
	gui/component/select-names/e-select-names-table-model.c,
	gui/component/select-names/e-select-names-table-model.h,
	gui/component/select-names/e-select-names-text-model.h,
	gui/component/select-names/e-select-names.c,
	gui/component/select-names/e-select-names.h,
	gui/search/e-addressbook-search-dialog.c,
	gui/widgets/e-addressbook-model.h,
	gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard-label.c,
	gui/widgets/e-minicard-view-widget.c,
	gui/widgets/e-minicard-view-widget.h,
	gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h,
	gui/widgets/e-minicard-widget.h, gui/widgets/e-minicard.c,
	gui/widgets/test-minicard-label.c, gui/widgets/test-reflow.c,
	printing/e-contact-print.c: Fixed the #include lines to deal
	properly with gal.

From calendar/ChangeLog:

2000-09-18  Christopher James Lahey  <clahey@helixcode.com>

	* gui/Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.

	* gui/calendar-model.h, gui/e-calendar-table.c, gui/e-day-view.c,
	gui/e-week-view-event-item.c, gui/e-week-view.c,
	gui/event-editor.c, gui/gncal-todo.c, gui/gnome-cal.c, gui/main.c,
	gui/print.c, gui/dialogs/task-editor.c: Fixed the #include lines
	to deal properly with gal.

	* gui/check-filled.xpm: New file since we can't include it from
	e-table anymore.

From camel/ChangeLog:

2000-09-18  Christopher James Lahey  <clahey@helixcode.com>

	* camel-folder-search.c, camel-folder-search.h,
	camel-remote-store.c, providers/imap/camel-imap-folder.c,
	providers/imap/camel-imap-store.c: Fixed the #include lines to
	deal properly with gal.

From composer/ChangeLog:

2000-09-18  Christopher James Lahey  <clahey@helixcode.com>

	* Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.

	* e-msg-composer-address-dialog.c, e-msg-composer-address-entry.c,
	e-msg-composer-attachment.c, e-msg-composer-hdrs.c,
	e-msg-composer.c: Fixed the #include lines to deal properly with
	gal.

From e-util/ChangeLog:

2000-09-18  Christopher James Lahey  <clahey@helixcode.com>

	* Makefile.am: Removed all the files moved to gal.

	* e-dialog-widgets.c: Fixed the #include lines to deal properly
	with gal.

	* e-gui-utils.c, e-gui-utils.h: Removed all of the functionality
	that was moved to gal.

	* e-canvas-utils.c, e-canvas-utils.h, e-canvas-vbox.c,
	e-canvas-vbox.h, e-canvas.c, e-canvas.h, e-cursors.c, e-cursors.h,
	e-font.c, e-font.h, e-popup-menu.c, e-popup-menu.h, e-printable.c,
	e-printable.h, e-unicode.c, e-unicode.h, e-util.c, e-util.h,
	e-xml-utils.c, e-xml-utils.h: Moved to gal.

From filter/ChangeLog:

2000-09-18  Christopher James Lahey  <clahey@helixcode.com>

	* filter-editor.c, filter-filter.c, filter-folder.c,
	filter-input.c, filter-message-search.c, filter-option.c,
	filter-rule.c, score-editor.c, vfolder-editor.c, vfolder-rule.c:
	Fixed the #include lines to deal properly with gal.

From mail/ChangeLog:

2000-09-18  Christopher James Lahey  <clahey@helixcode.com>

	* Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.

	* component-factory.c, folder-browser-factory.c, folder-browser.c,
	mail-callbacks.c, mail-config-gui.c, mail-display.c,
	mail-display.h, main.c, message-list.c, message-list.h: Fixed the
	#include lines to deal properly with gal.

From po/ChangeLog:

2000-09-18  Christopher James Lahey  <clahey@helixcode.com>

	* POTFILES.in: Removed files that have been moved to gal.

From shell/ChangeLog:

2000-09-18  Christopher James Lahey  <clahey@helixcode.com>

	* Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.

	* e-component-registry.c, e-corba-storage-registry.c,
	e-corba-storage.c, e-folder-type-registry.c, e-folder.c,
	e-local-folder.c, e-local-storage.c,
	e-shell-folder-creation-dialog.c,
	e-shell-folder-selection-dialog.c, e-shell-folder-title-bar.c,
	e-shell-view.c, e-shell.c, e-shortcuts-view.c, e-shortcuts.c,
	e-storage-set-view.c, e-storage-set-view.h, e-storage-set.c,
	e-storage.c, evolution-local-storage.c, evolution-session.c,
	evolution-shell-client.c, evolution-shell-component-client.c,
	evolution-shell-component.c, evolution-shell-view.c,
	evolution-storage-listener.c, evolution-storage.c, main.c: Fixed
	the #include lines to deal properly with gal.

From widgets/meeting-time-sel/ChangeLog:

2000-09-18  Christopher James Lahey  <clahey@helixcode.com>

	* Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.

	* e-meeting-time-sel-list-item.c, e-meeting-time-sel.c,
	e-meeting-time-sel.h: Fixed the #include lines to deal properly
	with gal.

If you've read this far, you deserve a prize.  The first email in my
mailbox with the subject "What a commit message!" (and your physical
mailing address somewhere in the message) will receive a free Helix
Code T-shirt mailed to anywhere within the continental United States.
I cannot be held responsible for problems with email systems anywhere.
This is supposed to be for fun, so please don't make a fuss if
something goes wrong and your mail doesn't reach me.  Find my email
elsewhere in this message, and if it's been more than a few days,
you're probably too late.

From widgets/misc/ChangeLog:

2000-09-18  Christopher James Lahey  <clahey@helixcode.com>

	* Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.

	* e-calendar-item.c, e-calendar.c, e-calendar.h, e-title-bar.c:
	Fixed the #include lines to deal properly with gal.

	* e-scroll-frame.c, e-scroll-frame.h: Moved to gal.

From widgets/shortcut-bar/ChangeLog:

2000-09-18  Christopher James Lahey  <clahey@helixcode.com>

	* Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.

	* e-icon-bar.c, e-icon-bar.h, e-shortcut-bar.c,
	e-shortcut-model.c, test-shortcut-bar.c: Fixed the #include lines
	to deal properly with gal.

From widgets/ChangeLog:

2000-09-18  Christopher James Lahey  <clahey@helixcode.com>

	* Makefile.am: Removed directories that have been moved to gal.

	* e-paned/.cvsignore, e-paned/Makefile.am, e-paned/e-hpaned.c,
	e-paned/e-hpaned.h, e-paned/e-paned.c, e-paned/e-paned.h,
	e-paned/e-vpaned.c, e-paned/e-vpaned.h: Moved to gal.

	* e-reflow/.cvsignore, e-reflow/Makefile.am,
	e-reflow/e-reflow-sorted.c, e-reflow/e-reflow-sorted.h,
	e-reflow/e-reflow.c, e-reflow/e-reflow.h: Moved to gal.

	* e-table/.cvsignore, e-table/ChangeLog, e-table/LICENSE,
	e-table/Makefile.am, e-table/ROADMAP.e-table, e-table/TODO,
	e-table/add-col.xpm, e-table/arrow-down.xpm, e-table/arrow-up.xpm,
	e-table/check-empty.xpm, e-table/check-filled.xpm,
	e-table/clip.png, e-table/e-cell-checkbox.c,
	e-table/e-cell-checkbox.h, e-table/e-cell-string.c,
	e-table/e-cell-text.c, e-table/e-cell-text.h,
	e-table/e-cell-toggle.c, e-table/e-cell-toggle.h,
	e-table/e-cell-tree.c, e-table/e-cell-tree.h, e-table/e-cell.c,
	e-table/e-cell.h, e-table/e-table-click-to-add.c,
	e-table/e-table-click-to-add.h, e-table/e-table-col-dnd.h,
	e-table/e-table-col.c, e-table/e-table-col.h,
	e-table/e-table-column-model.h, e-table/e-table-column.c,
	e-table/e-table-config.c, e-table/e-table-config.glade,
	e-table/e-table-config.glade.h, e-table/e-table-config.h,
	e-table/e-table-defines.h, e-table/e-table-example-1.c,
	e-table/e-table-example-2.c,
	e-table/e-table-field-chooser-dialog.c,
	e-table/e-table-field-chooser-dialog.h,
	e-table/e-table-field-chooser-item.c,
	e-table/e-table-field-chooser-item.h,
	e-table/e-table-field-chooser.c,
	e-table/e-table-field-chooser.glade,
	e-table/e-table-field-chooser.glade.h,
	e-table/e-table-field-chooser.h,
	e-table/e-table-group-container.c,
	e-table/e-table-group-container.h, e-table/e-table-group-leaf.c,
	e-table/e-table-group-leaf.h, e-table/e-table-group.c,
	e-table/e-table-group.glade, e-table/e-table-group.glade.h,
	e-table/e-table-group.h, e-table/e-table-header-item.c,
	e-table/e-table-header-item.h, e-table/e-table-header.c,
	e-table/e-table-header.h, e-table/e-table-item.c,
	e-table/e-table-item.h, e-table/e-table-model.c,
	e-table/e-table-model.h, e-table/e-table-one.c,
	e-table/e-table-one.h, e-table/e-table-scrolled.c,
	e-table/e-table-scrolled.h, e-table/e-table-selection-model.c,
	e-table/e-table-selection-model.h, e-table/e-table-simple.c,
	e-table/e-table-simple.h, e-table/e-table-size-test.c,
	e-table/e-table-sort-info.c, e-table/e-table-sort-info.h,
	e-table/e-table-sorted-variable.c,
	e-table/e-table-sorted-variable.h, e-table/e-table-sorted.c,
	e-table/e-table-sorted.h, e-table/e-table-sorter.c,
	e-table/e-table-sorter.h, e-table/e-table-subset-variable.c,
	e-table/e-table-subset-variable.h, e-table/e-table-subset.c,
	e-table/e-table-subset.h, e-table/e-table-text-model.c,
	e-table/e-table-text-model.h, e-table/e-table-tooltip.h,
	e-table/e-table-tree.h, e-table/e-table.c, e-table/e-table.h,
	e-table/e-tree-example-1.c, e-table/e-tree-example-2.c,
	e-table/e-tree-model.c, e-table/e-tree-model.h,
	e-table/e-tree-simple.c, e-table/e-tree-simple.h,
	e-table/image1.png, e-table/image2.png, e-table/image3.png,
	e-table/remove-col.xpm, e-table/sample.table,
	e-table/table-test.c, e-table/table-test.h, e-table/test-check.c,
	e-table/test-cols.c, e-table/test-table.c: Moved to gal.

	* e-text/.cvsignore, e-text/Makefile.am, e-text/e-entry-test.c,
	e-text/e-entry.c, e-text/e-entry.h,
	e-text/e-text-event-processor-emacs-like.c,
	e-text/e-text-event-processor-emacs-like.h,
	e-text/e-text-event-processor-types.h,
	e-text/e-text-event-processor.c, e-text/e-text-event-processor.h,
	e-text/e-text-model.c, e-text/e-text-model.h,
	e-text/e-text-test.c, e-text/e-text.c, e-text/e-text.h: Moved to
	gal.

i.e.,

...

changed evolution to work with gal.

svn path=/trunk/; revision=5490

1 files changed, 0 insertions, 337 deletions

diff --git a/widgets/e-table/e-table-sorted-variable.c b/widgets/e-table/e-table-sorted-variable.c
deleted file mode 100644
index 7584b31a74..0000000000
--- a/widgets/e-table/e-table-sorted-variable.c
+++ /dev/null
@@ -1,337 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * E-table-sorted.c: Implements a table that sorts another table
- *
- * Author:
- *   Miguel de Icaza (miguel@gnu.org)
- *
- * (C) 1999 Helix Code, Inc.
- */
-#include <config.h>
-#include <stdlib.h>
-#include <gtk/gtksignal.h>
-#include <string.h>
-#include "e-util/e-util.h"
-#include "e-table-sorted-variable.h"
-
-#define PARENT_TYPE E_TABLE_SUBSET_VARIABLE_TYPE
-
-#define INCREMENT_AMOUNT 100
-
-static ETableSubsetVariableClass *etsv_parent_class;
-
-static void etsv_proxy_model_changed      (ETableModel *etm, ETableSortedVariable *etsv);
-#if 0
-static void etsv_proxy_model_row_changed  (ETableModel *etm, int row, ETableSortedVariable *etsv);
-static void etsv_proxy_model_cell_changed (ETableModel *etm, int col, int row, ETableSortedVariable *etsv);
-#endif
-static void etsv_sort_info_changed        (ETableSortInfo *info, ETableSortedVariable *etsv);
-static void etsv_sort                     (ETableSortedVariable *etsv);
-static void etsv_add                      (ETableSubsetVariable *etssv, gint                  row);
-static void etsv_add_all                  (ETableSubsetVariable *etssv);
-
-static void
-etsv_destroy (GtkObject *object)
-{
-	ETableSortedVariable *etsv = E_TABLE_SORTED_VARIABLE (object);
-	ETableSubset *etss = E_TABLE_SUBSET (object);
-
-	gtk_signal_disconnect (GTK_OBJECT (etss->source),
-			       etsv->table_model_changed_id);
-#if 0
-	gtk_signal_disconnect (GTK_OBJECT (etss->source),
-			       etsv->table_model_row_changed_id);
-	gtk_signal_disconnect (GTK_OBJECT (etss->source),
-			       etsv->table_model_cell_changed_id);
-#endif
-	gtk_signal_disconnect (GTK_OBJECT (etsv->sort_info),
-			       etsv->sort_info_changed_id);
-
-	if (etsv->sort_idle_id) {
-		g_source_remove(etsv->sort_idle_id);
-	}
-
-	etsv->table_model_changed_id = 0;
-	etsv->table_model_row_changed_id = 0;
-	etsv->table_model_cell_changed_id = 0;
-	
-	if (etsv->sort_info)
-		gtk_object_unref(GTK_OBJECT(etsv->sort_info));
-	if (etsv->full_header)
-		gtk_object_unref(GTK_OBJECT(etsv->full_header));
-
-	GTK_OBJECT_CLASS (etsv_parent_class)->destroy (object);
-}
-
-static void
-etsv_class_init (GtkObjectClass *object_class)
-{
-	ETableSubsetVariableClass *etssv_class = E_TABLE_SUBSET_VARIABLE_CLASS(object_class);
-
-	etsv_parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->destroy = etsv_destroy;
-
-	etssv_class->add = etsv_add;
-	etssv_class->add_all = etsv_add_all;
-}
-
-static void
-etsv_init (ETableSortedVariable *etsv)
-{
-	etsv->full_header = NULL;
-	etsv->sort_info = NULL;
-
-	etsv->table_model_changed_id = 0;
-	etsv->table_model_row_changed_id = 0;
-	etsv->table_model_cell_changed_id = 0;
-	etsv->sort_info_changed_id = 0;
-
-	etsv->sort_idle_id = 0;
-}
-
-E_MAKE_TYPE(e_table_sorted_variable, "ETableSortedVariable", ETableSortedVariable, etsv_class_init, etsv_init, PARENT_TYPE);
-
-static gboolean
-etsv_sort_idle(ETableSortedVariable *etsv)
-{
-	gtk_object_ref(GTK_OBJECT(etsv));
-	etsv_sort(etsv);
-	etsv->sort_idle_id = 0;
-	gtk_object_unref(GTK_OBJECT(etsv));
-	return FALSE;
-}
-
-/* This takes source rows. */
-static int
-etsv_compare(ETableSortedVariable *etsv, int row1, int row2)
-{
-	int j;
-	int sort_count = e_table_sort_info_sorting_get_count(etsv->sort_info);
-	int comp_val = 0;
-	int ascending = 1;
-	ETableSubset *etss = E_TABLE_SUBSET(etsv);
-
-	for (j = 0; j < sort_count; j++) {
-		ETableSortColumn column = e_table_sort_info_sorting_get_nth(etsv->sort_info, j);
-		ETableCol *col;
-		if (column.column > e_table_header_count (etsv->full_header))
-			col = e_table_header_get_column (etsv->full_header, e_table_header_count (etsv->full_header) - 1);
-		else
-			col = e_table_header_get_column (etsv->full_header, column.column);
-		comp_val = (*col->compare)(e_table_model_value_at (etss->source, col->col_idx, row1),
-					   e_table_model_value_at (etss->source, col->col_idx, row2));
-		ascending = column.ascending;
-		if (comp_val != 0)
-			break;
-	}
-	if (comp_val == 0) {
-		if (row1 < row2)
-			comp_val = -1;
-		if (row1 > row2)
-			comp_val = 1;
-	}
-	if (!ascending)
-		comp_val = -comp_val;
-	return comp_val;
-}
-
-
-static void
-etsv_add       (ETableSubsetVariable *etssv,
-		gint                  row)
-{
-	ETableModel *etm = E_TABLE_MODEL(etssv);
-	ETableSubset *etss = E_TABLE_SUBSET(etssv);
-	ETableSortedVariable *etsv = E_TABLE_SORTED_VARIABLE (etssv);
-	int i;
-	
-	if (etss->n_map + 1 > etssv->n_vals_allocated) {
-		etssv->n_vals_allocated += INCREMENT_AMOUNT;
-		etss->map_table = g_realloc (etss->map_table, (etssv->n_vals_allocated) * sizeof(int));
-	}
-	i = etss->n_map;
-	if (etsv->sort_idle_id == 0) {
-		i = 0;
-		while (i < etss->n_map && etsv_compare(etsv, etss->map_table[i], row) < 0)
-			i++;
-		memmove(etss->map_table + i + 1, etss->map_table + i, (etss->n_map - i) * sizeof(int));
-	}
-	etss->map_table[i] = row;
-	etss->n_map++;
-
-	e_table_model_row_inserted (etm, i);
-}
-
-static void
-etsv_add_all   (ETableSubsetVariable *etssv)
-{
-	ETableModel *etm = E_TABLE_MODEL(etssv);
-	ETableSubset *etss = E_TABLE_SUBSET(etssv);
-	ETableSortedVariable *etsv = E_TABLE_SORTED_VARIABLE (etssv);
-	int rows;
-	int i;
-
-	e_table_model_pre_change(etm);
-
-	rows = e_table_model_row_count(etss->source);
-	
-	if (etss->n_map + rows > etssv->n_vals_allocated){
-		etssv->n_vals_allocated += MAX(INCREMENT_AMOUNT, rows);
-		etss->map_table = g_realloc (etss->map_table, etssv->n_vals_allocated * sizeof(int));
-	}
-	for (i = 0; i < rows; i++)
-		etss->map_table[etss->n_map++] = i;
-
-	if (etsv->sort_idle_id == 0) {
-		etsv->sort_idle_id = g_idle_add_full(50, (GSourceFunc) etsv_sort_idle, etsv, NULL);
-	}
-
-	e_table_model_changed (etm);
-}
-
-ETableModel *
-e_table_sorted_variable_new (ETableModel *source, ETableHeader *full_header, ETableSortInfo *sort_info)
-{
-	ETableSortedVariable *etsv = gtk_type_new (E_TABLE_SORTED_VARIABLE_TYPE);
-	ETableSubsetVariable *etssv = E_TABLE_SUBSET_VARIABLE (etsv);
-
-	if (e_table_subset_variable_construct (etssv, source) == NULL){
-		gtk_object_destroy (GTK_OBJECT (etsv));
-		return NULL;
-	}
-	
-	etsv->sort_info = sort_info;
-	gtk_object_ref(GTK_OBJECT(etsv->sort_info));
-	etsv->full_header = full_header;
-	gtk_object_ref(GTK_OBJECT(etsv->full_header));
-
-	etsv->table_model_changed_id = gtk_signal_connect (GTK_OBJECT (source), "model_changed",
-							   GTK_SIGNAL_FUNC (etsv_proxy_model_changed), etsv);
-#if 0
-	etsv->table_model_row_changed_id = gtk_signal_connect (GTK_OBJECT (source), "model_row_changed",
-							       GTK_SIGNAL_FUNC (etsv_proxy_model_row_changed), etsv);
-	etsv->table_model_cell_changed_id = gtk_signal_connect (GTK_OBJECT (source), "model_cell_changed",
-								GTK_SIGNAL_FUNC (etsv_proxy_model_cell_changed), etsv);
-#endif
-	etsv->sort_info_changed_id = gtk_signal_connect (GTK_OBJECT (sort_info), "sort_info_changed",
-							 GTK_SIGNAL_FUNC (etsv_sort_info_changed), etsv);
-	
-	return E_TABLE_MODEL(etsv);
-}
-
-static void
-etsv_proxy_model_changed (ETableModel *etm, ETableSortedVariable *etsv)
-{
-	/* FIXME: do_resort (); */
-}
-#if 0
-static void
-etsv_proxy_model_row_changed (ETableModel *etm, int row, ETableSortedVariable *etsv)
-{
-	ETableSubsetVariable *etssv = E_TABLE_SUBSET_VARIABLE(etsv);
-
-	if (e_table_subset_variable_remove(etssv, row))
-		e_table_subset_variable_add (etssv, row);
-}
-
-static void
-etsv_proxy_model_cell_changed (ETableModel *etm, int col, int row, ETableSortedVariable *etsv)
-{
-	ETableSubsetVariable *etssv = E_TABLE_SUBSET_VARIABLE(etsv);
-
-	if (e_table_subset_variable_remove(etssv, row))
-		e_table_subset_variable_add (etssv, row);
-}
-#endif
-
-static void
-etsv_sort_info_changed (ETableSortInfo *info, ETableSortedVariable *etsv)
-{
-	etsv_sort(etsv);
-}
-
-static ETableSortedVariable *etsv_closure;
-void **vals_closure;
-int cols_closure;
-int *ascending_closure;
-GCompareFunc *compare_closure;
-
-/* FIXME: Make it not cache the second and later columns (as if anyone cares.) */
-
-static int
-qsort_callback(const void *data1, const void *data2)
-{
-	gint row1 = *(int *)data1;
-	gint row2 = *(int *)data2;
-	int j;
-	int sort_count = e_table_sort_info_sorting_get_count(etsv_closure->sort_info);
-	int comp_val = 0;
-	int ascending = 1;
-	for (j = 0; j < sort_count; j++) {
-		comp_val = (*(compare_closure[j]))(vals_closure[cols_closure * row1 + j], vals_closure[cols_closure * row2 + j]);
-		ascending = ascending_closure[j];
-		if (comp_val != 0)
-			break;
-	}
-	if (comp_val == 0) {
-		if (row1 < row2)
-			comp_val = -1;
-		if (row1 > row2)
-			comp_val = 1;
-	}
-	if (!ascending)
-		comp_val = -comp_val;
-	return comp_val;
-}
-
-
-static void
-etsv_sort(ETableSortedVariable *etsv)
-{
-	ETableSubset *etss = E_TABLE_SUBSET(etsv);
-	static int reentering = 0;
-	int rows = E_TABLE_SUBSET(etsv)->n_map;
-	int total_rows;
-	int i;
-	int j;
-	int cols;
-	if (reentering)
-		return;
-	reentering = 1;
-
-	e_table_model_pre_change(E_TABLE_MODEL(etsv));
-
-	total_rows = e_table_model_row_count(E_TABLE_SUBSET(etsv)->source);
-	cols = e_table_sort_info_sorting_get_count(etsv->sort_info);
-	cols_closure = cols;
-	etsv_closure = etsv;
-	vals_closure = g_new(void *, total_rows * cols);
-	ascending_closure = g_new(int, cols);
-	compare_closure = g_new(GCompareFunc, cols);
-	for (j = 0; j < cols; j++) {
-		ETableSortColumn column = e_table_sort_info_sorting_get_nth(etsv->sort_info, j);
-		ETableCol *col;
-		if (column.column > e_table_header_count (etsv->full_header))
-			col = e_table_header_get_column (etsv->full_header, e_table_header_count (etsv->full_header) - 1);
-		else
-			col = e_table_header_get_column (etsv->full_header, column.column);
-		for (i = 0; i < rows; i++) {
-#if 0
-			if( !(i & 0xff) ) {
-				while(gtk_events_pending())
-					gtk_main_iteration();
-			}
-#endif
-			vals_closure[E_TABLE_SUBSET(etsv)->map_table[i] * cols + j] = e_table_model_value_at (etss->source, col->col_idx, E_TABLE_SUBSET(etsv)->map_table[i]);
-		}
-		compare_closure[j] = col->compare;
-		ascending_closure[j] = column.ascending;
-	}
-	qsort(E_TABLE_SUBSET(etsv)->map_table, rows, sizeof(int), qsort_callback);
-	g_free(vals_closure);
-	g_free(ascending_closure);
-	g_free(compare_closure);
-	e_table_model_changed (E_TABLE_MODEL(etsv));
-	reentering = 0;
-}