X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-logistic.c;h=de3e4793baf36125c088a75cb675c7d8fe47c318;hb=c7a68fbae35e58dc3982c5b1ab0a501fccea17d9;hp=e4887352ca9a19e20a73e899e9d34cdba832029e;hpb=3dd0f6ae0d5eb73a2270a243e443c4ae03c2c16e;p=pspp diff --git a/src/ui/gui/psppire-dialog-action-logistic.c b/src/ui/gui/psppire-dialog-action-logistic.c index e4887352ca..de3e4793ba 100644 --- a/src/ui/gui/psppire-dialog-action-logistic.c +++ b/src/ui/gui/psppire-dialog-action-logistic.c @@ -95,20 +95,14 @@ on_opts_clicked (PsppireDialogActionLogistic *act) } -static void -psppire_dialog_action_logistic_activate (PsppireDialogAction *a) +static GtkBuilder * +psppire_dialog_action_logistic_activate (PsppireDialogAction *a, GVariant *param) { PsppireDialogActionLogistic *act = PSPPIRE_DIALOG_ACTION_LOGISTIC (a); PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); GtkWidget *opts_button; - GHashTable *thing = psppire_dialog_action_get_hash_table (pda); - GtkBuilder *xml = g_hash_table_lookup (thing, a); - if (!xml) - { - xml = builder_new ("logistic.ui"); - g_hash_table_insert (thing, a, xml); - } + GtkBuilder *xml = builder_new ( "logistic.ui"); pda->dialog = get_widget_assert (xml, "logistic-dialog"); pda->source = get_widget_assert (xml, "dict-view"); @@ -145,6 +139,7 @@ psppire_dialog_action_logistic_activate (PsppireDialogAction *a) psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid); + return xml; } @@ -226,7 +221,7 @@ generate_syntax (const PsppireDialogAction *a) static void psppire_dialog_action_logistic_class_init (PsppireDialogActionLogisticClass *class) { - psppire_dialog_action_set_activation (class, psppire_dialog_action_logistic_activate); + PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_logistic_activate; PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax; }