X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-correlation.c;h=30c3b05bc771aa134b217ca7826c9f7f97ef8139;hb=c1f04750c4430bf3e7f0630842f879ee695b947d;hp=6f2702f115d149f37d98a0ec1aa3ca0eb0af46c0;hpb=745ee355670b71d243c2cf1cc162352e2ee00360;p=pspp diff --git a/src/ui/gui/psppire-dialog-action-correlation.c b/src/ui/gui/psppire-dialog-action-correlation.c index 6f2702f115..30c3b05bc7 100644 --- a/src/ui/gui/psppire-dialog-action-correlation.c +++ b/src/ui/gui/psppire-dialog-action-correlation.c @@ -91,19 +91,13 @@ refresh (PsppireDialogAction *rd_) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rd->two_tailed), TRUE); } -static void -psppire_dialog_action_correlation_activate (PsppireDialogAction *a) +static GtkBuilder * +psppire_dialog_action_correlation_activate (PsppireDialogAction *a, GVariant *param) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionCorrelation *act = PSPPIRE_DIALOG_ACTION_CORRELATION (a); - GHashTable *thing = psppire_dialog_action_get_hash_table (pda); - GtkBuilder *xml = g_hash_table_lookup (thing, a); - if (!xml) - { - xml = builder_new ("correlation.ui"); - g_hash_table_insert (thing, a, xml); - } + GtkBuilder *xml = builder_new ( "correlation.ui"); pda->dialog = get_widget_assert (xml, "correlation-dialog"); pda->source = get_widget_assert (xml, "dict-view"); @@ -115,14 +109,13 @@ psppire_dialog_action_correlation_activate (PsppireDialogAction *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_correlation_parent_class)->activate) - PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_correlation_parent_class)->activate (pda); + return xml; } static void psppire_dialog_action_correlation_class_init (PsppireDialogActionCorrelationClass *class) { - psppire_dialog_action_set_activation (class, psppire_dialog_action_correlation_activate); + PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_correlation_activate; PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax; }