aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog5
-rw-r--r--calendar/gui/dialogs/cal-attachment-bar.c13
2 files changed, 10 insertions, 8 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 818895517c..71f726ef74 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-17 Harish Krishnaswamy <kharish@novell.com>
+
+ * gui/dialogs/cal-attachment-bar.c (destroy):
+ fixed a kludge.
+
2005-01-12 JP Rosevear <jpr@novell.com>
Fixes #65820
diff --git a/calendar/gui/dialogs/cal-attachment-bar.c b/calendar/gui/dialogs/cal-attachment-bar.c
index 2dea375a87..daca395904 100644
--- a/calendar/gui/dialogs/cal-attachment-bar.c
+++ b/calendar/gui/dialogs/cal-attachment-bar.c
@@ -534,17 +534,14 @@ destroy (GtkObject *object)
if (bar->priv) {
free_attachment_list (bar);
+ if (bar->priv->local_attachment_store)
+ g_free (bar->priv->local_attachment_store);
+ if (bar->priv->comp_uid)
+ g_free (bar->priv->comp_uid);
g_free (bar->priv);
bar->priv = NULL;
}
-
- /* TODO leaking this here to prevent a crash */
- /*
- if (bar->priv->local_attachment_store)
- g_free (bar->priv->local_attachment_store);
- if (bar->priv->comp_uid)
- g_free (bar->priv->comp_uid);
- */
+
if (GTK_OBJECT_CLASS (parent_class)->destroy != NULL)
(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
}