projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
format: Create a new "struct fmt_affix" for prefix and suffix strings.
[pspp]
/
src
/
ui
/
gui
/
var-display.c
diff --git
a/src/ui/gui/var-display.c
b/src/ui/gui/var-display.c
index b615fe522b3f76286143daef43bca1b9b42cd49a..1b9bf71c4764db71d4a3b88fef9ca0035035b68b 100644
(file)
--- a/
src/ui/gui/var-display.c
+++ b/
src/ui/gui/var-display.c
@@
-22,8
+22,7
@@
measure_to_string (const struct variable *var, GError **err)
const gint measure = var_get_measure (var);
g_assert (measure < n_MEASURES);
const gint measure = var_get_measure (var);
g_assert (measure < n_MEASURES);
- return g_locale_to_utf8 (gettext (measures[measure]),
- -1, 0, 0, err);
+ return gettext (measures[measure]);
}
}
@@
-34,7
+33,7
@@
missing_values_to_string (const PsppireDict *dict, const struct variable *pv, GE
gchar *s;
const struct missing_values *miss = var_get_missing_values (pv);
if ( mv_is_empty (miss))
gchar *s;
const struct missing_values *miss = var_get_missing_values (pv);
if ( mv_is_empty (miss))
- return
g_locale_to_utf8 (gettext (none), -1, 0, 0, err
);
+ return
xstrdup (gettext (none)
);
else
{
if ( ! mv_has_range (miss))
else
{
if ( ! mv_has_range (miss))
@@
-45,15
+44,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 )
{
- mv[i] = value_to_text (*mv_get_value (miss, i), *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
{
@@
-62,8
+60,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);
@@
-73,15
+71,14
@@
missing_values_to_string (const PsppireDict *dict, const struct variable *pv, GE
{
gchar *ss = 0;
{
gchar *ss = 0;
- ss = value_to_text (*mv_get_value (miss, 0), *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;