PsppireDialogAction (generate_syntax): Change signature.

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

diff --git a/src/ui/gui/psppire-dialog-action-kmeans.c b/src/ui/gui/psppire-dialog-action-kmeans.c
index bcd59889f51bae06bfaffcadb2769823a5ce5c06..0d5424012bbaf6046a2855ed362776d40ef9e65a 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-kmeans.c
+++ b/src/ui/gui/psppire-dialog-action-kmeans.c
@@ -31,7 +31,7 @@ static void psppire_dialog_action_kmeans_class_init      (PsppireDialogActionKme
 G_DEFINE_TYPE (PsppireDialogActionKmeans, psppire_dialog_action_kmeans, PSPPIRE_TYPE_DIALOG_ACTION);
 
 static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (const PsppireDialogAction *act)
 {
   PsppireDialogActionKmeans *km = PSPPIRE_DIALOG_ACTION_KMEANS (act);
   gchar *text;
@@ -82,11 +82,18 @@ refresh (PsppireDialogAction *fd_)
 }
 
 static void
-psppire_dialog_action_kmeans_activate (GtkAction *a)
+psppire_dialog_action_kmeans_activate (PsppireDialogAction *a)
 {
   PsppireDialogActionKmeans *act = PSPPIRE_DIALOG_ACTION_KMEANS (a);
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
-  GtkBuilder *xml = builder_new ("k-means.ui");
+
+  GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
+  GtkBuilder *xml = g_hash_table_lookup (thing, a);
+  if (!xml)
+    {
+      xml = builder_new ("k-means.ui");
+      g_hash_table_insert (thing, a, xml);
+    }
 
   pda->dialog = get_widget_assert   (xml, "k-means-dialog");
   pda->source = get_widget_assert   (xml, "dict-view");
@@ -95,11 +102,8 @@ psppire_dialog_action_kmeans_activate (GtkAction *a)
   act->variables = get_widget_assert (xml, "psppire-var-view1");
 
   psppire_dialog_action_set_refresh (pda, refresh);
-
   psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
 
-  g_object_unref (xml);
-
   if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_kmeans_parent_class)->activate)
     PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_kmeans_parent_class)->activate (pda);
 }
@@ -107,9 +111,7 @@ psppire_dialog_action_kmeans_activate (GtkAction *a)
 static void
 psppire_dialog_action_kmeans_class_init (PsppireDialogActionKmeansClass *class)
 {
-  GtkActionClass *action_class = GTK_ACTION_CLASS (class);
-
-  action_class->activate = psppire_dialog_action_kmeans_activate;
+  psppire_dialog_action_set_activation (class, psppire_dialog_action_kmeans_activate);
   PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
 }