Check that local_listener and other_contacts_listener are non-NULL before

2001-10-31  Jon Trowbridge  <trow@ximian.com>

	* gui/component/select-names/e-select-names.c
	(e_select_names_destroy): Check that local_listener and
	other_contacts_listener are non-NULL before
	disconnecting/unrefing.

	* gui/component/select-names/e-select-names-manager.c
	(entry_destroyed): The entry shouldn't unref the manager.
	(e_select_names_manager_create_entry): The entry shouldn't hold a
	ref to the manager.  It becomes circular.
	(e_select_names_manager_create_entry): On the other hand, we
	should hold a ref to the entry we create.

	* gui/component/select-names/e-select-names-bonobo.c
	(impl_destroy): Remove the explicit dialog destroy hack.

svn path=/trunk/; revision=14519

1 files changed, 0 insertions, 7 deletions

diff --git a/addressbook/gui/component/select-names/e-select-names-bonobo.c b/addressbook/gui/component/select-names/e-select-names-bonobo.c
index 7f33d335b7..abe3af3634 100644
--- a/addressbook/gui/component/select-names/e-select-names-bonobo.c
+++ b/addressbook/gui/component/select-names/e-select-names-bonobo.c
@@ -356,13 +356,6 @@ impl_destroy (GtkObject *object)
 
 	select_names = E_SELECT_NAMES_BONOBO (object);
 	priv = select_names->priv;
-
-	/* FIXME: a hack to work around some ref counting brokenness that
-	   I'll fix later. */
-	if (priv->manager->names) {
-		gtk_widget_destroy (GTK_WIDGET (priv->manager->names));
-		priv->manager->names = NULL;
-	}
 	
 	gtk_object_unref (GTK_OBJECT (priv->manager));