use GObject api for models GObjectify GObjectify GObjectify GObjectify

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

	* e-table-item.c : use GObject api for models
	* e-table-memory-callbacks.[ch] : GObjectify
	* e-table-memory-store.[ch] : GObjectify
	* e-table-memory.[ch] : GObjectify
	* e-table-model.[ch] : GObjectify
	* e-table-one.[ch] : GObjectify
	* e-table-simple.[ch] : GObjectify
	* e-tree-memory.[ch] : GObjectify
	* e-tree-model.[ch] : GObjectify
	* e-tree-selection-model.c : use GObject api for models
	* e-tree-simple.[ch] : GObjectify
	* e-tree-sorted.[ch] : GObjectify
	* e-tree-table-adapter.[ch] : GObjectify
	* e-tree.c : use GObject api for models

svn path=/trunk/; revision=18553

1 files changed, 8 insertions, 28 deletions

diff --git a/widgets/table/e-table-memory.c b/widgets/table/e-table-memory.c
index 0e53c80b09..7d9958bbd6 100644
--- a/widgets/table/e-table-memory.c
+++ b/widgets/table/e-table-memory.c
@@ -31,7 +31,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include <gtk/gtksignal.h>
 #include <libxml/parser.h>
 #include <libxml/xmlmemory.h>
 
@@ -39,8 +38,6 @@
 #include "gal/util/e-xml-utils.h"
 #include <string.h>
 
-#define PARENT_TYPE E_TABLE_MODEL_TYPE
-
 static ETableModel *parent_class;
 
 struct ETableMemoryPriv {
@@ -53,7 +50,7 @@ struct ETableMemoryPriv {
 /* virtual methods */
 
 static void
-etmm_destroy (GtkObject *object)
+etmm_finalize (GObject *object)
 {
 	ETableMemory *etmm = E_TABLE_MEMORY (object);
 	ETableMemoryPriv *priv = etmm->priv;
@@ -65,7 +62,7 @@ etmm_destroy (GtkObject *object)
 	}
 	etmm->priv = NULL;
 
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
+	G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 static int
@@ -78,19 +75,19 @@ etmm_row_count (ETableModel *etm)
 
 
 static void
-e_table_memory_class_init (GtkObjectClass *klass)
+e_table_memory_class_init (GObjectClass *klass)
 {
 	ETableModelClass *table_class = (ETableModelClass *) klass;
 
-	parent_class               = gtk_type_class (PARENT_TYPE);
+	parent_class               = g_type_class_peek_parent (klass);
 	
-	klass->destroy             = etmm_destroy;
+	klass->finalize            = etmm_finalize;
 
 	table_class->row_count     = etmm_row_count;
 }
 
 static void
-e_table_memory_init (GtkObject *object)
+e_table_memory_init (GObject *object)
 {
 	ETableMemory *etmm = (ETableMemory *)object;
 
@@ -104,22 +101,11 @@ e_table_memory_init (GtkObject *object)
 	priv->frozen = 0;
 }
 
-E_MAKE_TYPE(e_table_memory, "ETableMemory", ETableMemory, e_table_memory_class_init, e_table_memory_init, PARENT_TYPE)
+E_MAKE_TYPE(e_table_memory, "ETableMemory", ETableMemory, e_table_memory_class_init, e_table_memory_init, E_TABLE_MODEL_TYPE)
 
 
 
 /**
- * e_table_memory_construct:
- * @etable: 
- * 
- * 
- **/
-void
-e_table_memory_construct (ETableMemory *etmm)
-{
-}
-
-/**
  * e_table_memory_new
  *
  * XXX docs here.
@@ -129,13 +115,7 @@ e_table_memory_construct (ETableMemory *etmm)
 ETableMemory *
 e_table_memory_new (void)
 {
-	ETableMemory *etmm;
-
-	etmm = gtk_type_new (e_table_memory_get_type ());
-
-	e_table_memory_construct(etmm);
-
-	return etmm;
+	return g_object_new (E_TABLE_MEMORY_TYPE, NULL);
 }
 
 /**