X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-correlation.c;h=18cba1c09a0162786b632d88b3955a48a45c14ba;hb=refs%2Fheads%2Fctables7;hp=81b694a7aa147489fa7b0eec989f810f2d94d80e;hpb=0bda70f475aad77db5636ae0bca170513353c988;p=pspp

diff --git a/src/ui/gui/psppire-dialog-action-correlation.c b/src/ui/gui/psppire-dialog-action-correlation.c
index 81b694a7aa..18cba1c09a 100644
--- 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;
@@ -91,19 +91,13 @@ refresh (PsppireDialogAction *rd_)
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rd->two_tailed), TRUE);
 }
 
-static void
-psppire_dialog_action_correlation_activate (PsppireDialogAction *a)
+static GtkBuilder *
+psppire_dialog_action_correlation_activate (PsppireDialogAction *a, GVariant *param)
 {
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
   PsppireDialogActionCorrelation *act = PSPPIRE_DIALOG_ACTION_CORRELATION (a);
 
-  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);
-    }
+  GtkBuilder *xml = builder_new ("correlation.ui");
 
   pda->dialog = get_widget_assert (xml, "correlation-dialog");
   pda->source = get_widget_assert (xml, "dict-view");
@@ -115,14 +109,13 @@ psppire_dialog_action_correlation_activate (PsppireDialogAction *a)
   psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
   psppire_dialog_action_set_refresh (pda, refresh);
 
-  if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_correlation_parent_class)->activate)
-    PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_correlation_parent_class)->activate (pda);
+  return xml;
 }
 
 static void
 psppire_dialog_action_correlation_class_init (PsppireDialogActionCorrelationClass *class)
 {
-  psppire_dialog_action_set_activation (class, psppire_dialog_action_correlation_activate);
+  PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_correlation_activate;
 
   PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
 }