X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-descriptives.c;h=5d2f4b7c5cd75537bba902f5ba2949fe4c8d726c;hb=37cd3133c06caf3fce7e449a939098f62bd41a55;hp=2d6cca337d4219d88691b5a0a85af3e8cdf83294;hpb=258e45aa9b44b6a127e4f23c655f4740c04e05df;p=pspp

diff --git a/src/ui/gui/psppire-dialog-action-descriptives.c b/src/ui/gui/psppire-dialog-action-descriptives.c
index 2d6cca337d..5d2f4b7c5c 100644
--- a/src/ui/gui/psppire-dialog-action-descriptives.c
+++ b/src/ui/gui/psppire-dialog-action-descriptives.c
@@ -74,7 +74,7 @@ static const struct checkbox_entry_item stats[] =
 
 
 static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (const PsppireDialogAction *act)
 {
   PsppireDialogActionDescriptives *scd = PSPPIRE_DIALOG_ACTION_DESCRIPTIVES (act);
   gchar *text;
@@ -193,26 +193,20 @@ dialog_refresh (PsppireDialogAction *scd_)
 }
 
 
-static void
-psppire_dialog_action_descriptives_activate (GtkAction *a)
+static GtkBuilder *
+psppire_dialog_action_descriptives_activate (PsppireDialogAction *a, GVariant *param)
 {
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
   PsppireDialogActionDescriptives *act = PSPPIRE_DIALOG_ACTION_DESCRIPTIVES (a);
 
-  GHashTable *thing = psppire_dialog_action_get_pointer (pda);
-  GtkBuilder *xml = g_hash_table_lookup (thing, a);
-  if (!xml)
-    {
-      xml = builder_new ("descriptives.ui");
-      g_hash_table_insert (thing, a, xml);
-
-      GtkWidget *stats_treeview = get_widget_assert (xml, "statistics");
-      psppire_checkbox_treeview_populate (PSPPIRE_CHECKBOX_TREEVIEW (stats_treeview),
-					  B_DS_DEFAULT,
-					  N_DESCRIPTIVE_STATS, stats);
-      act->stats = gtk_tree_view_get_model (GTK_TREE_VIEW (stats_treeview));
-    }
+  GtkBuilder *xml = builder_new ( "descriptives.ui");
 
+  GtkWidget *stats_treeview = get_widget_assert (xml, "statistics");
+  psppire_checkbox_treeview_populate (PSPPIRE_CHECKBOX_TREEVIEW (stats_treeview),
+				      B_DS_DEFAULT,
+				      N_DESCRIPTIVE_STATS, stats);
+  act->stats = gtk_tree_view_get_model (GTK_TREE_VIEW (stats_treeview));
+  
   pda->dialog = get_widget_assert   (xml, "descriptives-dialog");
   pda->source = get_widget_assert   (xml, "all-variables");
   act->variables =   get_widget_assert   (xml, "stat-variables");
@@ -221,7 +215,7 @@ psppire_dialog_action_descriptives_activate (GtkAction *a)
 		"predicate", var_is_numeric, NULL);
 
   act->stat_vars = GTK_TREE_VIEW (act->variables);
-  
+
   act->include_user_missing =
     GTK_TOGGLE_BUTTON (get_widget_assert (xml, "include_user_missing"));
   act->exclude_missing_listwise =
@@ -232,13 +226,13 @@ psppire_dialog_action_descriptives_activate (GtkAction *a)
   psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
   psppire_dialog_action_set_refresh (pda, dialog_refresh);
 
-  PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_descriptives_parent_class)->activate (pda);
+  return xml;
 }
 
 static void
 psppire_dialog_action_descriptives_class_init (PsppireDialogActionDescriptivesClass *class)
 {
-  psppire_dialog_action_set_activation (class, psppire_dialog_action_descriptives_activate);
+  PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_descriptives_activate;
 
   PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
 }