aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/e-meeting-time-sel.c15
2 files changed, 17 insertions, 5 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 3cee6b137e..19767e969b 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2003-04-04 JP Rosevear <jpr@ximian.com>
+
+ Fixes #40722
+
+ * gui/e-meeting-time-sel.c (e_meeting_time_selector_destroy):
+ guard against multiple destroy calls
+
2003-04-02 Jeffrey Stedfast <fejj@ximian.com>
* gui/control-factory.c (set_prop): Add a check to see if the view
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index c3e6d3a051..7e21598115 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -842,12 +842,17 @@ e_meeting_time_selector_destroy (GtkObject *object)
mts = E_MEETING_TIME_SELECTOR (object);
e_meeting_time_selector_remove_timeout (mts);
-
- gdk_bitmap_unref (mts->stipple);
-
- if (mts->model)
+
+ if (mts->stipple) {
+ gdk_bitmap_unref (mts->stipple);
+ mts->stipple = NULL;
+ }
+
+ if (mts->model) {
g_object_unref (mts->model);
-
+ mts->model = NULL;
+ }
+
if (GTK_OBJECT_CLASS (parent_class)->destroy)
(*GTK_OBJECT_CLASS (parent_class)->destroy)(object);
}