X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-histogram.c;h=3949886c92fe076b3396695be8bc74b5a3d248df;hb=0f447caa885d8f0fd8c30d4440556d9b6abb99ea;hp=bd0c8ea1f9612ebf807b34c47f82032a4bc4b3a3;hpb=258cbd9cdf386687122b0854274923acafc786d4;p=pspp diff --git a/src/ui/gui/psppire-dialog-action-histogram.c b/src/ui/gui/psppire-dialog-action-histogram.c index bd0c8ea1f9..3949886c92 100644 --- a/src/ui/gui/psppire-dialog-action-histogram.c +++ b/src/ui/gui/psppire-dialog-action-histogram.c @@ -58,19 +58,13 @@ refresh (PsppireDialogAction *rd_) gtk_entry_set_text (GTK_ENTRY (rd->variable), ""); } -static void -psppire_dialog_action_histogram_activate (PsppireDialogAction *a) +static GtkBuilder * +psppire_dialog_action_histogram_activate (PsppireDialogAction *a, GVariant *param) { PsppireDialogActionHistogram *act = PSPPIRE_DIALOG_ACTION_HISTOGRAM (a); PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); - 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); - } + GtkBuilder *xml = builder_new ( "histogram.ui"); pda->dialog = get_widget_assert (xml, "histogram-dialog"); pda->source = get_widget_assert (xml, "dict-view"); @@ -83,6 +77,7 @@ psppire_dialog_action_histogram_activate (PsppireDialogAction *a) psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid); + return xml; } @@ -115,7 +110,7 @@ generate_syntax (const PsppireDialogAction *a) static void psppire_dialog_action_histogram_class_init (PsppireDialogActionHistogramClass *class) { - psppire_dialog_action_set_activation (class, psppire_dialog_action_histogram_activate); + PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_histogram_activate; PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax; }