Replace more uses of 'cnt' by 'n'.

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

diff --git a/src/ui/gui/psppire-dialog-action-means.c b/src/ui/gui/psppire-dialog-action-means.c
index f7210e42ee9571a7cf4488885a5cd6b9917dbf3c..c9b7eb8f65f41fb1e83e24a387d4b126996c6f69 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-means.c
+++ b/src/ui/gui/psppire-dialog-action-means.c
@@ -36,7 +36,7 @@ G_DEFINE_TYPE (PsppireDialogActionMeans, psppire_dialog_action_means, PSPPIRE_TY
 
 
 static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (const PsppireDialogAction *act)
 {
   gint l;
   PsppireDialogActionMeans *scd = PSPPIRE_DIALOG_ACTION_MEANS (act);
@@ -91,25 +91,19 @@ dialog_refresh (PsppireDialogAction *da)
   psppire_means_layer_clear (PSPPIRE_MEANS_LAYER (pdm->layer));
 }
 
-static void
-psppire_dialog_action_means_activate (PsppireDialogAction *a)
+static GtkBuilder *
+psppire_dialog_action_means_activate (PsppireDialogAction *a, GVariant *param)
 {
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
   PsppireDialogActionMeans *act = PSPPIRE_DIALOG_ACTION_MEANS (a);
 
-  GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
-  GtkBuilder *xml = g_hash_table_lookup (thing, a);
-  if (!xml)
-    {
-      xml = builder_new ("means.ui");
-      g_hash_table_insert (thing, a, xml);
+  GtkBuilder *xml = builder_new ("means.ui");
+
+  GtkWidget *vb =   get_widget_assert (xml, "frame2");
+  act->layer = psppire_means_layer_new ();
+  gtk_container_add (GTK_CONTAINER (vb), act->layer);
+  gtk_widget_show (act->layer);
 
-      GtkWidget *vb =   get_widget_assert (xml, "frame2");
-      act->layer = psppire_means_layer_new ();
-      gtk_container_add (GTK_CONTAINER (vb), act->layer);
-      gtk_widget_show (act->layer);
-    }
-  
   GtkWidget *selector = get_widget_assert (xml, "layer-selector");
 
   pda->dialog = get_widget_assert (xml, "means-dialog");
@@ -126,14 +120,13 @@ psppire_dialog_action_means_activate (PsppireDialogAction *a)
 
   psppire_dialog_action_set_valid_predicate (pda, (void *) dialog_state_valid);
   psppire_dialog_action_set_refresh (pda, dialog_refresh);
-
-  PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_means_parent_class)->activate (pda);
+  return xml;
 }
 
 static void
 psppire_dialog_action_means_class_init (PsppireDialogActionMeansClass *class)
 {
-  psppire_dialog_action_set_activation (class, psppire_dialog_action_means_activate);
+  PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_means_activate;
 
   PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
 }