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
/
psppire-dialog-action-tt1s.c
diff --git
a/src/ui/gui/psppire-dialog-action-tt1s.c
b/src/ui/gui/psppire-dialog-action-tt1s.c
index 70dbfabd310c2676d7e7ab17c38a55d08b3e0681..f9d8bfa608b6ba5cdbaf733b59eecde566e35997 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-tt1s.c
+++ b/
src/ui/gui/psppire-dialog-action-tt1s.c
@@
-32,7
+32,7
@@
G_DEFINE_TYPE (PsppireDialogActionTt1s, psppire_dialog_action_tt1s, PSPPIRE_TYPE
static char *
static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (
const
PsppireDialogAction *act)
{
PsppireDialogActionTt1s *d = PSPPIRE_DIALOG_ACTION_TT1S (act);
gchar *text;
{
PsppireDialogActionTt1s *d = PSPPIRE_DIALOG_ACTION_TT1S (act);
gchar *text;
@@
-103,18
+103,25
@@
refresh (PsppireDialogAction *rd_)
}
static void
}
static void
-psppire_dialog_action_tt1s_activate (
Gtk
Action *a)
+psppire_dialog_action_tt1s_activate (
PsppireDialog
Action *a)
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionTt1s *act = PSPPIRE_DIALOG_ACTION_TT1S (a);
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionTt1s *act = PSPPIRE_DIALOG_ACTION_TT1S (a);
- GtkBuilder *xml = builder_new ("t-test.ui");
+ GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
+ GtkBuilder *xml = g_hash_table_lookup (thing, a);
+ if (!xml)
+ {
+ xml = builder_new ("t-test.ui");
+ g_hash_table_insert (thing, a, xml);
+ }
+
GtkWidget *options_button = get_widget_assert (xml, "button1");
pda->dialog = get_widget_assert (xml, "t-test-one-sample-dialog");
pda->source = get_widget_assert (xml, "one-sample-t-test-treeview2");
GtkWidget *options_button = get_widget_assert (xml, "button1");
pda->dialog = get_widget_assert (xml, "t-test-one-sample-dialog");
pda->source = get_widget_assert (xml, "one-sample-t-test-treeview2");
- g_object_set (pda->source,
+ g_object_set (pda->source,
"predicate", var_is_numeric, NULL);
act->vars_treeview = get_widget_assert (xml, "one-sample-t-test-treeview1");
"predicate", var_is_numeric, NULL);
act->vars_treeview = get_widget_assert (xml, "one-sample-t-test-treeview1");
@@
-128,11
+135,6
@@
psppire_dialog_action_tt1s_activate (GtkAction *a)
g_signal_connect_swapped (options_button, "clicked",
G_CALLBACK (tt_options_dialog_run), act->opt);
g_signal_connect_swapped (options_button, "clicked",
G_CALLBACK (tt_options_dialog_run), act->opt);
-
- g_object_unref (xml);
-
- if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_tt1s_parent_class)->activate)
- PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_tt1s_parent_class)->activate (pda);
}
static void
}
static void
@@
-145,11
+147,10
@@
psppire_dialog_action_tt1s_finalize (GObject *a)
static void
psppire_dialog_action_tt1s_class_init (PsppireDialogActionTt1sClass *class)
{
static void
psppire_dialog_action_tt1s_class_init (PsppireDialogActionTt1sClass *class)
{
- GtkActionClass *action_class = GTK_ACTION_CLASS (class);
GObjectClass *object_class = G_OBJECT_CLASS (class);
GObjectClass *object_class = G_OBJECT_CLASS (class);
+ psppire_dialog_action_set_activation (class, psppire_dialog_action_tt1s_activate);
object_class->finalize = psppire_dialog_action_tt1s_finalize;
object_class->finalize = psppire_dialog_action_tt1s_finalize;
- action_class->activate = psppire_dialog_action_tt1s_activate;
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}