X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-k-related.c;h=87c34c1665f2fe3d659964384f2b36ad4a542a57;hb=7e7f78374d9df2b7fa16306b5d78e6bfc9ef40df;hp=387dbd30487dba35e85e99274bd6545572c6a83a;hpb=2a71889bf86463fb752bcbab248da47b25b4fd9a;p=pspp

diff --git a/src/ui/gui/psppire-dialog-action-k-related.c b/src/ui/gui/psppire-dialog-action-k-related.c
index 387dbd3048..87c34c1665 100644
--- a/src/ui/gui/psppire-dialog-action-k-related.c
+++ b/src/ui/gui/psppire-dialog-action-k-related.c
@@ -30,7 +30,7 @@ static void psppire_dialog_action_k_related_class_init      (PsppireDialogAction
 G_DEFINE_TYPE (PsppireDialogActionKRelated, psppire_dialog_action_k_related, PSPPIRE_TYPE_DIALOG_ACTION);
 
 static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (const PsppireDialogAction *act)
 {
   PsppireDialogActionKRelated *krd = PSPPIRE_DIALOG_ACTION_K_RELATED (act);
   gchar *text;
@@ -78,11 +78,11 @@ dialog_state_valid (gpointer data)
     return FALSE;
 
   /* At least one checkbutton must be active */
-  if ( 
+  if (
       ! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->friedman))
-      && 
+      &&
       ! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->kendal))
-      && 
+      &&
       ! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->cochran))
        )
     return FALSE;
@@ -105,12 +105,19 @@ refresh (PsppireDialogAction *rd_)
 }
 
 static void
-psppire_dialog_action_k_related_activate (GtkAction *a)
+psppire_dialog_action_k_related_activate (PsppireDialogAction *a)
 {
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
   PsppireDialogActionKRelated *act = PSPPIRE_DIALOG_ACTION_K_RELATED (a);
 
-  GtkBuilder *xml = builder_new ("k-related.ui");
+  GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
+  GtkBuilder *xml = g_hash_table_lookup (thing, a);
+  if (!xml)
+    {
+      xml = builder_new ("k-related.ui");
+      g_hash_table_insert (thing, a, xml);
+    }
+
   pda->dialog = get_widget_assert   (xml, "k-related-dialog");
   pda->source = get_widget_assert   (xml, "dict-view");
 
@@ -126,10 +133,6 @@ psppire_dialog_action_k_related_activate (GtkAction *a)
 		"predicate", var_is_numeric,
 		NULL);
 
-  g_object_unref (xml);
-
-  if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_k_related_parent_class)->activate)
-    PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_k_related_parent_class)->activate (pda);
 }
 
 static void