Got rid of some warnings.

2000-04-06  Christopher James Lahey  <clahey@helixcode.com>

	* test-cols.c, test-table.c: Got rid of some warnings.

	* e-table-group-container.c, e-table-group-container.h,
	e-table-group-leaf.c, e-table-group-leaf.h, e-table-group.c,
	e-table-group.h, e-table-header-item.c, e-table-header-item.h,
	e-table-sort-info.c, e-table-sort-info.h,
	e-table-sorted-variable.c, e-table-sorted-variable.h, e-table.c,
	e-table.h: Changed ETableSortInfo to not use xml internally.

svn path=/trunk/; revision=2305

1 files changed, 33 insertions, 10 deletions

diff --git a/widgets/table/e-table-sort-info.h b/widgets/table/e-table-sort-info.h
index 0fc4cd52ef..6446230116 100644
--- a/widgets/table/e-table-sort-info.h
+++ b/widgets/table/e-table-sort-info.h
@@ -1,4 +1,3 @@
-
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 #ifndef _E_TABLE_SORT_INFO_H_
 #define _E_TABLE_SORT_INFO_H_
@@ -11,10 +10,24 @@
 #define E_IS_TABLE_SORT_INFO(o)       (GTK_CHECK_TYPE ((o), E_TABLE_SORT_INFO_TYPE))
 #define E_IS_TABLE_SORT_INFO_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_SORT_INFO_TYPE))
 
+typedef struct _ETableSortColumn ETableSortColumn;
+
+struct _ETableSortColumn {
+	guint column : 31;
+	guint ascending : 1;
+};
+
 typedef struct {
 	GtkObject   base;
-  
-	xmlNode    *grouping;
+	
+	gint group_count;
+	ETableSortColumn *groupings;
+	gint sort_count;
+	ETableSortColumn *sortings;
+	
+	guint frozen : 1;
+	guint sort_info_changed : 1;
+	guint group_info_changed : 1;
 } ETableSortInfo;
 
 typedef struct {
@@ -23,15 +36,25 @@ typedef struct {
 	/*
 	 * Signals
 	 */
-	void        (*sort_info_changed)      (ETableSortInfo *etm);
+	void        (*sort_info_changed)      (ETableSortInfo *info);
+	void        (*group_info_changed)     (ETableSortInfo *info);
 } ETableSortInfoClass;
 
-GtkType     e_table_sort_info_get_type (void);
+GtkType      	 e_table_sort_info_get_type (void);
+
+void             e_table_sort_info_freeze             (ETableSortInfo *info);
+void             e_table_sort_info_thaw               (ETableSortInfo *info);
+
+guint        	 e_table_sort_info_grouping_get_count (ETableSortInfo *info);
+void             e_table_sort_info_grouping_truncate  (ETableSortInfo *info, int length);
+ETableSortColumn e_table_sort_info_grouping_get_nth   (ETableSortInfo *info, int n);
+void             e_table_sort_info_grouping_set_nth   (ETableSortInfo *info, int n, ETableSortColumn column);
+
+guint        	 e_table_sort_info_sorting_get_count  (ETableSortInfo *info);
+void             e_table_sort_info_sorting_truncate   (ETableSortInfo *info, int length);
+ETableSortColumn e_table_sort_info_sorting_get_nth    (ETableSortInfo *info, int n);
+void             e_table_sort_info_sorting_set_nth    (ETableSortInfo *info, int n, ETableSortColumn column);
 
-/*
- * Routines for emitting signals on the e_table
- */
-void        e_table_sort_info_changed          (ETableSortInfo *e_table_sort_info);
-ETableSortInfo *e_table_sort_info_new (void);
+ETableSortInfo  *e_table_sort_info_new                (void);
 
 #endif /* _E_TABLE_SORT_INFO_H_ */