X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fregression-dialog.c;h=b52f0f7cd8e2dbc79334d767953ac395c24842d6;hb=b94025a12799b6826a772731b8f58907dca2cf5c;hp=a860501805b391af6a5fbd35f684dfa55fc5aa10;hpb=c3e2ab6b50eb3b3c7e0852f2a4e2122f695714ff;p=pspp-builds.git

diff --git a/src/ui/gui/regression-dialog.c b/src/ui/gui/regression-dialog.c
index a8605018..b52f0f7c 100644
--- a/src/ui/gui/regression-dialog.c
+++ b/src/ui/gui/regression-dialog.c
@@ -18,6 +18,7 @@
 
 #include "checkbox-treeview.h"
 #include "regression-dialog.h"
+#include "executor.h"
 
 #include <gtk/gtk.h>
 #include <stdlib.h>
@@ -29,7 +30,7 @@
 #include <ui/gui/helper.h>
 #include <ui/gui/psppire-dialog.h>
 #include <ui/gui/psppire-var-store.h>
-#include <ui/gui/helper.h>
+
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -214,7 +215,7 @@ dialog_state_valid (gpointer data)
 
   GtkTreeIter notused;
 
-  return (gtk_tree_model_get_iter_first (dep_vars, &notused) 
+  return (gtk_tree_model_get_iter_first (dep_vars, &notused)
     && gtk_tree_model_get_iter_first (indep_vars, &notused));
 }
 
@@ -252,28 +253,24 @@ regression_dialog (GObject *o, gpointer data)
 
   gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
 
-  g_object_set (source, "model", vs->dict, NULL);
+  g_object_get (vs, "dictionary", &rd.dict, NULL);
+  g_object_set (source, "model", rd.dict, NULL);
 
-  set_dest_model (GTK_TREE_VIEW (dest_dep), vs->dict);
-  set_dest_model (GTK_TREE_VIEW (dest_indep), vs->dict);
+  set_dest_model (GTK_TREE_VIEW (dest_dep), rd.dict);
+  set_dest_model (GTK_TREE_VIEW (dest_indep), rd.dict);
 
-  psppire_selector_set_subjects (PSPPIRE_SELECTOR (dep_selector),
-				 source,
-				 dest_dep,
+  psppire_selector_set_select_func (PSPPIRE_SELECTOR (dep_selector),
 				 insert_source_row_into_tree_view,
-				 NULL,
 				 NULL);
 
-  psppire_selector_set_subjects (PSPPIRE_SELECTOR (indep_selector),
-				 source,
-				 dest_indep,
+  psppire_selector_set_select_func (PSPPIRE_SELECTOR (indep_selector),
 				 insert_source_row_into_tree_view,
-				 NULL,
 				 NULL);
 
   rd.dep_vars = GTK_TREE_VIEW (dest_dep);
   rd.indep_vars = GTK_TREE_VIEW (dest_indep);
-  rd.dict = vs->dict;
+
+
   rd.save_dialog = get_widget_assert (xml, "save-dialog");
   rd.pred_button = GTK_TOGGLE_BUTTON (get_widget_assert (xml, "pred-button"));
   rd.resid_button = GTK_TOGGLE_BUTTON (get_widget_assert (xml, "resid-button"));