projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change some instances of GtkAction to PsppireDialogAction
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog-action-runs.c
diff --git
a/src/ui/gui/psppire-dialog-action-runs.c
b/src/ui/gui/psppire-dialog-action-runs.c
index 8649fbbe6dd3c070aeefa3d2702daac8094a17a3..6d5af383b5029b402ee871b0ef8db1b88a252424 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-runs.c
+++ b/
src/ui/gui/psppire-dialog-action-runs.c
@@
-128,12
+128,19
@@
refresh (PsppireDialogAction *rd_)
}
static void
}
static void
-psppire_dialog_action_runs_activate (
Gtk
Action *a)
+psppire_dialog_action_runs_activate (
PsppireDialog
Action *a)
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionRuns *act = PSPPIRE_DIALOG_ACTION_RUNS (a);
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionRuns *act = PSPPIRE_DIALOG_ACTION_RUNS (a);
- GtkBuilder *xml = builder_new ("runs.ui");
+ 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);
+ }
+
pda->dialog = get_widget_assert (xml, "runs-dialog");
pda->source = get_widget_assert (xml, "dict-view");
pda->dialog = get_widget_assert (xml, "runs-dialog");
pda->source = get_widget_assert (xml, "dict-view");
@@
-144,12
+151,9
@@
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");
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);
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);
}
if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_runs_parent_class)->activate)
PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_runs_parent_class)->activate (pda);
}