X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-k-related.c;h=8c088f81ebbcb451789b99606c19d0ec24727f18;hb=2a3d7330188ac2faf40093dbaa09a901558217d8;hp=1c4d0c094dd64c9d9e61fba9e9af6ed3f4f3e724;hpb=ed208cf009043f0bf319a4e919c279d5b1401f36;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 1c4d0c094d..8c088f81eb 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;
@@ -104,19 +104,13 @@ refresh (PsppireDialogAction *rd_)
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (krd->cochran), FALSE);
 }
 
-static void
-psppire_dialog_action_k_related_activate (GtkAction *a)
+static GtkBuilder *
+psppire_dialog_action_k_related_activate (PsppireDialogAction *a, GVariant *param)
 {
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
   PsppireDialogActionKRelated *act = PSPPIRE_DIALOG_ACTION_K_RELATED (a);
 
-  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);
-    }
+  GtkBuilder *xml = builder_new ( "k-related.ui");
 
   pda->dialog = get_widget_assert   (xml, "k-related-dialog");
   pda->source = get_widget_assert   (xml, "dict-view");
@@ -133,14 +127,13 @@ psppire_dialog_action_k_related_activate (GtkAction *a)
 		"predicate", var_is_numeric,
 		NULL);
 
-  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);
+  return xml;
 }
 
 static void
 psppire_dialog_action_k_related_class_init (PsppireDialogActionKRelatedClass *class)
 {
-  psppire_dialog_action_set_activation (class, psppire_dialog_action_k_related_activate);
+  PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_k_related_activate;
   PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
 }