New file: builder-wrapper.h and builder-wrapper.c

[pspp-builds.git] / src / ui / gui / variable-info-dialog.c

diff --git a/src/ui/gui/variable-info-dialog.c b/src/ui/gui/variable-info-dialog.c
index 37f501a41381d2a987af1b270e7eac6c9718ac76..1cd9b1d7d1eb9ee37fe1c5d8afec4fcd8dd269fc 100644 (file)
--- 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, 2010, 2011  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
@@ -29,6 +29,7 @@
 #include "psppire-dialog.h"
 #include "psppire-dictview.h"
 #include "psppire-var-store.h"
+#include "builder-wrapper.h"
 #include "helper.h"
 
 
@@ -55,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,7 +91,7 @@ populate_text (PsppireDictView *treeview, gpointer data)
   g_free (text);
 
   g_string_append_printf (gstring, _("Measurement Level: %s\n"),
-                         measure_to_string (var, NULL));
+                         measure_to_string (var_get_measure (var)));
 
 
   /* Value Labels */
@@ -109,8 +110,7 @@ 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_escaped_label (vl));