X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fvariable-info-dialog.c;h=1cd9b1d7d1eb9ee37fe1c5d8afec4fcd8dd269fc;hb=7a48928f76e0f4599be8f65b1b3bafd03d73a628;hp=16a5f462945e2c957ee7a783f1c93f58723b3143;hpb=52c400a0ac67e4a43c5cae5a0d40e1452326240c;p=pspp

diff --git a/src/ui/gui/variable-info-dialog.c b/src/ui/gui/variable-info-dialog.c
index 16a5f46294..1cd9b1d7d1 100644
--- a/src/ui/gui/variable-info-dialog.c
+++ b/src/ui/gui/variable-info-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007, 2009  Free Software Foundation
+   Copyright (C) 2007, 2009, 2010, 2011, 2012  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,7 +20,6 @@
 #include <data/variable.h>
 #include <data/format.h>
 #include <data/value-labels.h>
-#include <language/syntax-string-source.h>
 #include <libpspp/i18n.h>
 
 #include "variable-info-dialog.h"
@@ -30,6 +29,7 @@
 #include "psppire-dialog.h"
 #include "psppire-dictview.h"
 #include "psppire-var-store.h"
+#include "builder-wrapper.h"
 #include "helper.h"
 
 
@@ -56,7 +56,7 @@ label_to_string (const struct variable *var)
 static void
 populate_text (PsppireDictView *treeview, gpointer data)
 {
-  gchar *text = 0;
+  gchar *text = NULL;
   GString *gstring;
   PsppireDict *dict;
 
@@ -90,9 +90,8 @@ populate_text (PsppireDictView *treeview, gpointer data)
 			  text);
   g_free (text);
 
-  text = measure_to_string (var, NULL);
   g_string_append_printf (gstring, _("Measurement Level: %s\n"),
-			  text);
+			  measure_to_string (var_get_measure (var)));
 
 
   /* Value Labels */
@@ -111,10 +110,10 @@ populate_text (PsppireDictView *treeview, gpointer data)
       for (i = 0; i < n_labels; i++)
         {
           const struct val_lab *vl = labels[i];
-	  gchar *const vstr  =
-	    value_to_text (vl->value,  dict, *var_get_print_format (var));
+	  gchar *const vstr  = value_to_text (vl->value,  var);
 
-	  g_string_append_printf (gstring, _("%s %s\n"), vstr, val_lab_get_label (vl));
+	  g_string_append_printf (gstring, _("%s %s\n"),
+                                  vstr, val_lab_get_escaped_label (vl));
 
 	  g_free (vstr);
 	}