From 1033a80696b1f2ba90d6abde012b5fa8e405ebea Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Fri, 11 Apr 2003 08:55:11 +0000 Subject: guard against multiple destroy calls 2003-04-11 JP Rosevear * gui/e-meeting-time-sel-item.c (e_meeting_time_selector_item_destroy): guard against multiple destroy calls svn path=/trunk/; revision=20813 --- calendar/ChangeLog | 6 ++++++ calendar/gui/e-meeting-time-sel-item.c | 12 +++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) (limited to 'calendar') diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 63a809c3fd..1786fcc55e 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,5 +1,11 @@ 2003-04-11 JP Rosevear + * gui/e-meeting-time-sel-item.c + (e_meeting_time_selector_item_destroy): guard against multiple + destroy calls + +2003-04-11 JP Rosevear + * cal-client/cal-client.c (cal_client_get_free_busy): only print a message if the exception isn't the reasonable NotFound diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c index c41ac87409..e19a148e72 100644 --- a/calendar/gui/e-meeting-time-sel-item.c +++ b/calendar/gui/e-meeting-time-sel-item.c @@ -165,9 +165,15 @@ e_meeting_time_selector_item_destroy (GtkObject *object) mts_item = E_MEETING_TIME_SELECTOR_ITEM (object); - gdk_cursor_destroy (mts_item->normal_cursor); - gdk_cursor_destroy (mts_item->resize_cursor); - + if (mts_item->normal_cursor) { + gdk_cursor_destroy (mts_item->normal_cursor); + mts_item->normal_cursor = NULL; + } + if (mts_item->resize_cursor) { + gdk_cursor_destroy (mts_item->resize_cursor); + mts_item->resize_cursor = NULL; + } + if (GTK_OBJECT_CLASS (parent_class)->destroy) (*GTK_OBJECT_CLASS (parent_class)->destroy)(object); } -- cgit v1.2.3