Applied patch #6428

[pspp-builds.git] / src / ui / gui / split-file-dialog.c

diff --git a/src/ui/gui/split-file-dialog.c b/src/ui/gui/split-file-dialog.c
index 3431b35e80568563548fb58f7c20e1d13c108ee0..374e6af23ea27f27697ea41fe0c8154954d4ec97 100644 (file)
--- a/src/ui/gui/split-file-dialog.c
+++ b/src/ui/gui/split-file-dialog.c
@@ -71,7 +71,7 @@ generate_syntax (const struct split_file_dialog *sfd)
       GtkWidget *sort = get_widget_assert (sfd->xml, "split-radiobutton3");
       GtkWidget *layered = get_widget_assert (sfd->xml, "split-radiobutton1");
       gint n_vars = append_variable_names (varlist,
-                                          sfd->dict, GTK_TREE_VIEW (vars));
+                                          sfd->dict, GTK_TREE_VIEW (vars), 0);
 
       if ( n_vars > 0 )
        {
@@ -178,8 +178,6 @@ split_file_dialog (GObject *o, gpointer data)
   GtkWidget *selector ;
   GtkWidget *on_off   ;
 
-  GtkSheet *var_sheet ;
-
   sfd.xml = XML_NEW ("psppire.glade");
 
   dialog = get_widget_assert   (sfd.xml, "split-file-dialog");
@@ -188,9 +186,7 @@ split_file_dialog (GObject *o, gpointer data)
   selector = get_widget_assert (sfd.xml, "split-file-selector");
   on_off = get_widget_assert   (sfd.xml, "split-radiobutton0");
 
-  var_sheet = GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
-
-  vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
+  g_object_get (de->data_editor, "var-store", &vs, NULL);
 
   sfd.dict = vs->dict;
   sfd.tv = GTK_TREE_VIEW (dest);
@@ -211,10 +207,13 @@ split_file_dialog (GObject *o, gpointer data)
                                 source,
                                 dest,
                                 insert_source_row_into_tree_view,
+                                NULL,
                                 NULL);
 
   g_signal_connect (dialog, "refresh", G_CALLBACK (refresh),  &sfd);
 
+  gtk_window_set_transient_for (GTK_WINDOW (dialog), de->parent.window);
+
   response = psppire_dialog_run (PSPPIRE_DIALOG (dialog));