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 731995ca55791176646abe347716ade33817d188..374e6af23ea27f27697ea41fe0c8154954d4ec97 100644 (file)
--- a/src/ui/gui/split-file-dialog.c
+++ b/src/ui/gui/split-file-dialog.c
@@ -1,21 +1,18 @@
-/*
-    PSPPIRE --- A Graphical User Interface for PSPP
-    Copyright (C) 2007  Free Software Foundation
+/* PSPPIRE - a graphical user interface for PSPP.
+   Copyright (C) 2007  Free Software Foundation
 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA. */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 
@@ -27,6 +24,7 @@
 #include "dict-display.h"
 #include <language/syntax-string-source.h>
 #include "syntax-editor.h"
+#include <data/dictionary.h>
 
 #include <gtk/gtk.h>
 #include <glade/glade.h>
@@ -73,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 )
        {
@@ -147,7 +145,7 @@ refresh (PsppireDialog *dialog, struct split_file_dialog *d)
     {
       GtkTreeIter iter;
       gint i;
-      struct variable *const *vars = dict_get_split_vars (d->dict->dict);
+      const struct variable *const *vars = dict_get_split_vars (d->dict->dict);
 
       for (i = 0 ; i < n_vars; ++i )
        {
@@ -172,6 +170,7 @@ split_file_dialog (GObject *o, gpointer data)
   gint response;
   struct data_editor *de = data;
   struct split_file_dialog sfd;
+  PsppireVarStore *vs ;
 
   GtkWidget *dialog   ;
   GtkWidget *source   ;
@@ -179,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");
@@ -189,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"));
-
-  PsppireVarStore *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);
@@ -212,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));