projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FACTOR: Fix a crash when bad input was presented
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog-action-kmeans.c
diff --git
a/src/ui/gui/psppire-dialog-action-kmeans.c
b/src/ui/gui/psppire-dialog-action-kmeans.c
index 3656a5d9b97fbf3d9190c0068be911ad5bfd45b2..b25ecd475ab1a258271777c0b92a09312e173b80 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-kmeans.c
+++ b/
src/ui/gui/psppire-dialog-action-kmeans.c
@@
-31,7
+31,7
@@
static void psppire_dialog_action_kmeans_class_init (PsppireDialogActionKme
G_DEFINE_TYPE (PsppireDialogActionKmeans, psppire_dialog_action_kmeans, PSPPIRE_TYPE_DIALOG_ACTION);
static char *
G_DEFINE_TYPE (PsppireDialogActionKmeans, psppire_dialog_action_kmeans, PSPPIRE_TYPE_DIALOG_ACTION);
static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (
const
PsppireDialogAction *act)
{
PsppireDialogActionKmeans *km = PSPPIRE_DIALOG_ACTION_KMEANS (act);
gchar *text;
{
PsppireDialogActionKmeans *km = PSPPIRE_DIALOG_ACTION_KMEANS (act);
gchar *text;
@@
-71,8
+71,9
@@
dialog_state_valid (gpointer user_data)
}
static void
}
static void
-refresh (PsppireDialogAction
Kmeans *fd
)
+refresh (PsppireDialogAction
*fd_
)
{
{
+ PsppireDialogActionKmeans *fd = PSPPIRE_DIALOG_ACTION_KMEANS (fd_);
GtkTreeModel *liststore =
gtk_tree_view_get_model (GTK_TREE_VIEW (fd->variables));
gtk_list_store_clear (GTK_LIST_STORE (liststore));
GtkTreeModel *liststore =
gtk_tree_view_get_model (GTK_TREE_VIEW (fd->variables));
gtk_list_store_clear (GTK_LIST_STORE (liststore));
@@
-81,11
+82,18
@@
refresh (PsppireDialogActionKmeans *fd)
}
static void
}
static void
-psppire_dialog_action_kmeans_activate (
Gtk
Action *a)
+psppire_dialog_action_kmeans_activate (
PsppireDialog
Action *a)
{
PsppireDialogActionKmeans *act = PSPPIRE_DIALOG_ACTION_KMEANS (a);
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
{
PsppireDialogActionKmeans *act = PSPPIRE_DIALOG_ACTION_KMEANS (a);
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
- GtkBuilder *xml = builder_new ("k-means.ui");
+
+ GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
+ GtkBuilder *xml = g_hash_table_lookup (thing, a);
+ if (!xml)
+ {
+ xml = builder_new ("k-means.ui");
+ g_hash_table_insert (thing, a, xml);
+ }
pda->dialog = get_widget_assert (xml, "k-means-dialog");
pda->source = get_widget_assert (xml, "dict-view");
pda->dialog = get_widget_assert (xml, "k-means-dialog");
pda->source = get_widget_assert (xml, "dict-view");
@@
-94,21
+102,14
@@
psppire_dialog_action_kmeans_activate (GtkAction *a)
act->variables = get_widget_assert (xml, "psppire-var-view1");
psppire_dialog_action_set_refresh (pda, refresh);
act->variables = get_widget_assert (xml, "psppire-var-view1");
psppire_dialog_action_set_refresh (pda, refresh);
-
psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
- g_object_unref (xml);
-
- if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_kmeans_parent_class)->activate)
- PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_kmeans_parent_class)->activate (pda);
}
static void
psppire_dialog_action_kmeans_class_init (PsppireDialogActionKmeansClass *class)
{
}
static void
psppire_dialog_action_kmeans_class_init (PsppireDialogActionKmeansClass *class)
{
- GtkActionClass *action_class = GTK_ACTION_CLASS (class);
-
- action_class->activate = psppire_dialog_action_kmeans_activate;
+ psppire_dialog_action_set_activation (class, psppire_dialog_action_kmeans_activate);
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}