guard against multiple invocations.

2002-11-10  Chris Toshok  <toshok@ximian.com>

	* backend/pas/pas-backend-card-sexp.c
	(pas_backend_card_sexp_dispose): guard against multiple
	invocations.

	* backend/pas/pas-card-cursor.c (pas_card_cursor_dispose): same.

	* backend/pas/pas-book.c (pas_book_dispose): same.

	* backend/pas/pas-book-view.c (pas_book_view_dispose): same.

	* backend/pas/pas-book-factory.c (pas_book_factory_dispose): same.

	* backend/pas/pas-backend-summary.c (pas_backend_summary_dispose): same.

	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_dispose): same.

	* backend/pas/pas-backend-file.c (pas_backend_file_dispose): same.

	* backend/ebook/e-book-listener.c (e_book_listener_dispose): guard
	against multiple invocations.

	* backend/ebook/e-card.c (e_card_dispose): same.

	* backend/ebook/e-card-simple.c (e_card_simple_dispose): same.

	* backend/ebook/e-card-cursor.c (e_card_cursor_dispose): same.

	* backend/ebook/e-book.c (e_book_dispose): same.

	* backend/ebook/e-book-view-listener.c (e_book_view_listener_dispose): same.

svn path=/trunk/; revision=18687

1 files changed, 34 insertions, 13 deletions

diff --git a/addressbook/backend/ebook/e-card-simple.c b/addressbook/backend/ebook/e-card-simple.c
index b033b81d55..6b1f057c22 100644
--- a/addressbook/backend/ebook/e-card-simple.c
+++ b/addressbook/backend/ebook/e-card-simple.c
@@ -349,22 +349,43 @@ e_card_simple_dispose (GObject *object)
 	
 	simple = E_CARD_SIMPLE (object);
 
-	if (simple->card)
+	if (simple->card) {
 		g_object_unref(simple->card);
-	g_list_foreach(simple->temp_fields, (GFunc) g_free, NULL);
-	g_list_free(simple->temp_fields);
-	simple->temp_fields = NULL;
+		simple->card = NULL;
+	}
+	if (simple->temp_fields) {
+		g_list_foreach(simple->temp_fields, (GFunc) g_free, NULL);
+		g_list_free(simple->temp_fields);
+		simple->temp_fields = NULL;
+	}
 
-	for(i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i++)
-		e_card_phone_unref (simple->phone[i]);
-	for(i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i++)
-		g_free(simple->email[i]);
-	for(i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++)
-		e_card_address_label_unref(simple->address[i]);
-	for(i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++)
-		e_card_delivery_address_unref(simple->delivery[i]);
+	for(i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i++) {
+		if (simple->phone[i]) {
+			e_card_phone_unref (simple->phone[i]);
+			simple->phone[i] = NULL;
+		}
+	}
+	for(i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i++) {
+		if (simple->email[i]) {
+			g_free(simple->email[i]);
+			simple->email[i] = NULL;
+		}
+	}
+	for(i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++) {
+		if (simple->address[i]) {
+			e_card_address_label_unref(simple->address[i]);
+			simple->address[i] = NULL;
+		}
+	}
+	for(i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++) {
+		if (simple->delivery[i]) {
+			e_card_delivery_address_unref(simple->delivery[i]);
+			simple->delivery[i] = NULL;
+		}
+	}
 
-	G_OBJECT_CLASS (parent_class)->dispose (object);
+	if (G_OBJECT_CLASS (parent_class)->dispose)
+		G_OBJECT_CLASS (parent_class)->dispose (object);
 }