projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bug inserting cases in data sheet.
[pspp]
/
src
/
ui
/
gui
/
variable-info-dialog.c
diff --git
a/src/ui/gui/variable-info-dialog.c
b/src/ui/gui/variable-info-dialog.c
index a53d6a5cf0a09264189a98a525a79c48f70c80d0..fa9d51011e8d2fec88b14cd2439d606a65836fd3 100644
(file)
--- a/
src/ui/gui/variable-info-dialog.c
+++ b/
src/ui/gui/variable-info-dialog.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007 Free Software Foundation
+ Copyright (C) 2007
, 2009
Free Software Foundation
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-70,7
+70,7
@@
populate_text (PsppireDictView *treeview, gpointer data)
GString *gstring;
PsppireDict *dict;
GString *gstring;
PsppireDict *dict;
- GtkTextBuffer *textbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW(data));
+ GtkTextBuffer *textbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW
(data));
const struct variable *var =
psppire_dict_view_get_selected_variable (treeview);
const struct variable *var =
psppire_dict_view_get_selected_variable (treeview);
@@
-82,13
+82,13
@@
populate_text (PsppireDictView *treeview, gpointer data)
NULL);
gstring = g_string_sized_new (200);
NULL);
gstring = g_string_sized_new (200);
- text = name_to_string (var,
NULL
);
+ text = name_to_string (var,
dict
);
g_string_assign (gstring, text);
g_free (text);
g_string_append (gstring, "\n");
g_string_assign (gstring, text);
g_free (text);
g_string_append (gstring, "\n");
- text = label_to_string (var,
NULL
);
+ text = label_to_string (var,
dict
);
g_string_append_printf (gstring, _("Label: %s\n"), text);
g_free (text);
g_string_append_printf (gstring, _("Label: %s\n"), text);
g_free (text);
@@
-116,29
+116,31
@@
populate_text (PsppireDictView *treeview, gpointer data)
/* Value Labels */
if ( var_has_value_labels (var))
{
/* Value Labels */
if ( var_has_value_labels (var))
{
- struct val_labs_iterator *vli = 0;
- struct val_lab *vl;
- const struct val_labs *labs = var_get_value_labels (var);
+ const struct val_labs *vls = var_get_value_labels (var);
+ const struct val_lab **labels;
+ size_t n_labels;
+ size_t i;
g_string_append (gstring, "\n");
g_string_append (gstring, _("Value Labels:\n"));
g_string_append (gstring, "\n");
g_string_append (gstring, _("Value Labels:\n"));
- for (vl = val_labs_first_sorted (labs, &vli);
- vl;
- vl = val_labs_next (labs, &vli))
- {
+ labels = val_labs_sorted (vls);
+ n_labels = val_labs_count (vls);
+ for (i = 0; i < n_labels; i++)
+ {
+ const struct val_lab *vl = labels[i];
gchar *const vstr =
value_to_text (vl->value, *var_get_print_format (var));
gchar *const vstr =
value_to_text (vl->value, *var_get_print_format (var));
-
text = recode_string (UTF8, psppire_dict_encoding (dict),
text = recode_string (UTF8, psppire_dict_encoding (dict),
- v
l->label
, -1);
+ v
al_lab_get_label (vl)
, -1);
g_string_append_printf (gstring, _("%s %s\n"), vstr, text);
g_free (text);
g_free (vstr);
}
g_string_append_printf (gstring, _("%s %s\n"), vstr, text);
g_free (text);
g_free (vstr);
}
+ free (labels);
}
gtk_text_buffer_set_text (textbuffer, gstring->str, gstring->len);
}
gtk_text_buffer_set_text (textbuffer, gstring->str, gstring->len);