X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dict.c;h=0ee608cadef083eacb9f770aecfb37ff9d32af72;hb=9a4fd397b9ef95cbeb033cd7d92a3bebfe8709fc;hp=5e95550efb24e5dafa99499b8c56ca98cc960895;hpb=b2b2b0a29f80de89d96bcceea90f117930ab47b9;p=pspp diff --git a/src/ui/gui/psppire-dict.c b/src/ui/gui/psppire-dict.c index 5e95550efb..0ee608cade 100644 --- a/src/ui/gui/psppire-dict.c +++ b/src/ui/gui/psppire-dict.c @@ -625,6 +625,9 @@ tree_model_column_type (GtkTreeModel *model, gint index) case DICT_TVM_COL_VAR: return PSPPIRE_VAR_PTR_TYPE; break; + case DICT_TVM_COL_LABEL: + return G_TYPE_STRING; + break; default: g_return_val_if_reached ((GType)0); break; @@ -677,11 +680,11 @@ tree_model_iter_next (GtkTreeModel *model, GtkTreeIter *iter) struct variable *var; gint idx; - g_return_val_if_fail (iter->stamp == dict->stamp, FALSE); - if ( iter == NULL || iter->user_data == NULL) return FALSE; + g_return_val_if_fail (iter->stamp == dict->stamp, FALSE); + var = iter->user_data; idx = var_get_dict_index (var);