From 83f816df158441ca750b0bc12b7ccab2d43c0e43 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Tue, 12 Nov 2002 04:06:30 +0000 Subject: guard against multiple invocations. 2002-11-11 Chris Toshok * backend/pas/pas-card-cursor.c (pas_card_cursor_dispose): guard against multiple invocations. * backend/pas/pas-backend-ldap.c (view_destroy): change signature to that of a weak ref notify function. (cursor_destroy): same. (pas_backend_ldap_book_destroy_cb): same. (get_cursor_handler): ::destroy -> weak_ref. (pas_backend_ldap_process_get_book_view): same. (pas_backend_ldap_add_client): same. * backend/pas/pas-backend-file.c (cursor_destroy): change signature to that of a weak ref notify function. (view_destroy): same. (pas_backend_file_book_destroy_cb): same. (pas_backend_file_process_get_cursor): ::destroy -> weak_ref. (pas_backend_file_process_get_book_view): same. (pas_backend_file_process_get_completion_view): same. (pas_backend_file_process_get_changes): same. (pas_backend_file_add_client): same. * backend/ebook/test-client.c (get_cursor_cb): unref the book and exit here. (get_card_cb): pass a query string to get_cursor. * backend/ebook/e-book-view.c (e_book_view_class_init): correct marshaller for "card_added". svn path=/trunk/; revision=18720 --- addressbook/backend/pas/pas-card-cursor.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'addressbook/backend/pas/pas-card-cursor.c') diff --git a/addressbook/backend/pas/pas-card-cursor.c b/addressbook/backend/pas/pas-card-cursor.c index 52d8911271..8450a45028 100644 --- a/addressbook/backend/pas/pas-card-cursor.c +++ b/addressbook/backend/pas/pas-card-cursor.c @@ -30,10 +30,13 @@ pas_card_cursor_dispose (GObject *object) { PASCardCursor *cursor = PAS_CARD_CURSOR (object); - if ( cursor->priv ) + if ( cursor->priv ) { g_free ( cursor->priv ); + cursor->priv = NULL; + } - G_OBJECT_CLASS (parent_class)->dispose (object); + if (G_OBJECT_CLASS (parent_class)->dispose) + G_OBJECT_CLASS (parent_class)->dispose (object); } /* -- cgit