7 files changed, 22 insertions, 1 deletions
diff --git a/calendar/gui/dialogs/alarm-page.c b/calendar/gui/dialogs/alarm-page.c
index 2008881ff3..d0639bde16 100644
--- a/calendar/gui/dialogs/alarm-page.c
+++ b/calendar/gui/dialogs/alarm-page.c
@@ -233,6 +233,9 @@ alarm_page_finalize (GObject *object)
 	apage = ALARM_PAGE (object);
 	priv = apage->priv;
 
+	if (priv->main)
+		gtk_widget_unref (priv->main);
+
 	if (priv->xml) {
 		g_object_unref (priv->xml);
 		priv->xml = NULL;
@@ -407,6 +410,7 @@ alarm_page_fill_widgets (CompEditorPage *page, CalComponent *comp)
 			gtk_widget_set_sensitive (l->data, TRUE);
 	}
 	
+	sensitize_buttons (apage);
 
 	priv->updating = FALSE;
 }
@@ -752,7 +756,6 @@ init_widgets (AlarmPage *apage)
 	gtk_tree_view_column_add_attribute (column, cell_renderer, "text", E_ALARM_LIST_COLUMN_DESCRIPTION);
 	gtk_tree_view_append_column (GTK_TREE_VIEW (priv->list), column);
 
-	sensitize_buttons (apage);
 #if 0
 	/* If we want the alarm setup widgets to reflect the currently selected alarm, we
 	 * need to do something like this */
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 8375214a7d..ca28275ce9 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -180,6 +180,9 @@ event_page_finalize (GObject *object)
 	epage = EVENT_PAGE (object);
 	priv = epage->priv;
 
+	if (priv->main)
+		gtk_widget_unref (priv->main);
+
 	if (priv->xml) {
 		g_object_unref((priv->xml));
 		priv->xml = NULL;
diff --git a/calendar/gui/dialogs/meeting-page.c b/calendar/gui/dialogs/meeting-page.c
index c4f1ec84cb..4443e124f7 100644
--- a/calendar/gui/dialogs/meeting-page.c
+++ b/calendar/gui/dialogs/meeting-page.c
@@ -270,6 +270,9 @@ meeting_page_finalize (GObject *object)
 	
 	g_object_unref((priv->model));
 	
+	if (priv->main)
+		gtk_widget_unref (priv->main);
+
 	if (priv->xml) {
 		g_object_unref((priv->xml));
 		priv->xml = NULL;
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index aa77ee3990..b2041338d7 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -303,6 +303,9 @@ recurrence_page_finalize (GObject *object)
 	rpage = RECURRENCE_PAGE (object);
 	priv = rpage->priv;
 
+	if (priv->main)
+		gtk_widget_unref (priv->main);
+
 	if (priv->xml) {
 		g_object_unref((priv->xml));
 		priv->xml = NULL;
diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c
index 97029704a2..d7063e9a4f 100644
--- a/calendar/gui/dialogs/schedule-page.c
+++ b/calendar/gui/dialogs/schedule-page.c
@@ -156,6 +156,9 @@ schedule_page_finalize (GObject *object)
 	spage = SCHEDULE_PAGE (object);
 	priv = spage->priv;
 
+	if (priv->main)
+		gtk_widget_unref (priv->main);
+
 	if (priv->xml) {
 		g_object_unref((priv->xml));
 		priv->xml = NULL;
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
index 629443dba2..9e6a870f4c 100644
--- a/calendar/gui/dialogs/task-details-page.c
+++ b/calendar/gui/dialogs/task-details-page.c
@@ -169,6 +169,9 @@ task_details_page_finalize (GObject *object)
 	tdpage = TASK_DETAILS_PAGE (object);
 	priv = tdpage->priv;
 
+	if (priv->main)
+		gtk_widget_unref (priv->main);
+
 	if (priv->xml) {
 		g_object_unref((priv->xml));
 		priv->xml = NULL;
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index 2f1df79464..7f25514364 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -191,6 +191,9 @@ task_page_finalize (GObject *object)
 		CORBA_exception_free (&ev);
 	}
 
+	if (priv->main)
+		gtk_widget_unref (priv->main);
+
 	if (priv->xml) {
 		g_object_unref((priv->xml));
 		priv->xml = NULL;