From b415ae2313ba1f238365fbd261c0e10bbb117c56 Mon Sep 17 00:00:00 2001 From: Hans Petter Jansson Date: Tue, 12 Aug 2003 22:13:53 +0000 Subject: Add destroy chaining. 2003-08-12 Hans Petter Jansson * gui/e-itip-control.c (html_destroyed): (init): (write_html): Add destroy chaining. svn path=/trunk/; revision=22199 --- calendar/gui/e-itip-control.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'calendar/gui') diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c index 91a355f269..e743209979 100644 --- a/calendar/gui/e-itip-control.c +++ b/calendar/gui/e-itip-control.c @@ -58,7 +58,6 @@ struct _EItipControlPrivate { GtkWidget *html; - gboolean html_destroyed; GPtrArray *event_clients; CalClient *event_client; @@ -328,7 +327,7 @@ html_destroyed (gpointer data) priv = itip->priv; - priv->html_destroyed = TRUE; + priv->html = NULL; } static void @@ -360,7 +359,6 @@ init (EItipControl *itip) /* Html Widget */ priv->html = gtk_html_new (); - priv->html_destroyed = FALSE; gtk_html_set_default_content_type (GTK_HTML (priv->html), "text/html; charset=utf-8"); gtk_html_load_from_string (GTK_HTML (priv->html), " ", 1); @@ -433,10 +431,12 @@ destroy (GtkObject *obj) { EItipControl *itip = E_ITIP_CONTROL (obj); EItipControlPrivate *priv; - + priv = itip->priv; - + priv->destroyed = TRUE; + + (* GTK_OBJECT_CLASS (parent_class)->destroy) (obj); } static void @@ -943,7 +943,7 @@ write_html (EItipControl *itip, const gchar *itip_desc, const gchar *itip_title, priv = itip->priv; - if (priv->html_destroyed) + if (priv->html == NULL) return; /* Html widget */ -- cgit