Add "dictionary" property to PsppireVarStore and use it.

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

diff --git a/src/ui/gui/descriptives-dialog.c b/src/ui/gui/descriptives-dialog.c
index a867fe016d05131f0ff759e3536118c5ae60c855..a1e65ea7d7971a9fbb4643dac59ccfabad308628 100644 (file)
--- a/src/ui/gui/descriptives-dialog.c
+++ b/src/ui/gui/descriptives-dialog.c
@@ -218,16 +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));
 
-  g_object_set (source, "dictionary", vs->dict,
-       "predicate", var_is_numeric, NULL);
 
-  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,
@@ -242,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 =