projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix compiler warnings
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog-action-scatterplot.c
diff --git
a/src/ui/gui/psppire-dialog-action-scatterplot.c
b/src/ui/gui/psppire-dialog-action-scatterplot.c
index 64017df7c9935d6e9b9933176d04724c360d5827..e59353c973a2f675f64e48163f02960c4d397af8 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-scatterplot.c
+++ b/
src/ui/gui/psppire-dialog-action-scatterplot.c
@@
-96,7
+96,13
@@
psppire_dialog_action_scatterplot_activate (GtkAction *a)
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionScatterplot *act = PSPPIRE_DIALOG_ACTION_SCATTERPLOT (a);
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionScatterplot *act = PSPPIRE_DIALOG_ACTION_SCATTERPLOT (a);
- GtkBuilder *xml = builder_new ("scatterplot.ui");
+ GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
+ GtkBuilder *xml = g_hash_table_lookup (thing, a);
+ if (!xml)
+ {
+ xml = builder_new ("scatterplot.ui");
+ g_hash_table_insert (thing, a, xml);
+ }
pda->dialog = get_widget_assert (xml, "scatterplot-dialog");
pda->source = get_widget_assert (xml, "scatterplot-treeview1");
pda->dialog = get_widget_assert (xml, "scatterplot-dialog");
pda->source = get_widget_assert (xml, "scatterplot-treeview1");
@@
-107,8
+113,6
@@
psppire_dialog_action_scatterplot_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_scatterplot_parent_class)->activate)
PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_scatterplot_parent_class)->activate (pda);
}
if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_scatterplot_parent_class)->activate)
PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_scatterplot_parent_class)->activate (pda);
}
@@
-116,9
+120,8
@@
psppire_dialog_action_scatterplot_activate (GtkAction *a)
static void
psppire_dialog_action_scatterplot_class_init (PsppireDialogActionScatterplotClass *class)
{
static void
psppire_dialog_action_scatterplot_class_init (PsppireDialogActionScatterplotClass *class)
{
-
GtkActionClass *action_class = GTK_ACTION_CLASS (class
);
+
psppire_dialog_action_set_activation (class, psppire_dialog_action_scatterplot_activate
);
- action_class->activate = psppire_dialog_action_scatterplot_activate;
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}