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

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

diff --git a/src/ui/gui/psppire-dialog-action-flip.c b/src/ui/gui/psppire-dialog-action-flip.c
index 03fc9d9ce1029652bd3dfda5ed9bd5543e50306d..99947f773f0d95ea0b3a0e33499a7339cbe23045 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-flip.c
+++ b/src/ui/gui/psppire-dialog-action-flip.c
@@ -34,7 +34,7 @@ G_DEFINE_TYPE (PsppireDialogActionFlip, psppire_dialog_action_flip, PSPPIRE_TYPE
      FLIP /VARIABLES=var_list /NEWNAMES=var_name.
 */
 static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (const PsppireDialogAction *act)
 {
   const gchar *text;
   PsppireDialogActionFlip *rd = PSPPIRE_DIALOG_ACTION_FLIP (act);
@@ -89,20 +89,14 @@ refresh (PsppireDialogAction *rd_)
   gtk_entry_set_text (GTK_ENTRY (rd->entry), "");
 }
 
-static void
-psppire_dialog_action_flip_activate (GtkAction *a)
+static GtkBuilder *
+psppire_dialog_action_flip_activate (PsppireDialogAction *a, GVariant *param)
 {
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
   PsppireDialogActionFlip *act = PSPPIRE_DIALOG_ACTION_FLIP (a);
 
-  GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
-  GtkBuilder *xml = g_hash_table_lookup (thing, a);
-  if (!xml)
-    {
-      xml = builder_new ("transpose.ui");
-      g_hash_table_insert (thing, a, xml);
-    }
-
+  GtkBuilder *xml = builder_new ( "transpose.ui");
+  
   pda->dialog = get_widget_assert   (xml, "transpose-dialog");
   pda->source = get_widget_assert   (xml, "source-treeview");
 
@@ -112,14 +106,13 @@ psppire_dialog_action_flip_activate (GtkAction *a)
   psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
   psppire_dialog_action_set_refresh (pda, refresh);
 
-  if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_flip_parent_class)->activate)
-    PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_flip_parent_class)->activate (pda);
+  return xml;
 }
 
 static void
 psppire_dialog_action_flip_class_init (PsppireDialogActionFlipClass *class)
 {
-  psppire_dialog_action_set_activation (class, psppire_dialog_action_flip_activate);
+  PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_flip_activate;
   PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
 }