projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
exp10 replaced with pow when exp10 is not available
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog-action-sort.c
diff --git
a/src/ui/gui/psppire-dialog-action-sort.c
b/src/ui/gui/psppire-dialog-action-sort.c
index ecfffe536b8883628b3c5b8684902a61325e8bbf..7dfb0b278ce895ba3f50ef7fb667e9fb7132d5c1 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-sort.c
+++ b/
src/ui/gui/psppire-dialog-action-sort.c
@@
-39,7
+39,7
@@
generate_syntax (const PsppireDialogAction *act)
PsppireVarView *var_view = PSPPIRE_VAR_VIEW (scd->variables);
gint n_vars = psppire_var_view_append_names (var_view, 0, string);
PsppireVarView *var_view = PSPPIRE_VAR_VIEW (scd->variables);
gint n_vars = psppire_var_view_append_names (var_view, 0, string);
- if (
n_vars == 0
)
+ if (
n_vars == 0
)
{
g_string_assign (string, "");
}
{
g_string_assign (string, "");
}
@@
-82,26
+82,20
@@
dialog_state_valid (gpointer act)
gint n_rows = gtk_tree_model_iter_n_children (model, NULL);
gint n_rows = gtk_tree_model_iter_n_children (model, NULL);
- if (
n_rows == 0
)
+ if (
n_rows == 0
)
return FALSE;
return TRUE;
}
return FALSE;
return TRUE;
}
-static
void
-psppire_dialog_action_sort_activate (PsppireDialogAction *a)
+static
GtkBuilder *
+psppire_dialog_action_sort_activate (PsppireDialogAction *a
, GVariant *param
)
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionSort *act = PSPPIRE_DIALOG_ACTION_SORT (a);
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionSort *act = PSPPIRE_DIALOG_ACTION_SORT (a);
- GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
- GtkBuilder *xml = g_hash_table_lookup (thing, a);
- if (!xml)
- {
- xml = builder_new ("sort.ui");
- g_hash_table_insert (thing, a, xml);
- }
+ GtkBuilder *xml = builder_new ("sort.ui");
pda->dialog = get_widget_assert (xml, "sort-cases-dialog");
pda->source = get_widget_assert (xml, "sort-cases-treeview1");
pda->dialog = get_widget_assert (xml, "sort-cases-dialog");
pda->source = get_widget_assert (xml, "sort-cases-treeview1");
@@
-113,16
+107,16
@@
psppire_dialog_action_sort_activate (PsppireDialogAction *a)
psppire_dialog_action_set_valid_predicate (pda,
dialog_state_valid);
psppire_dialog_action_set_valid_predicate (pda,
dialog_state_valid);
-
+ return xml;
}
static void
psppire_dialog_action_sort_class_init (PsppireDialogActionSortClass *class)
{
PsppireDialogActionClass *pdac = PSPPIRE_DIALOG_ACTION_CLASS (class);
}
static void
psppire_dialog_action_sort_class_init (PsppireDialogActionSortClass *class)
{
PsppireDialogActionClass *pdac = PSPPIRE_DIALOG_ACTION_CLASS (class);
-
psppire_dialog_action_set_activation (class, psppire_dialog_action_sort_activate)
;
+
PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_sort_activate
;
-
pdac->generate_syntax = generate_syntax;
+ pdac->generate_syntax = generate_syntax;
}
}