projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/stable'
[pspp-builds.git]
/
src
/
ui
/
gui
/
psppire-dict.c
diff --git
a/src/ui/gui/psppire-dict.c
b/src/ui/gui/psppire-dict.c
index d6d278f596a6bd71c52993252f0d694cf77cdcd8..9e2190b2909e181475309ed1c58e10b3ce304872 100644
(file)
--- 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 <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>
#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_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);
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:
{
{
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_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:
}
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 ();
break;
default:
g_return_if_reached ();