X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fcompute-dialog.c;h=183aa31b4da8a3e04e961a2da7e2e5fa82de034d;hb=a34c42168e0cd3373860a6cc3f518cb0e329db47;hp=ba5871a822f8c986ce9dc0cc224ab4bdb69ec1c4;hpb=c3e2ab6b50eb3b3c7e0852f2a4e2122f695714ff;p=pspp-builds.git

diff --git a/src/ui/gui/compute-dialog.c b/src/ui/gui/compute-dialog.c
index ba5871a8..183aa31b 100644
--- a/src/ui/gui/compute-dialog.c
+++ b/src/ui/gui/compute-dialog.c
@@ -22,12 +22,13 @@
 #include "psppire-keypad.h"
 #include "psppire-data-window.h"
 #include "psppire-var-store.h"
+#include "psppire-selector.h"
 #include "dialog-common.h"
-#include "dict-display.h"
+#include <libpspp/i18n.h>
 
 #include <language/expressions/public.h>
 #include <language/syntax-string-source.h>
-#include "helper.h"
+#include "executor.h"
 
 static void function_list_populate (GtkTreeView *tv);
 
@@ -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));