callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename addressbook_destroy to this, and guard against multiple calls.

Browse Source 
2003-05-13  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.

svn path=/trunk/; revision=21157
This commit is contained in:
Chris Toshok
2003-05-13 17:49:19 +00:00
committed by Chris Toshok
parent cd1b05ca91
commit 16441223ca
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
addressbook/ChangeLog
View File

@ -1,3 +1,12 @@
2003-05-13 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

15
addressbook/gui/widgets/e-addressbook-table-adapter.c
View File

@ -81,13 +81,16 @@ build_simple_mapping(EAddressbookTableAdapter *adapter)
}
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 @@ addressbook_value_to_string (ETableModel *etc, int col, const void *value)
}
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 @@ e_addressbook_table_adapter_class_init (GtkObjectClass *object_class)
}
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;