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

diff --git a/src/ui/gui/rank-dialog.c b/src/ui/gui/rank-dialog.c
index 2c4d19a0..157f2136 100644
--- a/src/ui/gui/rank-dialog.c
+++ b/src/ui/gui/rank-dialog.c
@@ -28,7 +28,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 "executor.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -238,7 +238,7 @@ rank_dialog (GObject *o, gpointer data)
 
   g_object_get (de->data_editor, "var-store", &vs, NULL);
 
-  rd.dict = vs->dict;
+  g_object_get (vs, "dictionary", &rd.dict, NULL);
   rd.rank_vars =   get_widget_assert (builder, "variables-treeview");
   rd.group_vars =  get_widget_assert (builder, "group-vars-treeview");
   rd.dialog = get_widget_assert   (builder, "rank-dialog");
@@ -306,24 +306,18 @@ rank_dialog (GObject *o, gpointer data)
 
   gtk_window_set_transient_for (GTK_WINDOW (rd.dialog), GTK_WINDOW (de));
 
-  g_object_set (vars, "dictionary", vs->dict, NULL);
+  g_object_set (vars, "model", rd.dict, NULL);
 
-  set_dest_model (GTK_TREE_VIEW (rd.rank_vars), vs->dict);
+  set_dest_model (GTK_TREE_VIEW (rd.rank_vars), rd.dict);
 
-  psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector1),
-				 vars,
-				 rd.rank_vars,
+  psppire_selector_set_select_func (PSPPIRE_SELECTOR (selector1),
 				 insert_source_row_into_tree_view,
-				 NULL,
 				 NULL);
 
-  set_dest_model (GTK_TREE_VIEW (rd.group_vars), vs->dict);
+  set_dest_model (GTK_TREE_VIEW (rd.group_vars), rd.dict);
 
-  psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector2),
-				 vars,
-				 rd.group_vars,
+  psppire_selector_set_select_func (PSPPIRE_SELECTOR (selector2),
 				 insert_source_row_into_tree_view,
-				 NULL,
 				 NULL);