Merge remote-tracking branch 'origin/master' into sheet

[pspp] / src / ui / gui / psppire-dict.c

diff --git a/src/ui/gui/psppire-dict.c b/src/ui/gui/psppire-dict.c
index 1efe9528056d570d36b7eeee773db1d8e258a4c0..0a0c3ae0b4f1884b32803e905fd4781207607833 100644 (file)
--- a/src/ui/gui/psppire-dict.c
+++ b/src/ui/gui/psppire-dict.c
@@ -701,17 +701,17 @@ tree_model_column_type (GtkTreeModel *model, gint index)
   switch (index)
     {
     case DICT_TVM_COL_NAME:
-      t = G_TYPE_STRING;
-      break;
-    case DICT_TVM_COL_VAR:
-      t = PSPPIRE_VAR_PTR_TYPE;
-      break;
     case DICT_TVM_COL_LABEL:
       t = G_TYPE_STRING;
       break;
+    case DICT_TVM_COL_DECIMAL:
+    case DICT_TVM_COL_WIDTH:
     case DICT_TVM_COL_COLUMNS:
       t = G_TYPE_INT;
       break;
+    case DICT_TVM_COL_VAR:
+      t = PSPPIRE_VAR_PTR_TYPE;
+      break;
     case DICT_TVM_COL_ALIGNMENT:
       t = align_enum_type;
       break;
@@ -769,11 +769,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);