X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fvar-display.c;h=1b9bf71c4764db71d4a3b88fef9ca0035035b68b;hb=51c3424bf88d0fa110683fbcdd208d0fa5c98179;hp=fcec1e8f827509f97cc3238a156a83a0ccc22a46;hpb=729b96a6bd9342c45e6f65a113fd87c70da85b0a;p=pspp diff --git a/src/ui/gui/var-display.c b/src/ui/gui/var-display.c index fcec1e8f82..1b9bf71c47 100644 --- 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); - 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)) - return g_locale_to_utf8 (gettext (none), -1, 0, 0, err); + return xstrdup (gettext (none)); else { if ( ! mv_has_range (miss)) @@ -45,7 +44,7 @@ missing_values_to_string (const PsppireDict *dict, const struct variable *pv, GE gint i; for (i = 0 ; i < n; ++i ) { - mv[i] = value_to_text (*mv_get_value (miss, i), dict->dict, *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]); @@ -61,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); - l = value_to_text (low, dict->dict, *fmt); - h = value_to_text (high, dict->dict,*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); @@ -72,7 +71,7 @@ missing_values_to_string (const PsppireDict *dict, const struct variable *pv, GE { gchar *ss = 0; - ss = value_to_text (*mv_get_value (miss, 0), dict->dict, *fmt); + ss = value_to_text (*mv_get_value (miss, 0), dict, *fmt); g_string_append (gstr, ", "); g_string_append (gstr, ss);