diff options
Diffstat (limited to 'addressbook/gui/component/select-names')
3 files changed, 13 insertions, 13 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)); diff --git a/addressbook/gui/component/select-names/e-select-names-manager.c b/addressbook/gui/component/select-names/e-select-names-manager.c index 2ba538b63f..a4b61def7e 100644 --- a/addressbook/gui/component/select-names/e-select-names-manager.c +++ b/addressbook/gui/component/select-names/e-select-names-manager.c @@ -394,7 +394,6 @@ entry_destroyed(EEntry *entry, ESelectNamesManager *manager) } } } - gtk_object_unref(GTK_OBJECT(manager)); } static void @@ -502,6 +501,8 @@ e_select_names_manager_create_entry (ESelectNamesManager *manager, const char *i entry->entry = eentry; entry->id = (char *)id; + gtk_object_ref (GTK_OBJECT (entry->entry)); + model = e_select_names_text_model_new (section->model); e_list_append (manager->entries, entry); g_free(entry); @@ -520,9 +521,10 @@ e_select_names_manager_create_entry (ESelectNamesManager *manager, const char *i "use_ellipsis", TRUE, "allow_newlines", FALSE, NULL); + gtk_signal_connect(GTK_OBJECT(eentry), "destroy", GTK_SIGNAL_FUNC(entry_destroyed), manager); - gtk_object_ref(GTK_OBJECT(manager)); + return GTK_WIDGET(eentry); } } diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c index cb04e973a6..fe737bbce7 100644 --- a/addressbook/gui/component/select-names/e-select-names.c +++ b/addressbook/gui/component/select-names/e-select-names.c @@ -657,10 +657,15 @@ e_select_names_destroy (GtkObject *object) { ESelectNames *e_select_names = E_SELECT_NAMES(object); - gtk_signal_disconnect_by_data(GTK_OBJECT(e_select_names->local_listener), e_select_names); - gtk_object_unref(GTK_OBJECT(e_select_names->local_listener)); - gtk_signal_disconnect_by_data(GTK_OBJECT(e_select_names->other_contacts_listener), e_select_names); - gtk_object_unref(GTK_OBJECT(e_select_names->other_contacts_listener)); + if (e_select_names->local_listener) { + gtk_signal_disconnect_by_data(GTK_OBJECT(e_select_names->local_listener), e_select_names); + gtk_object_unref(GTK_OBJECT(e_select_names->local_listener)); + } + + if (e_select_names->other_contacts_listener) { + gtk_signal_disconnect_by_data(GTK_OBJECT(e_select_names->other_contacts_listener), e_select_names); + gtk_object_unref(GTK_OBJECT(e_select_names->other_contacts_listener)); + } gtk_object_unref(GTK_OBJECT(e_select_names->gui)); g_hash_table_foreach(e_select_names->children, (GHFunc) e_select_names_child_free, e_select_names); |