X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-scatterplot.c;h=041c857b73a03e40fa5c1938588bf99cda23a6b9;hb=0f447caa885d8f0fd8c30d4440556d9b6abb99ea;hp=891dbf019bf482c14c8b787ed93845cf3457dd75;hpb=3dd0f6ae0d5eb73a2270a243e443c4ae03c2c16e;p=pspp diff --git a/src/ui/gui/psppire-dialog-action-scatterplot.c b/src/ui/gui/psppire-dialog-action-scatterplot.c index 891dbf019b..041c857b73 100644 --- a/src/ui/gui/psppire-dialog-action-scatterplot.c +++ b/src/ui/gui/psppire-dialog-action-scatterplot.c @@ -90,20 +90,13 @@ refresh (PsppireDialogAction *rd_) -static void -psppire_dialog_action_scatterplot_activate (PsppireDialogAction *a) +static GtkBuilder * +psppire_dialog_action_scatterplot_activate (PsppireDialogAction *a, GVariant *param) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionScatterplot *act = PSPPIRE_DIALOG_ACTION_SCATTERPLOT (a); - GHashTable *thing = psppire_dialog_action_get_hash_table (pda); - GtkBuilder *xml = g_hash_table_lookup (thing, a); - if (!xml) - { - xml = builder_new ("scatterplot.ui"); - g_hash_table_insert (thing, a, xml); - } - + GtkBuilder *xml = builder_new ( "scatterplot.ui"); pda->dialog = get_widget_assert (xml, "scatterplot-dialog"); pda->source = get_widget_assert (xml, "scatterplot-treeview1"); @@ -112,13 +105,13 @@ psppire_dialog_action_scatterplot_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_scatterplot_class_init (PsppireDialogActionScatterplotClass *class) { - psppire_dialog_action_set_activation (class, psppire_dialog_action_scatterplot_activate); + PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_scatterplot_activate; PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax; }