X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-histogram.c;h=bd0c8ea1f9612ebf807b34c47f82032a4bc4b3a3;hb=9a4fd397b9ef95cbeb033cd7d92a3bebfe8709fc;hp=5a57c2aece6fc46798794968305c8ada474136a8;hpb=612b51515e356bc4dd625a3fb18d0a4f827a1e2c;p=pspp

diff --git a/src/ui/gui/psppire-dialog-action-histogram.c b/src/ui/gui/psppire-dialog-action-histogram.c
index 5a57c2aece..bd0c8ea1f9 100644
--- a/src/ui/gui/psppire-dialog-action-histogram.c
+++ b/src/ui/gui/psppire-dialog-action-histogram.c
@@ -14,7 +14,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
-
 #include <config.h>
 
 #include "psppire-dialog-action-histogram.h"
@@ -60,33 +59,36 @@ refresh (PsppireDialogAction *rd_)
 }
 
 static void
-psppire_dialog_action_histogram_activate (GtkAction *a)
+psppire_dialog_action_histogram_activate (PsppireDialogAction *a)
 {
   PsppireDialogActionHistogram *act = PSPPIRE_DIALOG_ACTION_HISTOGRAM (a);
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
 
-  GtkBuilder *xml = builder_new ("histogram.ui");
+  GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
+  GtkBuilder *xml = g_hash_table_lookup (thing, a);
+  if (!xml)
+    {
+      xml = builder_new ("histogram.ui");
+      g_hash_table_insert (thing, a, xml);
+    }
+
   pda->dialog = get_widget_assert (xml, "histogram-dialog");
   pda->source = get_widget_assert (xml, "dict-view");
 
   act->variable = get_widget_assert (xml, "entry1");
   act->curve = get_widget_assert (xml, "curve");
 
-  g_object_unref (xml);
-
   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_histogram_parent_class)->activate)
-    PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_histogram_parent_class)->activate (pda);
 }
 
 
 
 static char *
-generate_syntax (PsppireDialogAction *a)
+generate_syntax (const PsppireDialogAction *a)
 {
   PsppireDialogActionHistogram *rd = PSPPIRE_DIALOG_ACTION_HISTOGRAM (a);
   gchar *text;
@@ -113,9 +115,7 @@ generate_syntax (PsppireDialogAction *a)
 static void
 psppire_dialog_action_histogram_class_init (PsppireDialogActionHistogramClass *class)
 {
-  GtkActionClass *action_class = GTK_ACTION_CLASS (class);
-
-  action_class->activate = psppire_dialog_action_histogram_activate;
+  psppire_dialog_action_set_activation (class, psppire_dialog_action_histogram_activate);
 
   PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
 }