X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-runs.c;h=40afd8e7623ebec984c96bdceeae4fe233cd17d8;hb=bf62643ef9f4f991acd777b26aa747adc7886d8f;hp=6598b1e1141d1615fd0c8efcd18174c5fb60345d;hpb=745ee355670b71d243c2cf1cc162352e2ee00360;p=pspp diff --git a/src/ui/gui/psppire-dialog-action-runs.c b/src/ui/gui/psppire-dialog-action-runs.c index 6598b1e114..40afd8e762 100644 --- a/src/ui/gui/psppire-dialog-action-runs.c +++ b/src/ui/gui/psppire-dialog-action-runs.c @@ -127,19 +127,13 @@ refresh (PsppireDialogAction *rd_) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rd->cb[i]), FALSE); } -static void -psppire_dialog_action_runs_activate (PsppireDialogAction *a) +static GtkBuilder * +psppire_dialog_action_runs_activate (PsppireDialogAction *a, GVariant *param) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionRuns *act = PSPPIRE_DIALOG_ACTION_RUNS (a); - GHashTable *thing = psppire_dialog_action_get_hash_table (pda); - GtkBuilder *xml = g_hash_table_lookup (thing, a); - if (!xml) - { - xml = builder_new ("runs.ui"); - g_hash_table_insert (thing, a, xml); - } + GtkBuilder *xml = builder_new ( "runs.ui"); pda->dialog = get_widget_assert (xml, "runs-dialog"); pda->source = get_widget_assert (xml, "dict-view"); @@ -153,15 +147,13 @@ psppire_dialog_action_runs_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_runs_parent_class)->activate) - PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_runs_parent_class)->activate (pda); + return xml; } static void psppire_dialog_action_runs_class_init (PsppireDialogActionRunsClass *class) { - psppire_dialog_action_set_activation (class, psppire_dialog_action_runs_activate); + PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_runs_activate; PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax; }