Redesign the character re-encoding code.

[pspp-builds.git] / src / ui / gui / compute-dialog.c

diff --git a/src/ui/gui/compute-dialog.c b/src/ui/gui/compute-dialog.c
index e3d1c6a1410c645b6998ec89dfb570d0cefe3a3c..a42ce4febf438d338727a68a9f70728217b8c2d4 100644 (file)
--- a/src/ui/gui/compute-dialog.c
+++ b/src/ui/gui/compute-dialog.c
@@ -24,6 +24,7 @@
 #include "psppire-var-store.h"
 #include "psppire-selector.h"
 #include "dialog-common.h"
+#include <libpspp/i18n.h>
 
 #include <language/expressions/public.h>
 #include <language/syntax-string-source.h>
@@ -397,7 +398,7 @@ compute_dialog (GObject *o, gpointer data)
   gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
 
   g_object_set (dict_view,
-               "model", vs->dict,
+               "dictionary", vs->dict,
                "selection-mode", GTK_SELECTION_SINGLE,
                NULL);
 
@@ -631,7 +632,9 @@ insert_source_row_into_text_view (GtkTreeIter iter,
 
   gtk_tree_path_free (path);
 
-  name = pspp_locale_to_utf8 (var_get_name (var), -1, NULL);
+  name = recode_string (UTF8, psppire_dict_encoding (dict),
+                       var_get_name (var),
+                       -1);
 
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dest));