X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fvar-display.c;h=5f85af2e736cc78286891845f47dc9c1e853c226;hb=380110cc2fc8ee8511c2c4a1b3ee1da8a70cdb18;hp=7081e9e2c0bde74fc4c9424f729733ba8a74c1c2;hpb=3bbb4370239deb29ebbf813d258aef6249e2a431;p=pspp

diff --git a/src/ui/gui/var-display.c b/src/ui/gui/var-display.c
index 7081e9e2c0..5f85af2e73 100644
--- a/src/ui/gui/var-display.c
+++ b/src/ui/gui/var-display.c
@@ -16,14 +16,13 @@
 static const gchar none[] = N_("None");
 
 
-gchar *
+const gchar *
 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))
@@ -70,7 +69,7 @@ missing_values_to_string (const PsppireDict *dict, const struct variable *pv, GE
 
 	  if ( mv_has_value (miss))
 	    {
-	      gchar *ss = 0;
+	      gchar *ss = NULL;
 
 	      ss = value_to_text (*mv_get_value (miss, 0), dict, *fmt);