Merge commit 'origin/stable'

[pspp-builds.git] / src / ui / gui / t-test-independent-samples-dialog.c

diff --git a/src/ui/gui/t-test-independent-samples-dialog.c b/src/ui/gui/t-test-independent-samples-dialog.c
index 392867adbb606acd5c62abad6ce6a58286807f13..f5df9f36e3004533789b74a78ae16670f57baab5 100644 (file)
--- a/src/ui/gui/t-test-independent-samples-dialog.c
+++ b/src/ui/gui/t-test-independent-samples-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007  Free Software Foundation
+   Copyright (C) 2007, 2009  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
@@ -21,7 +21,7 @@
 #include "t-test-independent-samples-dialog.h"
 #include "psppire-dict.h"
 #include "psppire-var-store.h"
-#include "helper.h"
+#include "executor.h"
 #include "psppire-data-window.h"
 #include "psppire-dialog.h"
 #include "dialog-common.h"
@@ -117,8 +117,8 @@ tt_groups_dialog_create (GtkBuilder *xml, GtkWindow *parent)
 
   gtk_window_set_transient_for (GTK_WINDOW (grps->dialog), parent);
 
-  grps->val[0] = strdup ("");
-  grps->val[1] = strdup ("");
+  grps->val[0] = xstrdup ("");
+  grps->val[1] = xstrdup ("");
 
   return grps;
 }
@@ -340,10 +340,10 @@ run_define_groups (struct tt_indep_samples_dialog *ttd)
          grps->group_defn = GROUPS_VALUES;
 
          grps->val[0] =
-           strdup (gtk_entry_get_text (GTK_ENTRY (grps->grp_entry[0])));
+           xstrdup (gtk_entry_get_text (GTK_ENTRY (grps->grp_entry[0])));
 
          grps->val[1] =
-           strdup (gtk_entry_get_text (GTK_ENTRY (grps->grp_entry[1])));
+           xstrdup (gtk_entry_get_text (GTK_ENTRY (grps->grp_entry[1])));
        }
       else
        {
@@ -352,7 +352,7 @@ run_define_groups (struct tt_indep_samples_dialog *ttd)
          grps->val[1] = NULL;
 
          grps->val[0] =
-           strdup (gtk_entry_get_text (GTK_ENTRY (grps->cut_point_entry)));
+           xstrdup (gtk_entry_get_text (GTK_ENTRY (grps->cut_point_entry)));
        }
 
       psppire_dialog_notify_change (PSPPIRE_DIALOG (ttd->dialog));
@@ -426,9 +426,9 @@ t_test_independent_samples_dialog (GObject *o, gpointer data)
 
   gtk_window_set_transient_for (GTK_WINDOW (tt_d.dialog), GTK_WINDOW (de));
 
-  attach_dictionary_to_treeview (GTK_TREE_VIEW (dict_view),
+  g_object_set (dict_view, "dictionary", 
                                 vs->dict,
-                                GTK_SELECTION_MULTIPLE, NULL);
+                                NULL);
 
   set_dest_model (GTK_TREE_VIEW (test_variables_treeview), vs->dict);