Merge "master" into "psppsheet" to obtain bug fixes from "master".

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

diff --git a/src/ui/gui/paired-dialog.c b/src/ui/gui/paired-dialog.c
index 39a8ae91f196eb588c580d00c27917d69c9c41ad..3cf2aa31d3b71e91c8305b460c585e0a1a6c8286 100644 (file)
--- a/src/ui/gui/paired-dialog.c
+++ b/src/ui/gui/paired-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,7 +27,6 @@
 #include "psppire-var-view.h"
 
 #include "psppire-dict.h"
-#include "psppire-var-store.h"
 
 #include "dialog-common.h"
 #include "psppire-dialog.h"
@@ -35,7 +34,7 @@
 #include "psppire-var-ptr.h"
 
 
-#include "helper.h"
+#include "builder-wrapper.h"
 
 
 
@@ -147,8 +146,6 @@ two_sample_dialog_create (PsppireDataWindow *de)
   GtkWidget *selector ;
   struct paired_samples_dialog *tt_d = g_malloc (sizeof *tt_d);
 
-  PsppireVarStore *vs = NULL;
-
   tt_d->xml = builder_new ("paired-samples.ui");
 
   dict_view = get_widget_assert (tt_d->xml, "paired-samples-t-test-treeview1");
@@ -157,9 +154,7 @@ two_sample_dialog_create (PsppireDataWindow *de)
 
   tt_d->dialog = get_widget_assert (tt_d->xml, "t-test-paired-samples-dialog");
 
-  g_object_get (de->data_editor, "var-store", &vs, NULL);
-
-  g_object_get (vs, "dictionary", &tt_d->dict, NULL);
+  g_object_get (de->data_editor, "dictionary", &tt_d->dict, NULL);
   tt_d->pairs_treeview =
    get_widget_assert (tt_d->xml, "paired-samples-t-test-treeview2");