PsppireDialogAction (generate_syntax): Change signature.

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

diff --git a/src/ui/gui/psppire-dialog-action-correlation.c b/src/ui/gui/psppire-dialog-action-correlation.c
index 456ce15d324476d62c49986b9a64eb95824c23bd..6f2702f115d149f37d98a0ec1aa3ca0eb0af46c0 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-correlation.c
+++ b/src/ui/gui/psppire-dialog-action-correlation.c
@@ -30,7 +30,7 @@ static void psppire_dialog_action_correlation_class_init      (PsppireDialogActi
 G_DEFINE_TYPE (PsppireDialogActionCorrelation, psppire_dialog_action_correlation, PSPPIRE_TYPE_DIALOG_ACTION);
 
 static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (const PsppireDialogAction *act)
 {
   PsppireDialogActionCorrelation *rd = PSPPIRE_DIALOG_ACTION_CORRELATION (act);
   gchar *text;
@@ -92,14 +92,21 @@ refresh (PsppireDialogAction *rd_)
 }
 
 static void
-psppire_dialog_action_correlation_activate (GtkAction *a)
+psppire_dialog_action_correlation_activate (PsppireDialogAction *a)
 {
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
   PsppireDialogActionCorrelation *act = PSPPIRE_DIALOG_ACTION_CORRELATION (a);
 
-  GtkBuilder *xml = builder_new ("correlation.ui");
-  pda->dialog = get_widget_assert   (xml, "correlation-dialog");
-  pda->source = get_widget_assert   (xml, "dict-view");
+  GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
+  GtkBuilder *xml = g_hash_table_lookup (thing, a);
+  if (!xml)
+    {
+      xml = builder_new ("correlation.ui");
+      g_hash_table_insert (thing, a, xml);
+    }
+
+  pda->dialog = get_widget_assert (xml, "correlation-dialog");
+  pda->source = get_widget_assert (xml, "dict-view");
 
   act->variables = get_widget_assert (xml, "psppire-var-view1");
   act->significant = get_widget_assert (xml, "button-flag-significants");
@@ -108,8 +115,6 @@ psppire_dialog_action_correlation_activate (GtkAction *a)
   psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
   psppire_dialog_action_set_refresh (pda, refresh);
 
-  g_object_unref (xml);
-
   if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_correlation_parent_class)->activate)
     PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_correlation_parent_class)->activate (pda);
 }
@@ -117,9 +122,8 @@ psppire_dialog_action_correlation_activate (GtkAction *a)
 static void
 psppire_dialog_action_correlation_class_init (PsppireDialogActionCorrelationClass *class)
 {
-  GtkActionClass *action_class = GTK_ACTION_CLASS (class);
+  psppire_dialog_action_set_activation (class, psppire_dialog_action_correlation_activate);
 
-  action_class->activate = psppire_dialog_action_correlation_activate;
   PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
 }