projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Persist dialog box widget settings.
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog-action-k-related.c
diff --git
a/src/ui/gui/psppire-dialog-action-k-related.c
b/src/ui/gui/psppire-dialog-action-k-related.c
index 9f1b588c5fa24dfbea60ada0cca17185f1d26ba2..16f0f721c3703a3544fd4566a7758caab45bf0cc 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-k-related.c
+++ b/
src/ui/gui/psppire-dialog-action-k-related.c
@@
-110,7
+110,14
@@
psppire_dialog_action_k_related_activate (GtkAction *a)
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionKRelated *act = PSPPIRE_DIALOG_ACTION_K_RELATED (a);
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionKRelated *act = PSPPIRE_DIALOG_ACTION_K_RELATED (a);
- GtkBuilder *xml = builder_new ("k-related.ui");
+ GHashTable *thing = psppire_dialog_action_get_pointer (pda);
+ GtkBuilder *xml = g_hash_table_lookup (thing, a);
+ if (!xml)
+ {
+ xml = builder_new ("k-related.ui");
+ g_hash_table_insert (thing, a, xml);
+ }
+
pda->dialog = get_widget_assert (xml, "k-related-dialog");
pda->source = get_widget_assert (xml, "dict-view");
pda->dialog = get_widget_assert (xml, "k-related-dialog");
pda->source = get_widget_assert (xml, "dict-view");
@@
-126,8
+133,6
@@
psppire_dialog_action_k_related_activate (GtkAction *a)
"predicate", var_is_numeric,
NULL);
"predicate", var_is_numeric,
NULL);
- g_object_unref (xml);
-
if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_k_related_parent_class)->activate)
PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_k_related_parent_class)->activate (pda);
}
if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_k_related_parent_class)->activate)
PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_k_related_parent_class)->activate (pda);
}
@@
-135,9
+140,7
@@
psppire_dialog_action_k_related_activate (GtkAction *a)
static void
psppire_dialog_action_k_related_class_init (PsppireDialogActionKRelatedClass *class)
{
static void
psppire_dialog_action_k_related_class_init (PsppireDialogActionKRelatedClass *class)
{
- GtkActionClass *action_class = GTK_ACTION_CLASS (class);
-
- action_class->activate = psppire_dialog_action_k_related_activate;
+ psppire_dialog_action_set_activation (class, psppire_dialog_action_k_related_activate);
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}