projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FACTOR: Fix a crash when bad input was presented
[pspp]
/
src
/
ui
/
gui
/
t-test-options.c
diff --git
a/src/ui/gui/t-test-options.c
b/src/ui/gui/t-test-options.c
index 671eba0c32c18b0a19fded5b9a7281c0a519a8fa..1b28eefdb631865cd6a7df23dd7b29275437690d 100644
(file)
--- a/
src/ui/gui/t-test-options.c
+++ b/
src/ui/gui/t-test-options.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007, 2012 Free Software Foundation
+ Copyright (C) 2007, 2012
, 2015
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
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
@@
-63,9
+63,9
@@
tt_options_dialog_create (GtkWindow *parent)
tto->confidence =
psppire_scanf_new (_("Con_fidence Interval: %2d %%"), &tto->conf_percent);
tto->confidence =
psppire_scanf_new (_("Con_fidence Interval: %2d %%"), &tto->conf_percent);
-
- g_object_set (tto->confidence,
- "use-underline", TRUE,
+
+ g_object_set (tto->confidence,
+ "use-underline", TRUE,
"mnemonic-widget", psppire_scanf_get_child (PSPPIRE_SCANF (tto->confidence), 0),
NULL);
"mnemonic-widget", psppire_scanf_get_child (PSPPIRE_SCANF (tto->confidence), 0),
NULL);
@@
-92,6
+92,8
@@
tt_options_dialog_create (GtkWindow *parent)
void
tt_options_dialog_destroy (struct tt_options_dialog *tto)
{
void
tt_options_dialog_destroy (struct tt_options_dialog *tto)
{
+ if (tto == NULL)
+ return;
gtk_container_remove (GTK_CONTAINER (tto->box), tto->confidence);
g_object_unref (tto->xml);
g_free (tto);
gtk_container_remove (GTK_CONTAINER (tto->box), tto->confidence);
g_object_unref (tto->xml);
g_free (tto);
@@
-127,14
+129,20
@@
tt_options_dialog_run (struct tt_options_dialog *tto)
void
tt_options_dialog_append_syntax (const struct tt_options_dialog *tto, GString *str)
{
void
tt_options_dialog_append_syntax (const struct tt_options_dialog *tto, GString *str)
{
- g_string_append (str, "\t/MISSING=");
+ struct string dss;
+ ds_init_empty (&dss);
+
+ ds_put_cstr (&dss, "\t/MISSING=");
- if (
tto->excl == EXCL_ANALYSIS
)
-
g_string_append (str
, "ANALYSIS");
+ if (
tto->excl == EXCL_ANALYSIS
)
+
ds_put_cstr (&dss
, "ANALYSIS");
else
else
- g_string_append (str, "LISTWISE");
+ ds_put_cstr (&dss, "LISTWISE");
+
+ ds_put_c_format (&dss, "\n\t/CRITERIA=CI(%g)",
+ tto->confidence_interval/100.0);
+ g_string_append (str, ds_cstr (&dss));
- g_string_append_printf (str, "\n\t/CRITERIA=CIN(%g)",
- tto->confidence_interval/100.0);
+ ds_destroy (&dss);
}
}