aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2001-01-27 11:40:54 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2001-01-27 11:40:54 +0800
commit9143022e877a1b9b3527ed3b977ed131aa486d4f (patch)
tree7306ccd987672efe5dca4c00fd78bf7f12ec0d87
parent50cedfaadd7cc87d8c74fdff330c45f637c89e0b (diff)
downloadgsoc2013-evolution-9143022e877a1b9b3527ed3b977ed131aa486d4f.tar
gsoc2013-evolution-9143022e877a1b9b3527ed3b977ed131aa486d4f.tar.gz
gsoc2013-evolution-9143022e877a1b9b3527ed3b977ed131aa486d4f.tar.bz2
gsoc2013-evolution-9143022e877a1b9b3527ed3b977ed131aa486d4f.tar.lz
gsoc2013-evolution-9143022e877a1b9b3527ed3b977ed131aa486d4f.tar.xz
gsoc2013-evolution-9143022e877a1b9b3527ed3b977ed131aa486d4f.tar.zst
gsoc2013-evolution-9143022e877a1b9b3527ed3b977ed131aa486d4f.zip
Fixed a crash that could happen when destroying a control without any
ical component in it. svn path=/trunk/; revision=7846
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/gui/e-itip-control.c5
2 files changed, 9 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 03aa1930d9..fd7ca2f6a1 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-26 Ettore Perazzoli <ettore@ximian.com>
+
+ * gui/e-itip-control.c (itip_control_destroy_cb): Don't attempt to
+ call `icalcomponent_remove_component()' on a NULL component or a
+ NULL subcomponent.
+
2001-01-25 Damon Chaplin <damon@ximian.com>
* gui/tag-calendar.c: don't tag the calendar if no dates are shown.
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index b72637137f..0fb6c4eef1 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -114,9 +114,10 @@ itip_control_destroy_cb (GtkObject *object,
gtk_object_unref (GTK_OBJECT (priv->xml));
gtk_object_unref (GTK_OBJECT (priv->xml2));
- icalcomponent_remove_component (priv->main_comp, priv->comp);
-
if (priv->main_comp != NULL) {
+ if (priv->comp != NULL)
+ icalcomponent_remove_component (priv->main_comp, priv->comp);
+
icalcomponent_free (priv->main_comp);
}