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 6780bc7b5d420d250547b755355545471635ed76..fb060f0a4061c940277670a18481247f222d5c59 100644 (file)
--- a/src/ui/gui/autorecode-dialog.c
+++ b/src/ui/gui/autorecode-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2011  Free Software Foundation
+   Copyright (C) 2011, 2012  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -27,6 +27,7 @@
 #include "psppire-var-view.h"
 
 #include "executor.h"
+#include "builder-wrapper.h"
 #include "helper.h"
 
 #include <gtk/gtk.h>
@@ -215,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);
 
@@ -270,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");
@@ -323,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);