Fixed the column elements, the no-headers attribute and added a

2000-10-11  Christopher James Lahey  <clahey@helixcode.com>

	* contact-editor/e-contact-editor-categories.c: Fixed the column
	elements, the no-headers attribute and added a cursor-mode=line
	attribute.

	* gui/component/select-names/e-select-names.c,
	gui/widgets/e-addressbook-view.c: Fixed the column elements here.

svn path=/trunk/; revision=5851

5 files changed, 24 insertions, 15 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 9986dfc0cb..30d0a634d5 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,14 @@
 2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
 
+	* contact-editor/e-contact-editor-categories.c: Fixed the column
+	elements, the no-headers attribute and added a cursor-mode=line
+	attribute.
+
+	* gui/component/select-names/e-select-names.c,
+	gui/widgets/e-addressbook-view.c: Fixed the column elements here.
+
+2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
+
 	* contact-editor/e-contact-editor-categories.c,
 	gui/component/select-names/e-select-names.c,
 	gui/widgets/e-addressbook-view.c: Updated these to the new style
diff --git a/addressbook/contact-editor/e-contact-editor-categories.c b/addressbook/contact-editor/e-contact-editor-categories.c
index db85466e87..ff58678031 100644
--- a/addressbook/contact-editor/e-contact-editor-categories.c
+++ b/addressbook/contact-editor/e-contact-editor-categories.c
@@ -221,13 +221,13 @@ e_contact_editor_categories_entry_change (GtkWidget *entry,
 	do_parse_categories(categories);
 }
 
-#define INITIAL_SPEC "<ETableSpecification no-header=\"1\" draw-grid=\"true\">\
+#define INITIAL_SPEC "<ETableSpecification no-headers=\"true\" draw-grid=\"true\" cursor-mode=\"line\">\
   <ETableColumn model_col=\"0\" _title=\" \" expansion=\"0.0\" minimum_width=\"20\" resizable=\"false\" cell=\"checkbox\"       compare=\"integer\"/> \
   <ETableColumn model_col=\"1\" _title=\"Category\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
         <ETableState> \
-		<column> 0 </column>     			       \
-		<column> 1 </column>     			       \
-        	<grouping> <leaf column=\"1\" ascending=\"1\"/> </grouping>    \
+		<column source=\"0\"/>						\
+		<column source=\"1\"/>						\
+        	<grouping> <leaf column=\"1\" ascending=\"1\"/> </grouping>	\
         </ETableState> \
 </ETableSpecification>"
 
diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c
index f6960c4e7e..a1286566bc 100644
--- a/addressbook/gui/component/select-names/e-select-names.c
+++ b/addressbook/gui/component/select-names/e-select-names.c
@@ -90,7 +90,7 @@ e_select_names_class_init (ESelectNamesClass *klass)
 #define SPEC "<ETableSpecification no-headers=\"true\">    	       \
   <ETableColumn model_col= \"34\" _title=\"Name\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
 	<ETableState>                   			       \
-		<column> 0 </column>     			       \
+		<column source=\"0\"/>     			       \
 	        <grouping> <leaf column=\"1\" ascending=\"1\"/> </grouping> \
 	</ETableState>                  			       \
 </ETableSpecification>"
@@ -98,7 +98,7 @@ e_select_names_class_init (ESelectNamesClass *klass)
 #define SPEC2 "<ETableSpecification no-headers=\"true\">    	       \
   <ETableColumn model_col= \"0\" _title=\"Name\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
 	<ETableState>                   			       \
-                <column> 0 </column>                                   \
+		<column source=\"0\"/>     			       \
         	<grouping> </grouping>                                 \
 	</ETableState>                  			       \
 </ETableSpecification>"
diff --git a/addressbook/gui/contact-editor/e-contact-editor-categories.c b/addressbook/gui/contact-editor/e-contact-editor-categories.c
index db85466e87..ff58678031 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-categories.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-categories.c
@@ -221,13 +221,13 @@ e_contact_editor_categories_entry_change (GtkWidget *entry,
 	do_parse_categories(categories);
 }
 
-#define INITIAL_SPEC "<ETableSpecification no-header=\"1\" draw-grid=\"true\">\
+#define INITIAL_SPEC "<ETableSpecification no-headers=\"true\" draw-grid=\"true\" cursor-mode=\"line\">\
   <ETableColumn model_col=\"0\" _title=\" \" expansion=\"0.0\" minimum_width=\"20\" resizable=\"false\" cell=\"checkbox\"       compare=\"integer\"/> \
   <ETableColumn model_col=\"1\" _title=\"Category\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
         <ETableState> \
-		<column> 0 </column>     			       \
-		<column> 1 </column>     			       \
-        	<grouping> <leaf column=\"1\" ascending=\"1\"/> </grouping>    \
+		<column source=\"0\"/>						\
+		<column source=\"1\"/>						\
+        	<grouping> <leaf column=\"1\" ascending=\"1\"/> </grouping>	\
         </ETableState> \
 </ETableSpecification>"
 
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index c865d50b40..c2a46409b7 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -498,11 +498,11 @@ table_right_click(ETableScrolled *table, gint row, gint col, GdkEvent *event, EA
   <ETableColumn model_col=\"30\" _title=\"Note\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
   <ETableColumn model_col=\"31\" _title=\"Free-busy URL\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
   <ETableState>                            \
-    <column>0</column>                     \
-    <column>1</column>                     \
-    <column>5</column>                     \
-    <column>3</column>                     \
-    <column>4</column>                     \
+    <column source=\"0\"/>                 \
+    <column source=\"1\"/>                 \
+    <column source=\"5\"/>                 \
+    <column source=\"3\"/>                 \
+    <column source=\"4\"/>                 \
     <grouping>                             \
       <leaf column=\"0\" ascending=\"1\"/> \
     </grouping>                            \