aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/gui/e-meeting-time-sel-item.c12
2 files changed, 15 insertions, 3 deletions
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 <jpr@ximian.com>
+ * gui/e-meeting-time-sel-item.c
+ (e_meeting_time_selector_item_destroy): guard against multiple
+ destroy calls
+
+2003-04-11 JP Rosevear <jpr@ximian.com>
+
* 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);
}