projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Makefiles: Add $(AM_V_GEN) and $(AM_V_at) to a few more rules.
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog-action-1sks.c
diff --git
a/src/ui/gui/psppire-dialog-action-1sks.c
b/src/ui/gui/psppire-dialog-action-1sks.c
index f71de4d88fcf36c2f4e0a6c0dadbe0b53e4cf7ac..c79ebc577930eb248b95124fba6af364a36e8608 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-1sks.c
+++ b/
src/ui/gui/psppire-dialog-action-1sks.c
@@
-117,12
+117,19
@@
refresh (PsppireDialogAction *rd_)
}
static void
}
static void
-psppire_dialog_action_1sks_activate (
Gtk
Action *a)
+psppire_dialog_action_1sks_activate (
PsppireDialog
Action *a)
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogAction1sks *act = PSPPIRE_DIALOG_ACTION_1SKS (a);
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogAction1sks *act = PSPPIRE_DIALOG_ACTION_1SKS (a);
- GtkBuilder *xml = builder_new ("ks-one-sample.ui");
+ GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
+ GtkBuilder *xml = g_hash_table_lookup (thing, a);
+ if (!xml)
+ {
+ xml = builder_new ("ks-one-sample.ui");
+ g_hash_table_insert (thing, a, xml);
+ }
+
pda->dialog = get_widget_assert (xml, "ks-one-sample-dialog");
pda->source = get_widget_assert (xml, "dict-view");
pda->dialog = get_widget_assert (xml, "ks-one-sample-dialog");
pda->source = get_widget_assert (xml, "dict-view");
@@
-136,8
+143,6
@@
psppire_dialog_action_1sks_activate (GtkAction *a)
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_1sks_parent_class)->activate)
PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_1sks_parent_class)->activate (pda);
}
if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_1sks_parent_class)->activate)
PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_1sks_parent_class)->activate (pda);
}
@@
-145,9
+150,7
@@
psppire_dialog_action_1sks_activate (GtkAction *a)
static void
psppire_dialog_action_1sks_class_init (PsppireDialogAction1sksClass *class)
{
static void
psppire_dialog_action_1sks_class_init (PsppireDialogAction1sksClass *class)
{
- GtkActionClass *action_class = GTK_ACTION_CLASS (class);
-
- action_class->activate = psppire_dialog_action_1sks_activate;
+ psppire_dialog_action_set_activation (class, psppire_dialog_action_1sks_activate);
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}