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-recode-different.c
diff --git
a/src/ui/gui/psppire-dialog-action-recode-different.c
b/src/ui/gui/psppire-dialog-action-recode-different.c
index 251e5999e03b0079dfef7fdfaa082d06abcfca75..a49d05306ea1f17820d3b429a17dc2374374a505 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-recode-different.c
+++ b/
src/ui/gui/psppire-dialog-action-recode-different.c
@@
-42,7
+42,7
@@
difx_variable_treeview_is_populated (PsppireDialogActionRecode *rd)
PsppireDialogActionRecodeDifferent *rdd = PSPPIRE_DIALOG_ACTION_RECODE_DIFFERENT (rd);
GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (rd->variable_treeview));
PsppireDialogActionRecodeDifferent *rdd = PSPPIRE_DIALOG_ACTION_RECODE_DIFFERENT (rd);
GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (rd->variable_treeview));
- if (g_hash_table_size (rdd->varmap) != gtk_tree_model_iter_n_children (model, NULL)
)
+ if (g_hash_table_size (rdd->varmap) != gtk_tree_model_iter_n_children (model, NULL))
return FALSE;
return TRUE;
return FALSE;
return TRUE;
@@
-58,11
+58,11
@@
dialog_state_valid (gpointer data)
PsppireDialogActionRecode *rd = data;
GtkTreeIter not_used;
PsppireDialogActionRecode *rd = data;
GtkTreeIter not_used;
- if (
! rd->value_map
)
+ if (
! rd->value_map
)
return FALSE;
return FALSE;
- if (
! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (rd->value_map),
- ¬_used)
)
+ if (! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (rd->value_map),
+ ¬_used))
return FALSE;
return FALSE;
@@
-122,7
+122,7
@@
nlp_create (const char *name, const char *label)
nlp->label = NULL;
nlp->label = NULL;
- if (
0 != strcmp ("", label))
+ if (0 != strcmp ("", label))
nlp->label = g_strdup (label);
return nlp;
nlp->label = g_strdup (label);
return nlp;
@@
-132,7
+132,7
@@
static void
nlp_destroy (gpointer data)
{
struct nlp *nlp = data ;
nlp_destroy (gpointer data)
{
struct nlp *nlp = data ;
- if (
! nlp
)
+ if (
! nlp
)
return;
g_free (nlp->name);
return;
g_free (nlp->name);
@@
-161,10
+161,12
@@
render_new_var_name (GtkTreeViewColumn *tree_column,
nlp = g_hash_table_lookup (rdd->varmap, var);
nlp = g_hash_table_lookup (rdd->varmap, var);
- if (
nlp
)
+ if (
nlp
)
g_object_set (cell, "text", nlp->name, NULL);
else
g_object_set (cell, "text", "", NULL);
g_object_set (cell, "text", nlp->name, NULL);
else
g_object_set (cell, "text", "", NULL);
+
+ var_unref (var);
}
static void
}
static void
@@
-190,7
+192,7
@@
on_change_clicked (GObject *obj, gpointer data)
const gchar *dest_var_label =
gtk_entry_get_text (GTK_ENTRY (rd->new_label_entry));
const gchar *dest_var_label =
gtk_entry_get_text (GTK_ENTRY (rd->new_label_entry));
- if (
NULL == rows || rows->next != NULL)
+ if (NULL == rows || rows->next != NULL)
goto finish;
gtk_tree_model_get_iter (model, &iter, rows->data);
goto finish;
gtk_tree_model_get_iter (model, &iter, rows->data);
@@
-206,7
+208,7
@@
on_change_clicked (GObject *obj, gpointer data)
gtk_tree_model_row_changed (model, rows->data, &iter);
finish:
gtk_tree_model_row_changed (model, rows->data, &iter);
finish:
- g_list_foreach (rows,
(GFunc) gtk_tree_path_free
, NULL);
+ g_list_foreach (rows,
GFUNC_COMPAT_CAST (gtk_tree_path_free)
, NULL);
g_list_free (rows);
}
g_list_free (rows);
}
@@
-227,7
+229,7
@@
on_selection_change (GtkTreeSelection *selection, gpointer data)
GList *rows = gtk_tree_selection_get_selected_rows (selection, &model);
GList *rows = gtk_tree_selection_get_selected_rows (selection, &model);
- if (
rows && !rows->next)
+ if (rows && !rows->next)
{
/* Exactly one row is selected */
struct nlp *nlp;
{
/* Exactly one row is selected */
struct nlp *nlp;
@@
-270,7
+272,7
@@
on_selection_change (GtkTreeSelection *selection, gpointer data)
}
}
- g_list_foreach (rows,
(GFunc) gtk_tree_path_free
, NULL);
+ g_list_foreach (rows,
GFUNC_COMPAT_CAST (gtk_tree_path_free)
, NULL);
g_list_free (rows);
}
g_list_free (rows);
}