Merge "master" into "psppsheet" to obtain bug fixes from "master".

[pspp] / src / ui / gui / psppire-data-editor.c

diff --git a/src/ui/gui/psppire-data-editor.c b/src/ui/gui/psppire-data-editor.c
index f33a6425992093e5f5febaf04bf47c8b52d0d754..26c375640580d527a0e435291f5a1b345c9b45f5 100644 (file)
--- a/src/ui/gui/psppire-data-editor.c
+++ b/src/ui/gui/psppire-data-editor.c
@@ -819,7 +819,10 @@ psppire_data_editor_split_window (PsppireDataEditor *de, gboolean split)
     g_object_unref (de->old_vbox_widget);
   de->old_vbox_widget = de->datasheet_vbox_widget;
   g_object_ref (de->old_vbox_widget);
-  gtk_container_remove (de->vbox, de->datasheet_vbox_widget);
+  /* FIXME:  old_vbox_widget needs to be unreffed in dispose.
+       (currently it seems to provoke an error if I do that.  
+       I don't know why. */
+  gtk_container_remove (GTK_CONTAINER (de->vbox), de->datasheet_vbox_widget);
 
   if (split)
     de->datasheet_vbox_widget = make_split_datasheet (de, grid_lines);