Load frames.

2001-01-16  Miguel de Icaza  <miguel@gnu.org>

	* e-table-config.c (configure_sort_dialog): Load frames.

	* Kill e-table-config-field.c

	* e-table-specification.c (e_table_specification_save_to_file):
	Specify version to xmlNewDoc.

	* e-table-state.c (e_table_state_save_to_string): Specify version
	to xmlNewDoc.

	* e-table-config.c (config_destroy): Destroy the copies.  Unref
	the originals.
	(e_table_config_construct): Duplicate values of configuration
	here.
	(configure_sort_dialog): New function that populates the sort gtk
	combo boxes.

	* e-table.c (et_col_spec_to_col): Fixup use of title here.  Do the
	actual translation here.

	* e-table-column-specification.c: Remove title_, it is now called
	title.  Translation needs to take place elsewhere, not here

	* e-table-specification.c (e_table_specification_duplicate): Add
	preconditions here.
	(e_table_specification_save_to_node): ditto.
	(e_table_specification_save_to_string): ditto.
	(e_table_specification_save_to_file): ditto.

	* e-table-state.c (e_table_state_duplicate): Implement.

	* e-table-config.glade (dialog_sort): Change drop down menus to
	use GtkComboText widgets.

	* e-table-config.c (configure_dialog): New function, used to set
	up dialogs.

svn path=/trunk/; revision=7563

1 files changed, 10 insertions, 10 deletions

diff --git a/widgets/table/e-table-column-specification.c b/widgets/table/e-table-column-specification.c
index ddd0f0bfef..68c19188b1 100644
--- a/widgets/table/e-table-column-specification.c
+++ b/widgets/table/e-table-column-specification.c
@@ -23,7 +23,7 @@ static GtkObjectClass *etcs_parent_class;
 static void
 free_strings (ETableColumnSpecification *etcs)
 {
-	g_free(etcs->title_);
+	g_free(etcs->title);
 	g_free(etcs->pixbuf);
 	g_free(etcs->cell);
 	g_free(etcs->compare);
@@ -51,7 +51,7 @@ static void
 etcs_init (ETableColumnSpecification *specification)
 {
 	specification->model_col     = 0;
-	specification->title_        = g_strdup("");
+	specification->title        = g_strdup("");
 	specification->pixbuf        = NULL;
 	
 	specification->expansion     = 0;
@@ -73,13 +73,13 @@ e_table_column_specification_new (void)
 }
 
 void
-e_table_column_specification_load_from_node    (ETableColumnSpecification *etcs,
-						const xmlNode       *node)
+e_table_column_specification_load_from_node (ETableColumnSpecification *etcs,
+					     const xmlNode       *node)
 {
 	free_strings(etcs);
 
 	etcs->model_col     = e_xml_get_integer_prop_by_name(node, "model_col");
-	etcs->title_        = e_xml_get_translated_string_prop_by_name(node, "_title");
+	etcs->title         = e_xml_get_string_prop_by_name(node, "_title");
 	etcs->pixbuf        = e_xml_get_string_prop_by_name(node, "pixbuf");
 
 	etcs->expansion     = e_xml_get_double_prop_by_name(node, "expansion");
@@ -89,13 +89,13 @@ e_table_column_specification_load_from_node    (ETableColumnSpecification *etcs,
 	etcs->cell          = e_xml_get_string_prop_by_name(node, "cell");
 	etcs->compare       = e_xml_get_string_prop_by_name(node, "compare");
 
-	if (etcs->title_ == NULL)
-		etcs->title_ = g_strdup("");
+	if (etcs->title == NULL)
+		etcs->title = g_strdup("");
 }
 
 xmlNode *
-e_table_column_specification_save_to_node      (ETableColumnSpecification *specification,
-						xmlNode                   *parent)
+e_table_column_specification_save_to_node (ETableColumnSpecification *specification,
+					   xmlNode                   *parent)
 {
 	xmlNode *node;
 	if (parent)
@@ -104,7 +104,7 @@ e_table_column_specification_save_to_node      (ETableColumnSpecification *speci
 		node = xmlNewNode(NULL, "ETableColumn");
 
 	e_xml_set_integer_prop_by_name(node, "model_col", specification->model_col);
-	e_xml_set_string_prop_by_name(node, "_title", specification->title_);
+	e_xml_set_string_prop_by_name(node, "_title", specification->title);
 	e_xml_set_string_prop_by_name(node, "pixbuf", specification->pixbuf);
 
 	e_xml_set_double_prop_by_name(node, "expansion", specification->expansion);