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=410f0175862b388dbb43fba20580d00c284f5d13;hp=8649fbbe6dd3c070aeefa3d2702daac8094a17a3;hpb=2a71889bf86463fb752bcbab248da47b25b4fd9a;p=pspp diff --git a/src/ui/gui/psppire-dialog-action-runs.c b/src/ui/gui/psppire-dialog-action-runs.c index 8649fbbe6d..40afd8e762 100644 --- a/src/ui/gui/psppire-dialog-action-runs.c +++ b/src/ui/gui/psppire-dialog-action-runs.c @@ -51,7 +51,7 @@ append_fragment (GString *string, const gchar *cut, PsppireVarView *vv) } static char * -generate_syntax (PsppireDialogAction *act) +generate_syntax (const PsppireDialogAction *act) { PsppireDialogActionRuns *rd = PSPPIRE_DIALOG_ACTION_RUNS (act); gchar *text; @@ -127,13 +127,14 @@ refresh (PsppireDialogAction *rd_) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rd->cb[i]), FALSE); } -static void -psppire_dialog_action_runs_activate (GtkAction *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); - GtkBuilder *xml = builder_new ("runs.ui"); + GtkBuilder *xml = builder_new ( "runs.ui"); + pda->dialog = get_widget_assert (xml, "runs-dialog"); pda->source = get_widget_assert (xml, "dict-view"); @@ -144,20 +145,15 @@ psppire_dialog_action_runs_activate (GtkAction *a) act->cb[CB_CUSTOM] = get_widget_assert (xml, "checkbutton3"); act->variables = get_widget_assert (xml, "psppire-var-view1"); - psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid); psppire_dialog_action_set_refresh (pda, refresh); - - g_object_unref (xml); - - 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; }