Remove deprecated objects GtkAction and GtkUIManager

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

diff --git a/src/ui/gui/psppire-dialog-action-reliability.c b/src/ui/gui/psppire-dialog-action-reliability.c
index e53ce23cf102c6ecb9dc7422cf375a5d1c138383..11d1eeefc1372a610578e7346ce5187f2a467cfe 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-reliability.c
+++ b/src/ui/gui/psppire-dialog-action-reliability.c
@@ -36,7 +36,7 @@ enum
   };
 
 static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (const PsppireDialogAction *act)
 {
   PsppireDialogActionReliability *rd = PSPPIRE_DIALOG_ACTION_RELIABILITY (act);
   gchar *text;
@@ -120,12 +120,20 @@ refresh (PsppireDialogAction *pda_)
 }
 
 static void
-psppire_dialog_action_reliability_activate (GtkAction *a)
+psppire_dialog_action_reliability_activate (PsppireDialogAction *a)
 {
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
   PsppireDialogActionReliability *act = PSPPIRE_DIALOG_ACTION_RELIABILITY (a);
   GtkTreeModel *liststore ;
-  GtkBuilder *xml = builder_new ("reliability.ui");
+
+  GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
+  GtkBuilder *xml = g_hash_table_lookup (thing, a);
+  if (!xml)
+    {
+      xml = builder_new ("reliability.ui");
+      g_hash_table_insert (thing, a, xml);
+    }
+
   pda->dialog = get_widget_assert   (xml, "reliability-dialog");
   pda->source = get_widget_assert   (xml, "dict-view");
 
@@ -157,10 +165,6 @@ psppire_dialog_action_reliability_activate (GtkAction *a)
   psppire_dialog_action_set_refresh (pda, refresh);
   psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
 
-  if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_reliability_parent_class)->activate)
-    PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_reliability_parent_class)->activate (pda);
-
-  g_object_unref (xml);
 }
 
 static void