PsppireDialogAction (generate_syntax): Change signature.

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

diff --git a/src/ui/gui/psppire-dialog-action-binomial.c b/src/ui/gui/psppire-dialog-action-binomial.c
index 8c91ca3e059ea587f2a80c2c3d5c4968b1106dd2..a88fe0ffd50518b243b35032b29c9c96581ecf70 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-binomial.c
+++ b/src/ui/gui/psppire-dialog-action-binomial.c
@@ -97,12 +97,18 @@ refresh (PsppireDialogAction *da)
 
 
 static void
-psppire_dialog_action_binomial_activate (GtkAction *a)
+psppire_dialog_action_binomial_activate (PsppireDialogAction *a)
 {
   PsppireDialogActionBinomial *act = PSPPIRE_DIALOG_ACTION_BINOMIAL (a);
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
 
-  GtkBuilder *xml = builder_new ("binomial.ui");
+  GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
+  GtkBuilder *xml = g_hash_table_lookup (thing, a);
+  if (!xml)
+    {
+      xml = builder_new ("binomial.ui");
+      g_hash_table_insert (thing, a, xml);
+    }
 
   pda->dialog = get_widget_assert   (xml, "binomial-dialog");
   pda->source = get_widget_assert   (xml, "dict-view");
@@ -114,9 +120,6 @@ psppire_dialog_action_binomial_activate (GtkAction *a)
   act->cutpoint_entry =     get_widget_assert   (xml, "cutpoint-entry");
   act->cutpoint_button =    get_widget_assert   (xml, "radiobutton4");
 
-  g_object_unref (xml);
-
-
   g_signal_connect (act->cutpoint_button, "toggled", G_CALLBACK (set_sensitivity_from_toggle),
                    act->cutpoint_entry);
 
@@ -132,7 +135,7 @@ psppire_dialog_action_binomial_activate (GtkAction *a)
 
 
 static char *
-generate_syntax (PsppireDialogAction *a)
+generate_syntax (const PsppireDialogAction *a)
 {
   PsppireDialogActionBinomial *scd = PSPPIRE_DIALOG_ACTION_BINOMIAL (a);
   gchar *text = NULL;
@@ -167,9 +170,7 @@ generate_syntax (PsppireDialogAction *a)
 static void
 psppire_dialog_action_binomial_class_init (PsppireDialogActionBinomialClass *class)
 {
-  GtkActionClass *action_class = GTK_ACTION_CLASS (class);
-
-  action_class->activate = psppire_dialog_action_binomial_activate;
+  psppire_dialog_action_set_activation (class, psppire_dialog_action_binomial_activate);
 
   PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
 }