X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fvar-display.c;h=fcec1e8f827509f97cc3238a156a83a0ccc22a46;hb=729b96a6bd9342c45e6f65a113fd87c70da85b0a;hp=50e0df4bbc7ec360869195c387ce9c1deadda119;hpb=dd5535725f86158e55b3fc263c17058005b0c0a5;p=pspp-builds.git

diff --git a/src/ui/gui/var-display.c b/src/ui/gui/var-display.c
index 50e0df4b..fcec1e8f 100644
--- 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 )
 	    {
-	      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->dict, *fmt);
 	      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
 	{
@@ -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);
 
-	  l = value_to_text (low, *fmt);
-	  h = value_to_text (high, *fmt);
+	  l = value_to_text (low, dict->dict, *fmt);
+	  h = value_to_text (high, dict->dict,*fmt);
 
 	  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;
-	      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->dict, *fmt);
 
 	      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;