Merge 'master' into 'psppsheet'.

[pspp] / src / ui / gui / oneway-anova-dialog.c

diff --git a/src/ui/gui/oneway-anova-dialog.c b/src/ui/gui/oneway-anova-dialog.c
index 9919a59897efef6557960e122ef1e9ddeb7ac81a..7992b94c71c91c7637c2252fc51b1620c42e74de 100644 (file)
--- a/src/ui/gui/oneway-anova-dialog.c
+++ b/src/ui/gui/oneway-anova-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007, 2010  Free Software Foundation
+   Copyright (C) 2007, 2010, 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
@@ -19,9 +19,8 @@
 #include <gtk/gtk.h>
 #include "oneway-anova-dialog.h"
 #include "psppire-dict.h"
-#include "psppire-var-store.h"
 #include "psppire-var-view.h"
-#include "helper.h"
+#include "builder-wrapper.h"
 #include "psppire-data-window.h"
 #include "psppire-dialog.h"
 #include "dialog-common.h"
@@ -30,7 +29,7 @@
 #include "dict-display.h"
 
 #include "executor.h"
-
+#include "helper.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -126,8 +125,6 @@ oneway_anova_dialog (PsppireDataWindow *de)
 {
   gint response;
 
-  PsppireVarStore *vs = NULL;
-
   struct oneway_anova_dialog ow;
 
   GtkBuilder *builder = builder_new ("oneway.ui");
@@ -156,9 +153,7 @@ oneway_anova_dialog (PsppireDataWindow *de)
   ow.homogeneity =
     GTK_TOGGLE_BUTTON (get_widget_assert (builder, "checkbutton2"));
 
-  g_object_get (de->data_editor, "var-store", &vs, NULL);
-
-  g_object_get (vs, "dictionary", &ow.dict, NULL);
+  g_object_get (de->data_editor, "dictionary", &ow.dict, NULL);
 
   ow.dialog =
     GTK_WINDOW (get_widget_assert (builder, "oneway-anova-dialog"));
@@ -210,7 +205,7 @@ oneway_anova_dialog (PsppireDataWindow *de)
   switch (response)
     {
     case GTK_RESPONSE_OK:
-      g_free (execute_syntax_string (generate_syntax (&ow)));
+      g_free (execute_syntax_string (de, generate_syntax (&ow)));
       break;
     case PSPPIRE_RESPONSE_PASTE:
       g_free (paste_syntax_to_window (generate_syntax (&ow)));