aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog10
-rw-r--r--calendar/gui/dialogs/event-editor.c6
-rw-r--r--calendar/gui/dialogs/task-editor.c6
-rw-r--r--calendar/gui/e-meeting-time-sel.c3
4 files changed, 23 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 73e5b0b0fe..2af18d21f4 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,13 @@
+2003-04-29 JP Rosevear <jpr@ximian.com>
+
+ * gui/dialogs/task-editor.c (task_editor_finalize): ditto
+
+ * gui/dialogs/event-editor.c (event_editor_finalize): don't unref
+ the model here
+
+ * gui/e-meeting-time-sel.c (e_meeting_time_selector_destroy): null
+ up the display_top and display_main for re-entrancy purposes
+
2003-04-25 JP Rosevear <jpr@ximian.com>
* gui/itip-utils.c (itip_send_comp): kill warnings
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 9004d96e89..73bb0e7d7b 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -395,7 +395,11 @@ event_editor_finalize (GObject *object)
g_object_unref((priv->meet_page));
g_object_unref((priv->sched_page));
- g_object_unref((priv->model));
+#if 0
+ /* FIXME we don't unref here because we "sink" in
+ e-meeting-model.c:init */
+ g_object_unref (priv->model);
+#endif
g_free (priv);
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 472f12dde0..d6f54bb288 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -349,7 +349,11 @@ task_editor_finalize (GObject *object)
g_object_unref((priv->task_details_page));
g_object_unref((priv->meet_page));
- g_object_unref((priv->model));
+#if 0
+ /* FIXME we don't unref here because we "sink" in
+ e-meeting-model.c:init */
+ g_object_unref (priv->model);
+#endif
if (G_OBJECT_CLASS (parent_class)->finalize)
(* G_OBJECT_CLASS (parent_class)->finalize) (object);
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index bf113c0b23..b1d7ff0bbc 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -852,6 +852,9 @@ e_meeting_time_selector_destroy (GtkObject *object)
mts->model = NULL;
}
+ mts->display_top = NULL;
+ mts->display_main = NULL;
+
if (GTK_OBJECT_CLASS (parent_class)->destroy)
(*GTK_OBJECT_CLASS (parent_class)->destroy)(object);
}