X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-kmeans.c;h=b25ecd475ab1a258271777c0b92a09312e173b80;hb=9a4fd397b9ef95cbeb033cd7d92a3bebfe8709fc;hp=3656a5d9b97fbf3d9190c0068be911ad5bfd45b2;hpb=8fc40a26bebdae2b3e8870c42d2baa77680c3d36;p=pspp

diff --git a/src/ui/gui/psppire-dialog-action-kmeans.c b/src/ui/gui/psppire-dialog-action-kmeans.c
index 3656a5d9b9..b25ecd475a 100644
--- 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;
@@ -71,8 +71,9 @@ dialog_state_valid (gpointer user_data)
 }
 
 static void
-refresh (PsppireDialogActionKmeans *fd)
+refresh (PsppireDialogAction *fd_)
 {
+  PsppireDialogActionKmeans *fd = PSPPIRE_DIALOG_ACTION_KMEANS (fd_);
   GtkTreeModel *liststore =
     gtk_tree_view_get_model (GTK_TREE_VIEW (fd->variables));
   gtk_list_store_clear (GTK_LIST_STORE (liststore));
@@ -81,11 +82,18 @@ refresh (PsppireDialogActionKmeans *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");
@@ -94,21 +102,14 @@ 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);
 }
 
 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;
 }