GRAPH scatterplot - fixed missing BY variable rendering

[pspp] / src / ui / gui / autorecode-dialog.c

diff --git a/src/ui/gui/autorecode-dialog.c b/src/ui/gui/autorecode-dialog.c
index f303e18d0f3ab4edb949ffe614d1f721ed4f21ba..7b027d9badae5380e8505a007e188ede868318bd 100644 (file)
--- a/src/ui/gui/autorecode-dialog.c
+++ b/src/ui/gui/autorecode-dialog.c
@@ -91,7 +91,7 @@ on_change_clicked (GObject *obj, gpointer data)
   struct autorecode *rd = data;
   struct variable *var = NULL;
   struct nlp *nlp;
-  GtkTreeModel *model = GTK_TREE_MODEL (PSPPIRE_VAR_VIEW (rd->var_view)->list);
+  GtkTreeModel *model = psppire_var_view_get_current_model (PSPPIRE_VAR_VIEW (rd->var_view));
   GtkTreeIter iter;
   GtkTreeSelection *selection =
     gtk_tree_view_get_selection (GTK_TREE_VIEW (rd->var_view));
@@ -184,7 +184,6 @@ on_entry_change (struct autorecode *rd)
              valid = FALSE;
              break;
            }
-
        }
     }
 
@@ -200,7 +199,8 @@ static void
 on_selection_change (GtkTreeSelection *selection, gpointer data)
 {
   struct autorecode *rd = data;
-  GtkTreeModel *model = GTK_TREE_MODEL (PSPPIRE_VAR_VIEW (rd->var_view)->list);
+  GtkTreeModel *model = psppire_var_view_get_current_model (PSPPIRE_VAR_VIEW (rd->var_view));
+
   GList *rows = gtk_tree_selection_get_selected_rows (selection, &model);
 
   if ( rows && !rows->next)
@@ -216,6 +216,7 @@ on_selection_change (GtkTreeSelection *selection, gpointer data)
 
 
       ok = gtk_tree_model_get_iter (model, &iter, (GtkTreePath*) rows->data);
+      g_return_if_fail (ok);
 
       gtk_tree_model_get (model, &iter, 0, &var, -1);
 
@@ -271,7 +272,6 @@ autorecode_dialog (PsppireDataWindow *de)
   gint response;
 
   GtkBuilder *xml = builder_new ("autorecode.ui");
-  PsppireVarStore *vs;
 
   GtkWidget *dialog = get_widget_assert   (xml, "autorecode-dialog");
   GtkWidget *source = get_widget_assert   (xml, "dict-view");
@@ -324,11 +324,10 @@ autorecode_dialog (PsppireDataWindow *de)
 
     }
 
-  g_object_get (de->data_editor, "var-store", &vs, NULL);
 
   gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
 
-  g_object_get (vs, "dictionary", &rd.dict, NULL);
+  g_object_get (de->data_editor, "dictionary", &rd.dict, NULL);
   g_object_set (source, "model", rd.dict, NULL);