FACTOR: Fix a crash when bad input was presented

[pspp] / src / ui / gui / psppire-dialog-action-chisquare.c

diff --git a/src/ui/gui/psppire-dialog-action-chisquare.c b/src/ui/gui/psppire-dialog-action-chisquare.c
index 5ee3e879913ec8e1debd3b15578e9369eabc008d..a8dc856b77c2f0c3a0418ecd3b248ff5768513d1 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-chisquare.c
+++ b/src/ui/gui/psppire-dialog-action-chisquare.c
@@ -37,7 +37,7 @@ G_DEFINE_TYPE (PsppireDialogActionChisquare, psppire_dialog_action_chisquare, PS
 
 
 static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (const PsppireDialogAction *act)
 {
   PsppireDialogActionChisquare *scd = PSPPIRE_DIALOG_ACTION_CHISQUARE (act);
 
@@ -51,8 +51,8 @@ generate_syntax (PsppireDialogAction *act)
   if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (scd->range_button)))
     {
       ds_put_cstr (&dss, "(");
-      
-      ds_put_cstr (&dss, 
+
+      ds_put_cstr (&dss,
                       gtk_entry_get_text (GTK_ENTRY (scd->value_lower)));
 
       ds_put_cstr (&dss, ", ");
@@ -72,7 +72,7 @@ generate_syntax (PsppireDialogAction *act)
       ds_put_cstr (&dss, "\n\t");
       ds_put_cstr (&dss, "/EXPECTED = ");
 
-      
+
       for (ok = gtk_tree_model_get_iter_first (GTK_TREE_MODEL(ls),
                                               &iter);
           ok;
@@ -129,12 +129,18 @@ refresh (PsppireDialogAction *rd_)
 }
 
 static void
-psppire_dialog_action_chisquare_activate (GtkAction *a)
+psppire_dialog_action_chisquare_activate (PsppireDialogAction *a)
 {
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
   PsppireDialogActionChisquare *act = PSPPIRE_DIALOG_ACTION_CHISQUARE (a);
 
-  GtkBuilder *xml = builder_new ("chi-square.ui");
+  GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
+  GtkBuilder *xml = g_hash_table_lookup (thing, a);
+  if (!xml)
+    {
+      xml = builder_new ("chi-square.ui");
+      g_hash_table_insert (thing, a, xml);
+    }
 
   GtkWidget *range_table = get_widget_assert   (xml, "range-table");
   GtkWidget *values_acr = get_widget_assert   (xml, "psppire-acr1");
@@ -159,19 +165,17 @@ psppire_dialog_action_chisquare_activate (GtkAction *a)
   psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
   psppire_dialog_action_set_refresh (pda, refresh);
 
-  g_object_unref (xml);
-
-  g_signal_connect (act->range_button, "toggled", 
-                   G_CALLBACK (set_sensitivity_from_toggle), 
+  g_signal_connect (act->range_button, "toggled",
+                   G_CALLBACK (set_sensitivity_from_toggle),
                    range_table);
 
 
-  g_signal_connect (act->values_button, "toggled", 
-                   G_CALLBACK (set_sensitivity_from_toggle), 
+  g_signal_connect (act->values_button, "toggled",
+                   G_CALLBACK (set_sensitivity_from_toggle),
                    values_acr);
 
-  g_signal_connect (act->values_button, "toggled", 
-                   G_CALLBACK (set_sensitivity_from_toggle), 
+  g_signal_connect (act->values_button, "toggled",
+                   G_CALLBACK (set_sensitivity_from_toggle),
                    expected_value_entry);
 
   psppire_acr_set_entry (PSPPIRE_ACR (values_acr),
@@ -180,16 +184,12 @@ psppire_dialog_action_chisquare_activate (GtkAction *a)
   psppire_acr_set_model(PSPPIRE_ACR (values_acr), act->expected_list);
 
 
-  if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_chisquare_parent_class)->activate)
-    PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_chisquare_parent_class)->activate (pda);
 }
 
 static void
 psppire_dialog_action_chisquare_class_init (PsppireDialogActionChisquareClass *class)
 {
-  GtkActionClass *action_class = GTK_ACTION_CLASS (class);
-
-  action_class->activate = psppire_dialog_action_chisquare_activate;
+  psppire_dialog_action_set_activation (class,  psppire_dialog_action_chisquare_activate);
   PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
 }