4 files changed, 29 insertions, 22 deletions
diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c
index c249c498e8..f5381a0e4d 100644
--- a/widgets/table/e-table-config.c
+++ b/widgets/table/e-table-config.c
@@ -363,6 +363,19 @@ do_sort_and_group_config_dialog (ETableConfig *config, gboolean is_sort)
 		config_group_info_update (config);
 }
 
+GtkWidget *
+e_table_proxy_etable_new (void)
+{
+	return gtk_label_new ("Waiting for the ETable/ETree\nmerger to be commited");
+}
+
+static void
+config_button_fields (GtkWidget *widget, ETableConfig *config)
+{
+	gnome_dialog_run (config->dialog_show_fields);
+	gnome_dialog_close (GNOME_DIALOG (config->dialog_show_fields));
+}
+		
 static void
 config_button_sort (GtkWidget *widget, ETableConfig *config)
 {
@@ -375,7 +388,6 @@ config_button_group (GtkWidget *widget, ETableConfig *config)
 	do_sort_and_group_config_dialog (config, FALSE);
 }
 
-
 static void
 dialog_destroyed (GtkObject *dialog, ETableConfig *config)
 {
@@ -667,7 +679,8 @@ setup_gui (ETableConfig *config)
 
 	connect_button (config, gui, "button-sort", config_button_sort);
 	connect_button (config, gui, "button-group", config_button_group);
-
+	connect_button (config, gui, "button-fields", config_button_fields);
+	
 	configure_sort_dialog (config, gui);
 	configure_group_dialog (config, gui);
 	
diff --git a/widgets/table/e-table-config.glade b/widgets/table/e-table-config.glade
index b199b521a7..9b173e3997 100644
--- a/widgets/table/e-table-config.glade
+++ b/widgets/table/e-table-config.glade
@@ -29,7 +29,7 @@
   <allow_grow>True</allow_grow>
   <auto_shrink>False</auto_shrink>
   <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
+  <hide_on_close>True</hide_on_close>
 
   <widget>
     <class>GtkVBox</class>
@@ -112,7 +112,6 @@
 	  <yalign>0.5</yalign>
 	  <xpad>0</xpad>
 	  <ypad>0</ypad>
-	  <focus_target>table-1</focus_target>
 	  <child>
 	    <left_attach>0</left_attach>
 	    <right_attach>2</right_attach>
@@ -139,7 +138,6 @@
 	  <yalign>0.5</yalign>
 	  <xpad>0</xpad>
 	  <ypad>0</ypad>
-	  <focus_target>table-2</focus_target>
 	  <child>
 	    <left_attach>3</left_attach>
 	    <right_attach>5</right_attach>
@@ -210,11 +208,12 @@
 	      <shadow_type>GTK_SHADOW_IN</shadow_type>
 
 	      <widget>
-		<class>GtkButton</class>
-		<name>table-1</name>
-		<can_focus>True</can_focus>
-		<label>Table HERE</label>
-		<relief>GTK_RELIEF_NORMAL</relief>
+		<class>Custom</class>
+		<name>available-field-list</name>
+		<creation_function>e_table_proxy_etable_new</creation_function>
+		<int1>0</int1>
+		<int2>0</int2>
+		<last_modification_time>Sun, 18 Mar 2001 23:59:35 GMT</last_modification_time>
 	      </widget>
 	    </widget>
 	  </widget>
@@ -259,11 +258,12 @@
 	      <shadow_type>GTK_SHADOW_IN</shadow_type>
 
 	      <widget>
-		<class>GtkButton</class>
-		<name>table-2</name>
-		<can_focus>True</can_focus>
-		<label>Table HERE</label>
-		<relief>GTK_RELIEF_NORMAL</relief>
+		<class>Custom</class>
+		<name>fields-shown</name>
+		<creation_function>e_table_proxy_etable_new</creation_function>
+		<int1>0</int1>
+		<int2>0</int2>
+		<last_modification_time>Sun, 18 Mar 2001 23:59:49 GMT</last_modification_time>
 	      </widget>
 	    </widget>
 	  </widget>
@@ -1692,7 +1692,7 @@
 
 	<widget>
 	  <class>GtkButton</class>
-	  <name>button15</name>
+	  <name>button-fields</name>
 	  <can_default>True</can_default>
 	  <can_focus>True</can_focus>
 	  <signal>
diff --git a/widgets/table/e-table-config.glade.h b/widgets/table/e-table-config.glade.h
index 76f2aaea31..cf8f6d6d51 100644
--- a/widgets/table/e-table-config.glade.h
+++ b/widgets/table/e-table-config.glade.h
@@ -7,8 +7,6 @@
 gchar *s = N_("Show Fields");
 gchar *s = N_("A_vailable Fields:");
 gchar *s = N_("Sh_ow these fields in order:");
-gchar *s = N_("Table HERE");
-gchar *s = N_("Table HERE");
 gchar *s = N_("Move _Up");
 gchar *s = N_("Move _Down");
 gchar *s = N_("_Add ->");
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index c3db9e7dfc..1fd1c12662 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -1225,9 +1225,6 @@ apply_changes (ETableConfig *config, ETableHeaderItem *ethi)
 {
 	char *state = e_table_state_save_to_string (config->state);
 
-	printf ("This is the Table: %p %p\n", ethi->table, ethi);
-	printf ("This is the state: %s\n", state);
-	
 	e_table_set_state (ethi->table, state);
 	g_free (state);
 }
@@ -1238,7 +1235,6 @@ ethi_popup_customize_view(GtkWidget *widget, EthiHeaderInfo *info)
 	ETableHeaderItem *ethi = info->ethi;
 	ETableState *state;
 
-	printf ("___This is the Table: %p %p\n", ethi->table, ethi);
 	if (ethi->config)
 		e_table_config_raise (E_TABLE_CONFIG (ethi->config));
 	else {