X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fval-labs-dialog.c;h=04f9534d55dd9f45f8163b07678ba065c977767b;hb=729b96a6bd9342c45e6f65a113fd87c70da85b0a;hp=0af805912da167444ece82f14bd079c03f054da9;hpb=5c3291dc396b795696e94f47780308fd7ace6fc4;p=pspp-builds.git

diff --git a/src/ui/gui/val-labs-dialog.c b/src/ui/gui/val-labs-dialog.c
index 0af80591..04f9534d 100644
--- a/src/ui/gui/val-labs-dialog.c
+++ b/src/ui/gui/val-labs-dialog.c
@@ -337,19 +337,15 @@ on_remove (GtkWidget *w, gpointer data)
 static void
 on_select_row (GtkTreeView *treeview, gpointer data)
 {
-  gchar *labeltext;
   struct val_labs_dialog *dialog = data;
 
   union value value;
-  const char *label;
+  const char *label = NULL;
 
   gchar *text;
 
-  PsppireVarStore *var_store =
-    PSPPIRE_VAR_STORE (psppire_sheet_get_model (dialog->vs));
-
   get_selected_tuple (dialog, &value, &label);
-  text = value_to_text (value, *var_get_write_format (dialog->pv));
+  text = value_to_text (value, NULL, *var_get_write_format (dialog->pv));
 
   g_signal_handler_block (GTK_ENTRY (dialog->value_entry),
 			 dialog->value_handler_id);
@@ -364,12 +360,8 @@ on_select_row (GtkTreeView *treeview, gpointer data)
 			 dialog->change_handler_id);
 
 
-  labeltext = recode_string (UTF8, psppire_dict_encoding (var_store->dict),
-			     label, -1);
-
   gtk_entry_set_text (GTK_ENTRY (dialog->label_entry),
-		     labeltext);
-  g_free (labeltext);
+		      label);
 
   g_signal_handler_unblock (GTK_ENTRY (dialog->label_entry),
 			 dialog->change_handler_id);
@@ -481,9 +473,6 @@ repopulate_dialog (struct val_labs_dialog *dialog)
 
   GtkTreeIter iter;
 
-  PsppireVarStore *var_store =
-    PSPPIRE_VAR_STORE (psppire_sheet_get_model (dialog->vs));
-
   GtkListStore *list_store = gtk_list_store_new (2,
 						 G_TYPE_STRING,
 						 G_TYPE_DOUBLE);
@@ -508,16 +497,11 @@ repopulate_dialog (struct val_labs_dialog *dialog)
       const struct val_lab *vl = labels[i];
 
       gchar *const vstr  =
-	value_to_text (vl->value,
+	value_to_text (vl->value, NULL,
 		      *var_get_write_format (dialog->pv));
 
-      gchar *labeltext =
-	recode_string (UTF8,
-		       psppire_dict_encoding (var_store->dict),
-		       val_lab_get_label (vl), -1);
-
       gchar *const text = g_strdup_printf ("%s = \"%s\"",
-					   vstr, labeltext);
+					   vstr, val_lab_get_label (vl));
 
       gtk_list_store_append (list_store, &iter);
       gtk_list_store_set (list_store, &iter,
@@ -525,7 +509,6 @@ repopulate_dialog (struct val_labs_dialog *dialog)
 			  1, vl->value.f,
 			  -1);
 
-      g_free (labeltext);
       g_free (text);
       g_free (vstr);
     }