X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-reliability.c;h=11d1eeefc1372a610578e7346ce5187f2a467cfe;hb=d9d46e3c7ef1a275f57bf9f8ad3e47231d6fb58c;hp=465aea8de0726fb6d97b4fd329ffba83da55bd06;hpb=17d24f693f92db39158e0204d7125c5c0b9b5009;p=pspp

diff --git a/src/ui/gui/psppire-dialog-action-reliability.c b/src/ui/gui/psppire-dialog-action-reliability.c
index 465aea8de0..11d1eeefc1 100644
--- 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,17 +165,13 @@ 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);
 }
 
 static void
 psppire_dialog_action_reliability_class_init (PsppireDialogActionReliabilityClass *class)
 {
-  GtkActionClass *action_class = GTK_ACTION_CLASS (class);
   PsppireDialogActionClass *pdac = PSPPIRE_DIALOG_ACTION_CLASS (class);
-
-  action_class->activate = psppire_dialog_action_reliability_activate;
+  psppire_dialog_action_set_activation (class, psppire_dialog_action_reliability_activate);
 
   pdac->generate_syntax = generate_syntax;
 }