X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-oneway.c;h=77512977a9049f230bd393be8d108bb99da4566d;hb=ca1382f24fd0a8a90dd65daf98a279d6a549d9da;hp=81a632d9eaff6cea65f1143e8d931798db15b590;hpb=3dd0f6ae0d5eb73a2270a243e443c4ae03c2c16e;p=pspp diff --git a/src/ui/gui/psppire-dialog-action-oneway.c b/src/ui/gui/psppire-dialog-action-oneway.c index 81a632d9ea..77512977a9 100644 --- a/src/ui/gui/psppire-dialog-action-oneway.c +++ b/src/ui/gui/psppire-dialog-action-oneway.c @@ -218,21 +218,13 @@ clone_contrasts_array (GArray *src_array) } - - -static void -psppire_dialog_action_oneway_activate (PsppireDialogAction *a) +static GtkBuilder * +psppire_dialog_action_oneway_activate (PsppireDialogAction *a, GVariant *param) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionOneway *act = PSPPIRE_DIALOG_ACTION_ONEWAY (a); - GHashTable *thing = psppire_dialog_action_get_hash_table (pda); - GtkBuilder *xml = g_hash_table_lookup (thing, a); - if (!xml) - { - xml = builder_new ("oneway.ui"); - g_hash_table_insert (thing, a, xml); - } + GtkBuilder *xml = builder_new ( "oneway.ui"); GtkWidget *contrasts_button = get_widget_assert (xml, "contrasts-button"); @@ -272,13 +264,13 @@ psppire_dialog_action_oneway_activate (PsppireDialogAction *a) psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid); psppire_dialog_action_set_refresh (pda, refresh); - + return xml; } static void psppire_dialog_action_oneway_class_init (PsppireDialogActionOnewayClass *class) { - psppire_dialog_action_set_activation (class, psppire_dialog_action_oneway_activate); + PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_oneway_activate; PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax; }