Finish converting struct variable to an opaque type. In this

[pspp-builds.git] / src / ui / gui / psppire-var-store.c

diff --git a/src/ui/gui/psppire-var-store.c b/src/ui/gui/psppire-var-store.c
index cf38b60dbdb7565b4b3baf58b9f5c30d9e4779ab..daeeb23e56569427825ff1d4cd362b9129605550 100644 (file)
--- a/src/ui/gui/psppire-var-store.c
+++ b/src/ui/gui/psppire-var-store.c
@@ -156,7 +156,7 @@ psppire_var_store_item_editable(PsppireVarStore *var_store, gint row, gint colum
   if ( !pv ) 
     return TRUE;
 
-  if ( ALPHA == psppire_variable_get_type(pv) && column == COL_DECIMALS ) 
+  if ( VAR_STRING == psppire_variable_get_type(pv) && column == COL_DECIMALS ) 
     return FALSE;
 
   write_spec = psppire_variable_get_write_spec(pv);
@@ -504,9 +504,12 @@ text_for_column(const struct PsppireVariable *pv, gint c, GError **err)
          case FMT_A:
            return g_locale_to_utf8(gettext(type_label[VT_STRING]), -1, 0, 0, err);
            break;
-         default:
-           g_warning("Unknown format: \"%s\"\n", 
-                     fmt_to_string(write_spec));
+         default: 
+            {
+              char str[FMT_STRING_LEN_MAX + 1];
+              g_warning("Unknown format: \"%s\"\n", 
+                        fmt_to_string(write_spec, str)); 
+            }
            break;
          }
       }