projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/stable'
[pspp-builds.git]
/
src
/
ui
/
gui
/
var-display.c
diff --git
a/src/ui/gui/var-display.c
b/src/ui/gui/var-display.c
index 50e0df4bbc7ec360869195c387ce9c1deadda119..7081e9e2c0bde74fc4c9424f729733ba8a74c1c2 100644
(file)
--- a/
src/ui/gui/var-display.c
+++ b/
src/ui/gui/var-display.c
@@
-45,17
+45,14
@@
missing_values_to_string (const PsppireDict *dict, const struct variable *pv, GE
gint i;
for (i = 0 ; i < n; ++i )
{
gint i;
for (i = 0 ; i < n; ++i )
{
- union value v;
- mv_get_value (miss, &v, i);
- mv[i] = value_to_text (v, *fmt);
+ mv[i] = value_to_text (*mv_get_value (miss, i), dict, *fmt);
if ( i > 0 )
g_string_append (gstr, ", ");
g_string_append (gstr, mv[i]);
g_free (mv[i]);
}
if ( i > 0 )
g_string_append (gstr, ", ");
g_string_append (gstr, mv[i]);
g_free (mv[i]);
}
- s = recode_string (UTF8, psppire_dict_encoding (dict),
- gstr->str, gstr->len);
- g_string_free (gstr, TRUE);
+ s = gstr->str;
+ g_string_free (gstr, FALSE);
}
else
{
}
else
{
@@
-64,8
+61,8
@@
missing_values_to_string (const PsppireDict *dict, const struct variable *pv, GE
union value low, high;
mv_get_range (miss, &low.f, &high.f);
union value low, high;
mv_get_range (miss, &low.f, &high.f);
- l = value_to_text (low, *fmt);
- h = value_to_text (high, *fmt);
+ l = value_to_text (low,
dict,
*fmt);
+ h = value_to_text (high,
dict,
*fmt);
g_string_printf (gstr, "%s - %s", l, h);
g_free (l);
g_string_printf (gstr, "%s - %s", l, h);
g_free (l);
@@
-74,18
+71,15
@@
missing_values_to_string (const PsppireDict *dict, const struct variable *pv, GE
if ( mv_has_value (miss))
{
gchar *ss = 0;
if ( mv_has_value (miss))
{
gchar *ss = 0;
- union value v;
- mv_get_value (miss, &v, 0);
- ss = value_to_text (
v
, *fmt);
+ ss = value_to_text (
*mv_get_value (miss, 0), dict
, *fmt);
g_string_append (gstr, ", ");
g_string_append (gstr, ss);
free (ss);
}
g_string_append (gstr, ", ");
g_string_append (gstr, ss);
free (ss);
}
- s = recode_string (UTF8, psppire_dict_encoding (dict),
- gstr->str, gstr->len);
- g_string_free (gstr, TRUE);
+ s = gstr->str;
+ g_string_free (gstr, FALSE);
}
return s;
}
return s;