GObjectify GObjectify GObjectify use GObject api for models use GObject

2002-11-05  Mike Kestner  <mkestner@ximian.com>

	* e-table-col.[ch] : GObjectify
	* e-table-column-specification.[ch] : GObjectify
	* e-table-config.[ch] : GObjectify
	* e-table-group-leaf.c : use GObject api for models
	* e-table-group.c : use GObject api for models
	* e-table-header-item.c : use GObject api for models
	* e-table-header.c : use GObject api for models
	* e-table-selection-model.c : use GObject api for models
	* e-table-sort-info.[ch] : GObjectify
	* e-table-sorted.[ch] : GObjectify
	* e-table-sorter.c : use GObject api for models
	* e-table-specification.c : use GObject api for models
	* e-table-state.[ch] : GObjectify
	* e-table-subset-variable.[ch] : GObjectify
	* e-table-subset.[ch] : GObjectify
	* e-table.c : use GObject api for models

svn path=/trunk/; revision=18571

1 files changed, 8 insertions, 11 deletions

diff --git a/widgets/table/e-table-column-specification.c b/widgets/table/e-table-column-specification.c
index 2ee2833e63..2e992414d5 100644
--- a/widgets/table/e-table-column-specification.c
+++ b/widgets/table/e-table-column-specification.c
@@ -23,16 +23,13 @@
 
 #include <config.h>
 #include <stdlib.h>
-#include <gtk/gtksignal.h>
 #include <libxml/parser.h>
 #include <libxml/xmlmemory.h>
 #include "gal/util/e-xml-utils.h"
 #include "gal/util/e-util.h"
 #include "e-table-column-specification.h"
 
-#define PARENT_TYPE (gtk_object_get_type())
-
-static GtkObjectClass *etcs_parent_class;
+static GObjectClass *etcs_parent_class;
 
 static void
 free_strings (ETableColumnSpecification *etcs)
@@ -50,21 +47,21 @@ free_strings (ETableColumnSpecification *etcs)
 }
 
 static void
-etcs_destroy (GtkObject *object)
+etcs_finalize (GObject *object)
 {
 	ETableColumnSpecification *etcs = E_TABLE_COLUMN_SPECIFICATION (object);
 
 	free_strings(etcs);
 
-	GTK_OBJECT_CLASS (etcs_parent_class)->destroy (object);
+	etcs_parent_class->finalize (object);
 }
 
 static void
-etcs_class_init (GtkObjectClass *klass)
+etcs_class_init (GObjectClass *klass)
 {
-	etcs_parent_class = gtk_type_class (PARENT_TYPE);
+	etcs_parent_class = g_type_class_peek_parent (klass);
 	
-	klass->destroy = etcs_destroy;
+	klass->finalize = etcs_finalize;
 }
 
 static void
@@ -86,12 +83,12 @@ etcs_init (ETableColumnSpecification *specification)
 	specification->priority      = 0;
 }
 
-E_MAKE_TYPE(e_table_column_specification, "ETableColumnSpecification", ETableColumnSpecification, etcs_class_init, etcs_init, PARENT_TYPE)
+E_MAKE_TYPE(e_table_column_specification, "ETableColumnSpecification", ETableColumnSpecification, etcs_class_init, etcs_init, G_TYPE_OBJECT)
 
 ETableColumnSpecification *
 e_table_column_specification_new (void)
 {
-	ETableColumnSpecification *etcs = gtk_type_new (E_TABLE_COLUMN_SPECIFICATION_TYPE);
+	ETableColumnSpecification *etcs = g_object_new (E_TABLE_COLUMN_SPECIFICATION_TYPE, NULL);
 
 	return (ETableColumnSpecification *) etcs;
 }