projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix memory leak in the value labels dialog
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog-action-correlation.c
diff --git
a/src/ui/gui/psppire-dialog-action-correlation.c
b/src/ui/gui/psppire-dialog-action-correlation.c
index 676f13e6aaed6a29638d89bf3a5c6516b9144fe7..18cba1c09a0162786b632d88b3955a48a45c14ba 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-correlation.c
+++ b/
src/ui/gui/psppire-dialog-action-correlation.c
@@
-91,19
+91,13
@@
refresh (PsppireDialogAction *rd_)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rd->two_tailed), TRUE);
}
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rd->two_tailed), TRUE);
}
-static
void
-psppire_dialog_action_correlation_activate (PsppireDialogAction *a)
+static
GtkBuilder *
+psppire_dialog_action_correlation_activate (PsppireDialogAction *a
, GVariant *param
)
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionCorrelation *act = PSPPIRE_DIALOG_ACTION_CORRELATION (a);
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionCorrelation *act = PSPPIRE_DIALOG_ACTION_CORRELATION (a);
- GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
- GtkBuilder *xml = g_hash_table_lookup (thing, a);
- if (!xml)
- {
- xml = builder_new ("correlation.ui");
- g_hash_table_insert (thing, a, xml);
- }
+ GtkBuilder *xml = builder_new ("correlation.ui");
pda->dialog = get_widget_assert (xml, "correlation-dialog");
pda->source = get_widget_assert (xml, "dict-view");
pda->dialog = get_widget_assert (xml, "correlation-dialog");
pda->source = get_widget_assert (xml, "dict-view");
@@
-115,12
+109,13
@@
psppire_dialog_action_correlation_activate (PsppireDialogAction *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);
+ return xml;
}
static void
psppire_dialog_action_correlation_class_init (PsppireDialogActionCorrelationClass *class)
{
}
static void
psppire_dialog_action_correlation_class_init (PsppireDialogActionCorrelationClass *class)
{
-
psppire_dialog_action_set_activation (class, psppire_dialog_action_correlation_activate)
;
+
PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_correlation_activate
;
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}