projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
output-item: Fix memory leak in output_item_dump().
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog-action-flip.c
diff --git
a/src/ui/gui/psppire-dialog-action-flip.c
b/src/ui/gui/psppire-dialog-action-flip.c
index 2c265f3826afd6a0b62f097f9e514bb19d9b10a4..07863ec15564369467fde2e0727ec0153968de41 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-flip.c
+++ b/
src/ui/gui/psppire-dialog-action-flip.c
@@
-34,7
+34,7
@@
G_DEFINE_TYPE (PsppireDialogActionFlip, psppire_dialog_action_flip, PSPPIRE_TYPE
FLIP /VARIABLES=var_list /NEWNAMES=var_name.
*/
static char *
FLIP /VARIABLES=var_list /NEWNAMES=var_name.
*/
static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (
const
PsppireDialogAction *act)
{
const gchar *text;
PsppireDialogActionFlip *rd = PSPPIRE_DIALOG_ACTION_FLIP (act);
{
const gchar *text;
PsppireDialogActionFlip *rd = PSPPIRE_DIALOG_ACTION_FLIP (act);
@@
-48,7
+48,7
@@
generate_syntax (PsppireDialogAction *act)
text = gtk_entry_get_text (GTK_ENTRY (rd->entry));
text = gtk_entry_get_text (GTK_ENTRY (rd->entry));
- if (
text)
+ if (text)
g_string_append_printf (string, " /NEWNAME = %s", text);
g_string_append (string, ".\n");
g_string_append_printf (string, " /NEWNAME = %s", text);
g_string_append (string, ".\n");
@@
-70,10
+70,10
@@
dialog_state_valid (gpointer a)
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 FALSE;
- if (
0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (act->entry))))
+ if (0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (act->entry))))
return FALSE;
return TRUE;
return FALSE;
return TRUE;
@@
-89,19
+89,13
@@
refresh (PsppireDialogAction *rd_)
gtk_entry_set_text (GTK_ENTRY (rd->entry), "");
}
gtk_entry_set_text (GTK_ENTRY (rd->entry), "");
}
-static
void
-psppire_dialog_action_flip_activate (
GtkAction *a
)
+static
GtkBuilder *
+psppire_dialog_action_flip_activate (
PsppireDialogAction *a, GVariant *param
)
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionFlip *act = PSPPIRE_DIALOG_ACTION_FLIP (a);
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionFlip *act = PSPPIRE_DIALOG_ACTION_FLIP (a);
- GHashTable *thing = psppire_dialog_action_get_pointer (pda);
- GtkBuilder *xml = g_hash_table_lookup (thing, a);
- if (!xml)
- {
- xml = builder_new ("psppire.ui");
- g_hash_table_insert (thing, a, xml);
- }
+ GtkBuilder *xml = builder_new ("transpose.ui");
pda->dialog = get_widget_assert (xml, "transpose-dialog");
pda->source = get_widget_assert (xml, "source-treeview");
pda->dialog = get_widget_assert (xml, "transpose-dialog");
pda->source = get_widget_assert (xml, "source-treeview");
@@
-112,14
+106,13
@@
psppire_dialog_action_flip_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);
- if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_flip_parent_class)->activate)
- PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_flip_parent_class)->activate (pda);
+ return xml;
}
static void
psppire_dialog_action_flip_class_init (PsppireDialogActionFlipClass *class)
{
}
static void
psppire_dialog_action_flip_class_init (PsppireDialogActionFlipClass *class)
{
-
psppire_dialog_action_set_activation (class, psppire_dialog_action_flip_activate)
;
+
PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_flip_activate
;
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}