[evolution-patches] late addressbook GtkObject -> GObject fix.

[Chris Toshok <toshok ximian com>]

jpr found this the other day, EAddressbookTableAdapter was still in a
couple of places using GtkObject instead of GObject.  ugh.

Chris

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1401
diff -u -r1.1401 ChangeLog
--- ChangeLog	12 May 2003 08:54:39 -0000	1.1401
+++ ChangeLog	12 May 2003 22:59:47 -0000
@@ -1,3 +1,12 @@
+2003-05-12  Chris Toshok  <toshok ximian com>
+
+	* gui/widgets/e-addressbook-table-adapter.c (addressbook_dispose):
+	rename addressbook_destroy to this, and guard against multiple
+	calls.
+	(e_addressbook_table_adapter_class_init): GtkObject -> GObject,
+	and destroy -> dispose.
+	(e_addressbook_table_adapter_init): GtkObject -> GObject.
+
 2003-05-12  Sean Gao  <sean gao sun com>
 
 	* gui/contact-list-editor/e-contact-list-editor.c
Index: gui/widgets/e-addressbook-table-adapter.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/e-addressbook-table-adapter.c,v
retrieving revision 1.23
diff -u -r1.23 e-addressbook-table-adapter.c
--- gui/widgets/e-addressbook-table-adapter.c	23 Mar 2003 09:18:03 -0000	1.23
+++ gui/widgets/e-addressbook-table-adapter.c	12 May 2003 22:59:47 -0000
@@ -81,13 +81,16 @@
 }
 
 static void
-addressbook_destroy(GtkObject *object)
+addressbook_dispose(GObject *object)
 {
 	EAddressbookTableAdapter *adapter = E_ADDRESSBOOK_TABLE_ADAPTER(object);
 
-	unlink_model(adapter);
+	if (adapter->priv) {
+		unlink_model(adapter);
 
-	g_free (adapter->priv);
+		g_free (adapter->priv);
+		adapter->priv = NULL;
+	}
 }
 
 /* This function returns the number of columns in our ETableModel. */
@@ -247,13 +250,13 @@
 }
 
 static void
-e_addressbook_table_adapter_class_init (GtkObjectClass *object_class)
+e_addressbook_table_adapter_class_init (GObjectClass *object_class)
 {
 	ETableModelClass *model_class = (ETableModelClass *) object_class;
 
 	parent_class = g_type_class_peek_parent (object_class);
 
-	object_class->destroy = addressbook_destroy;
+	object_class->dispose = addressbook_dispose;
 
 	model_class->column_count = addressbook_col_count;
 	model_class->row_count = addressbook_row_count;
@@ -269,7 +272,7 @@
 }
 
 static void
-e_addressbook_table_adapter_init (GtkObject *object)
+e_addressbook_table_adapter_init (GObject *object)
 {
 	EAddressbookTableAdapter *adapter = E_ADDRESSBOOK_TABLE_ADAPTER(object);
 	EAddressbookTableAdapterPrivate *priv;