Merge 'master' into 'psppsheet'.

[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..fb060f0a4061c940277670a18481247f222d5c59 100644 (file)
--- a/src/ui/gui/autorecode-dialog.c
+++ b/src/ui/gui/autorecode-dialog.c
@@ -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);