8 files changed, 19 insertions, 7 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index c275f16948..03af629675 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,15 @@
+2003-03-03  Hans Petter Jansson  <hpj@ximian.com>
+
+	* gui/dialogs/alarm-page.c
+	* gui/dialogs/event-page.c
+	* gui/dialogs/meeting-page.c
+	* gui/dialogs/recurrence-page.c
+	* gui/dialogs/schedule-page.c
+	* gui/dialogs/task-details-page.c
+	* gui/dialogs/task-page.c (get_widgets): gtk_widget_unparent() ->
+	gtk_container_remove(). The former caused crashes in the
+	addressbook's name-selector.
+
 2003-03-01  Hans Petter Jansson  <hpj@ximian.com>
 
 	* Makefile.am: Do importers after the other dirs, as it relies on
diff --git a/calendar/gui/dialogs/alarm-page.c b/calendar/gui/dialogs/alarm-page.c
index c817508eba..7c861c6add 100644
--- a/calendar/gui/dialogs/alarm-page.c
+++ b/calendar/gui/dialogs/alarm-page.c
@@ -664,7 +664,7 @@ get_widgets (AlarmPage *apage)
 	}
 
 	gtk_widget_ref (priv->main);
-	gtk_widget_unparent (priv->main);
+	gtk_container_remove (GTK_CONTAINER (priv->main->parent), priv->main);
 
 	priv->summary = GW ("summary");
 	priv->date_time = GW ("date-time");
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 20a2b7b1c3..e9bc511ece 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -770,7 +770,7 @@ get_widgets (EventPage *epage)
 	}
 
 	gtk_widget_ref (priv->main);
-	gtk_widget_unparent (priv->main);
+	gtk_container_remove (GTK_CONTAINER (priv->main->parent), priv->main);
 
 	priv->summary = GW ("general-summary");
 	priv->location = GW ("location");
diff --git a/calendar/gui/dialogs/meeting-page.c b/calendar/gui/dialogs/meeting-page.c
index bb42eb2d03..7203792224 100644
--- a/calendar/gui/dialogs/meeting-page.c
+++ b/calendar/gui/dialogs/meeting-page.c
@@ -454,7 +454,7 @@ get_widgets (MeetingPage *mpage)
 	}
 
 	gtk_widget_ref (priv->main);
-	gtk_widget_unparent (priv->main);
+	gtk_container_remove (GTK_CONTAINER (priv->main->parent), priv->main);
 
 	/* For making the user the organizer */
 	priv->organizer_table = GW ("organizer-table");
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index 5608ffadff..6370326af9 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -1970,7 +1970,7 @@ get_widgets (RecurrencePage *rpage)
 	}
 
 	gtk_widget_ref (priv->main);
-	gtk_widget_unparent (priv->main);
+	gtk_container_remove (GTK_CONTAINER (priv->main->parent), priv->main);
 
 	priv->summary = GW ("summary");
 	priv->date_time = GW ("date-time");
diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c
index f57681f38b..b062088bc8 100644
--- a/calendar/gui/dialogs/schedule-page.c
+++ b/calendar/gui/dialogs/schedule-page.c
@@ -364,7 +364,7 @@ get_widgets (SchedulePage *spage)
 	}
 
 	gtk_widget_ref (priv->main);
-	gtk_widget_unparent (priv->main);
+	gtk_container_remove (GTK_CONTAINER (priv->main->parent), priv->main);
 
 #undef GW
 
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
index 208dcb4270..9dfea0dd05 100644
--- a/calendar/gui/dialogs/task-details-page.c
+++ b/calendar/gui/dialogs/task-details-page.c
@@ -460,7 +460,7 @@ get_widgets (TaskDetailsPage *tdpage)
 	}
 
 	gtk_widget_ref (priv->main);
-	gtk_widget_unparent (priv->main);
+	gtk_container_remove (GTK_CONTAINER (priv->main->parent), priv->main);
 
 	priv->status = GW ("status");
 	priv->priority = GW ("priority");
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index 64eb70861e..2f1df79464 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -649,7 +649,7 @@ get_widgets (TaskPage *tpage)
 	}
 
 	gtk_widget_ref (priv->main);
-	gtk_widget_unparent (priv->main);
+	gtk_container_remove (GTK_CONTAINER (priv->main->parent), priv->main);
 
 	priv->summary = GW ("summary");