From 613453b1095e325149b8d37e5731d415e1d5f9bd Mon Sep 17 00:00:00 2001
From: Mike Kestner <mkestner@src.gnome.org>
Date: Thu, 31 Oct 2002 21:30:57 +0000
Subject: merging the gal-2 branch back to the trunk.

merging the gal-2 branch back to the trunk.

svn path=/trunk/; revision=18471
---
 widgets/table/e-table-memory.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'widgets/table/e-table-memory.c')

diff --git a/widgets/table/e-table-memory.c b/widgets/table/e-table-memory.c
index 84e9fe3378..0e53c80b09 100644
--- a/widgets/table/e-table-memory.c
+++ b/widgets/table/e-table-memory.c
@@ -1,5 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
+/*
  * e-table-memory.c
  * Copyright 2000, 2001, Ximian, Inc.
  *
@@ -32,8 +32,8 @@
 #include <fcntl.h>
 
 #include <gtk/gtksignal.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
+#include <libxml/parser.h>
+#include <libxml/xmlmemory.h>
 
 #include "gal/util/e-util.h"
 #include "gal/util/e-xml-utils.h"
@@ -59,9 +59,11 @@ etmm_destroy (GtkObject *object)
 	ETableMemoryPriv *priv = etmm->priv;
 
 	/* XXX lots of stuff to free here */
-
-	g_free (priv->data);
-	g_free (priv);
+	if (priv) {
+		g_free (priv->data);
+		g_free (priv);
+	}
+	etmm->priv = NULL;
 
 	GTK_OBJECT_CLASS (parent_class)->destroy (object);
 }
-- 
cgit v1.2.3