X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-var-store.c;h=d495bd98dd16d174a72f5ab9d9a211087394b11b;hb=a2979bf95f3eb83e88a3bd723c09f22548775de5;hp=a2e6685443e3dd5a525d5f985f8e7acb1f4dd709;hpb=e33304f11253c71db3c727d5a51d339efdaf75d7;p=pspp

diff --git a/src/ui/gui/psppire-var-store.c b/src/ui/gui/psppire-var-store.c
index a2e6685443..d495bd98dd 100644
--- a/src/ui/gui/psppire-var-store.c
+++ b/src/ui/gui/psppire-var-store.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2006, 2009, 2010  Free Software Foundation
+   Copyright (C) 2006, 2009, 2010, 2011  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -489,7 +489,7 @@ psppire_var_store_clear (PsppireSheetModel *model,  glong row, glong col)
   switch (col)
     {
     case PSPPIRE_VAR_STORE_COL_LABEL:
-      var_set_label (pv, NULL);
+      var_clear_label (pv);
       return TRUE;
       break;
     }
@@ -588,7 +588,8 @@ psppire_var_store_set_string (PsppireSheetModel *model,
       break;
     case PSPPIRE_VAR_STORE_COL_LABEL:
       {
-	var_set_label (pv, text);
+	var_set_label (pv, text,
+                       psppire_dict_encoding (var_store->dictionary), true);
 	return TRUE;
       }
       break;
@@ -752,7 +753,8 @@ text_for_column (PsppireVarStore *vs,
 	    {
 	      gchar *const vstr = value_to_text (vl->value, dict, *write_spec);
 
-	      return g_strdup_printf (_("{%s,`%s'}_"), vstr, val_lab_get_label (vl));
+	      return g_strdup_printf (_("{%s,`%s'}_"), vstr,
+                                      val_lab_get_escaped_label (vl));
 	    }
 	  }
       }