Remove e_table_new_from_spec_file().

Also remove e_table_construct_from_spec_file().

Use e_table_new() or e_table_construct() instead.

3 files changed, 19 insertions, 6 deletions

diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c
index 5150ac9f72..1a0f2ee9f3 100644
--- a/calendar/gui/e-cal-list-view.c
+++ b/calendar/gui/e-cal-list-view.c
@@ -190,6 +190,7 @@ setup_e_table (ECalListView *cal_list_view)
 {
 	ECalModel *model;
 	ETableExtras *extras;
+	ETableSpecification *specification;
 	GList *strings;
 	ECell *cell, *popup_cell;
 	GnomeCanvas *canvas;
@@ -310,11 +311,15 @@ setup_e_table (ECalListView *cal_list_view)
 
 	etspecfile = g_build_filename (
 		EVOLUTION_ETSPECDIR, "e-cal-list-view.etspec", NULL);
-	widget = e_table_new_from_spec_file (
-		E_TABLE_MODEL (model), extras, etspecfile);
+	specification = e_table_specification_new ();
+	e_table_specification_load_from_file (specification, etspecfile);
+
+	widget = e_table_new (E_TABLE_MODEL (model), extras, specification);
 	gtk_container_add (GTK_CONTAINER (container), widget);
 	cal_list_view->table = E_TABLE (widget);
 	gtk_widget_show (widget);
+
+	g_object_unref (specification);
 	g_free (etspecfile);
 
 	/* Make sure text is readable on top of our color coding */
diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c
index 4f1a59ba7b..7537dc8130 100644
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@ -329,6 +329,7 @@ memo_table_constructed (GObject *object)
 	ECalModel *model;
 	ECell *cell, *popup_cell;
 	ETableExtras *extras;
+	ETableSpecification *specification;
 	AtkObject *a11y;
 	gchar *etspecfile;
 
@@ -407,10 +408,13 @@ memo_table_constructed (GObject *object)
 
 	etspecfile = g_build_filename (
 		EVOLUTION_ETSPECDIR, "e-memo-table.etspec", NULL);
-	e_table_construct_from_spec_file (
+	specification = e_table_specification_new ();
+	e_table_specification_load_from_file (specification, etspecfile);
+	e_table_construct (
 		E_TABLE (memo_table),
 		E_TABLE_MODEL (model),
-		extras, etspecfile);
+		extras, specification);
+	g_object_unref (specification);
 	g_free (etspecfile);
 
 	gtk_widget_set_has_tooltip (GTK_WIDGET (memo_table), TRUE);
diff --git a/calendar/gui/e-task-table.c b/calendar/gui/e-task-table.c
index 7672835989..e0e817ec48 100644
--- a/calendar/gui/e-task-table.c
+++ b/calendar/gui/e-task-table.c
@@ -455,6 +455,7 @@ task_table_constructed (GObject *object)
 	ECalModel *model;
 	ECell *cell, *popup_cell;
 	ETableExtras *extras;
+	ETableSpecification *specification;
 	GList *strings;
 	AtkObject *a11y;
 	gchar *etspecfile;
@@ -694,10 +695,13 @@ task_table_constructed (GObject *object)
 
 	etspecfile = g_build_filename (
 		EVOLUTION_ETSPECDIR, "e-calendar-table.etspec", NULL);
-	e_table_construct_from_spec_file (
+	specification = e_table_specification_new ();
+	e_table_specification_load_from_file (specification, etspecfile);
+	e_table_construct (
 		E_TABLE (task_table),
 		E_TABLE_MODEL (model),
-		extras, etspecfile);
+		extras, specification);
+	g_object_unref (specification);
 	g_free (etspecfile);
 
 	gtk_widget_set_has_tooltip (GTK_WIDGET (task_table), TRUE);