X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fdescriptives-dialog.c;h=318646f8ef87a4eff2002a092f7d6a111a6e70f1;hb=86166f73821142c2f82fdace3ac40a0933989dcd;hp=e3a6d505115c25ad4b85b7bc259ca7fb88e450e3;hpb=83477e8021833536509416fc98179546e4cfb6a7;p=pspp-builds.git

diff --git a/src/ui/gui/descriptives-dialog.c b/src/ui/gui/descriptives-dialog.c
index e3a6d505..318646f8 100644
--- a/src/ui/gui/descriptives-dialog.c
+++ b/src/ui/gui/descriptives-dialog.c
@@ -29,7 +29,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)
@@ -206,7 +206,7 @@ descriptives_dialog (GObject *o, gpointer data)
 
   struct descriptives_dialog scd;
 
-  GtkBuilder *xml = builder_new ("descriptives-dialog.ui");
+  GtkBuilder *xml = builder_new ("descriptives.ui");
 
   GtkWidget *dialog = get_widget_assert   (xml, "descriptives-dialog");
 
@@ -218,17 +218,18 @@ descriptives_dialog (GObject *o, gpointer data)
   GtkWidget *stats_treeview = get_widget_assert    (xml, "statistics");
 
   PsppireVarStore *vs = NULL;
+  PsppireDict *dict;
 
   g_object_get (de->data_editor, "var-store", &vs, NULL);
+  g_object_get (vs, "dictionary", &dict, NULL);
 
   gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
 
-  attach_dictionary_to_treeview (GTK_TREE_VIEW (source),
-				 vs->dict,
-				 GTK_SELECTION_MULTIPLE, var_is_numeric);
 
-  set_dest_model (GTK_TREE_VIEW (dest), vs->dict);
+  g_object_set (source, "dictionary", dict,
+	"predicate", var_is_numeric, NULL);
 
+  set_dest_model (GTK_TREE_VIEW (dest), dict);
 
   psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
 				 source,
@@ -243,7 +244,9 @@ descriptives_dialog (GObject *o, gpointer data)
 
   scd.stat_vars = GTK_TREE_VIEW (dest);
   scd.stats = gtk_tree_view_get_model (GTK_TREE_VIEW (stats_treeview));
-  scd.dict = vs->dict;
+  
+  g_object_get (vs, "dictionary", &scd.dict, NULL);
+  
   scd.include_user_missing =
     GTK_TOGGLE_BUTTON (get_widget_assert (xml, "include_user_missing"));
   scd.exclude_missing_listwise =