aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Petter Jansson <hpj@ximian.com>2003-08-13 06:13:53 +0800
committerHans Petter <hansp@src.gnome.org>2003-08-13 06:13:53 +0800
commitb415ae2313ba1f238365fbd261c0e10bbb117c56 (patch)
tree3242cd1ba79eacdf6b01a94bcc699c38d9576763
parent1da80ba154357a63159a78be2ea203c86f3d3fd1 (diff)
downloadgsoc2013-evolution-b415ae2313ba1f238365fbd261c0e10bbb117c56.tar
gsoc2013-evolution-b415ae2313ba1f238365fbd261c0e10bbb117c56.tar.gz
gsoc2013-evolution-b415ae2313ba1f238365fbd261c0e10bbb117c56.tar.bz2
gsoc2013-evolution-b415ae2313ba1f238365fbd261c0e10bbb117c56.tar.lz
gsoc2013-evolution-b415ae2313ba1f238365fbd261c0e10bbb117c56.tar.xz
gsoc2013-evolution-b415ae2313ba1f238365fbd261c0e10bbb117c56.tar.zst
gsoc2013-evolution-b415ae2313ba1f238365fbd261c0e10bbb117c56.zip
Add destroy chaining.
2003-08-12 Hans Petter Jansson <hpj@ximian.com> * gui/e-itip-control.c (html_destroyed): (init): (write_html): Add destroy chaining. svn path=/trunk/; revision=22199
-rw-r--r--calendar/ChangeLog8
-rw-r--r--calendar/gui/e-itip-control.c12
2 files changed, 13 insertions, 7 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index a1556e285a..5d24583a83 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,4 +1,10 @@
-2003-08-12 Andrew Wu <Yang.Wu@sun.com>
+2003-08-12 Hans Petter Jansson <hpj@ximian.com>
+
+ * gui/e-itip-control.c (html_destroyed):
+ (init):
+ (write_html): Add destroy chaining.
+
+2003-08-12 Andrew Wu <Yang.Wu@sun.com>
* gui/e-week-view.c
(e_week_view_on_key_up):
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 */