X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dict.c;h=9e2190b2909e181475309ed1c58e10b3ce304872;hb=45fb19608ffa759f7a0221878d1a9a72c6727dc7;hp=8ff92a48fc57c01f7d255ab27001dd4cdc5c5f15;hpb=5c3291dc396b795696e94f47780308fd7ace6fc4;p=pspp-builds.git

diff --git a/src/ui/gui/psppire-dict.c b/src/ui/gui/psppire-dict.c
index 8ff92a48..9e2190b2 100644
--- a/src/ui/gui/psppire-dict.c
+++ b/src/ui/gui/psppire-dict.c
@@ -21,6 +21,7 @@
 #include <gtk/gtk.h>
 #include <ui/gui/psppire-marshal.h>
 
+#include "psppire-var-ptr.h"
 #include "psppire-dict.h"
 #include <data/dictionary.h>
 #include <data/missing-values.h>
@@ -648,7 +649,7 @@ tree_model_column_type (GtkTreeModel *model, gint index)
       return G_TYPE_STRING;
       break;
     case DICT_TVM_COL_VAR:
-      return G_TYPE_POINTER;
+      return PSPPIRE_VAR_PTR_TYPE;
       break;
     default:
       g_return_val_if_reached ((GType)0);
@@ -760,16 +761,13 @@ tree_model_get_value (GtkTreeModel *model, GtkTreeIter *iter,
     {
     case DICT_TVM_COL_NAME:
       {
-	gchar *name = recode_string (UTF8, psppire_dict_encoding (dict),
-				     var_get_name (var), -1);
 	g_value_init (value, G_TYPE_STRING);
-	g_value_set_string (value, name);
-	g_free (name);
+	g_value_set_string (value, var_get_name (var));
       }
       break;
     case DICT_TVM_COL_VAR:
-      g_value_init (value, G_TYPE_POINTER);
-      g_value_set_pointer (value, var);
+      g_value_init (value, PSPPIRE_VAR_PTR_TYPE);
+      g_value_set_boxed (value, var);
       break;
     default:
       g_return_if_reached ();
@@ -859,11 +857,10 @@ psppire_dict_dump (const PsppireDict *dict)
     {
       const struct variable *v = psppire_dict_get_variable (dict, i);
       int di = var_get_dict_index (v);
-      g_print ("\"%s\" idx=%d, fv=%d, size=%d\n",
+      g_print ("\"%s\" idx=%d, fv=%d\n",
 	       var_get_name(v),
 	       di,
-	       var_get_case_index(v),
-	       value_cnt_from_width(var_get_width(v)));
+	       var_get_case_index(v));
 
     }
 }