Use a more reliable way of setting the initial state of PsppireDialogAction objects.

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

diff --git a/src/ui/gui/psppire-dialog-action-histogram.c b/src/ui/gui/psppire-dialog-action-histogram.c
index bd0c8ea1f9612ebf807b34c47f82032a4bc4b3a3..3949886c92fe076b3396695be8bc74b5a3d248df 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-histogram.c
+++ b/src/ui/gui/psppire-dialog-action-histogram.c
@@ -58,19 +58,13 @@ refresh (PsppireDialogAction *rd_)
   gtk_entry_set_text (GTK_ENTRY (rd->variable), "");
 }
 
-static void
-psppire_dialog_action_histogram_activate (PsppireDialogAction *a)
+static GtkBuilder *
+psppire_dialog_action_histogram_activate (PsppireDialogAction *a, GVariant *param)
 {
   PsppireDialogActionHistogram *act = PSPPIRE_DIALOG_ACTION_HISTOGRAM (a);
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
 
-  GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
-  GtkBuilder *xml = g_hash_table_lookup (thing, a);
-  if (!xml)
-    {
-      xml = builder_new ("histogram.ui");
-      g_hash_table_insert (thing, a, xml);
-    }
+  GtkBuilder *xml = builder_new ( "histogram.ui");
 
   pda->dialog = get_widget_assert (xml, "histogram-dialog");
   pda->source = get_widget_assert (xml, "dict-view");
@@ -83,6 +77,7 @@ psppire_dialog_action_histogram_activate (PsppireDialogAction *a)
   psppire_dialog_action_set_valid_predicate (pda,
                                        dialog_state_valid);
 
+  return xml;
 }
 
 
@@ -115,7 +110,7 @@ generate_syntax (const PsppireDialogAction *a)
 static void
 psppire_dialog_action_histogram_class_init (PsppireDialogActionHistogramClass *class)
 {
-  psppire_dialog_action_set_activation (class, psppire_dialog_action_histogram_activate);
+  PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_histogram_activate;
 
   PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
 }