X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fcompute-dialog.c;h=8a98bb3dcac48d8158812d5f9b96bb7c4df6b687;hb=b94025a12799b6826a772731b8f58907dca2cf5c;hp=a42ce4febf438d338727a68a9f70728217b8c2d4;hpb=537fdeb3702c011e05d7826a8d556a7beeba2605;p=pspp-builds.git

diff --git a/src/ui/gui/compute-dialog.c b/src/ui/gui/compute-dialog.c
index a42ce4fe..8a98bb3d 100644
--- a/src/ui/gui/compute-dialog.c
+++ b/src/ui/gui/compute-dialog.c
@@ -28,7 +28,7 @@
 
 #include <language/expressions/public.h>
 #include <language/syntax-string-source.h>
-#include "helper.h"
+#include "executor.h"
 
 static void function_list_populate (GtkTreeView *tv);
 
@@ -379,7 +379,6 @@ compute_dialog (GObject *o, gpointer data)
   GtkWidget *functions = get_widget_assert (xml, "compute-treeview2");
   GtkWidget *keypad    = get_widget_assert (xml, "psppire-keypad1");
   GtkWidget *target    = get_widget_assert (xml, "compute-entry1");
-  GtkWidget *syntax_area = get_widget_assert (xml, "compute-textview1");
   GtkWidget *var_selector = get_widget_assert (xml, "compute-selector1");
   GtkWidget *func_selector = get_widget_assert (xml, "compute-selector2");
   GtkWidget *type_and_label = get_widget_assert (xml, "compute-button1");
@@ -389,7 +388,7 @@ compute_dialog (GObject *o, gpointer data)
 
 
   g_object_get (de->data_editor, "var-store", &vs, NULL);
-  scd.dict = vs->dict;
+  g_object_get (vs, "dictionary", &scd.dict, NULL);
   scd.use_type = FALSE;
 
   g_signal_connect (expression, "toggled",
@@ -397,26 +396,18 @@ compute_dialog (GObject *o, gpointer data)
 
   gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
 
-  g_object_set (dict_view,
-		"dictionary", vs->dict,
+  
+  g_object_set (dict_view, "model", scd.dict,
 		"selection-mode", GTK_SELECTION_SINGLE,
 		NULL);
 
-  psppire_selector_set_subjects (PSPPIRE_SELECTOR (var_selector),
-				 dict_view, syntax_area,
-				 insert_source_row_into_text_view,
-				 NULL,
-				 NULL);
-
+  psppire_selector_set_select_func (PSPPIRE_SELECTOR (var_selector),
+				    insert_source_row_into_text_view, NULL);
 
   function_list_populate (GTK_TREE_VIEW (functions));
 
-  psppire_selector_set_subjects (PSPPIRE_SELECTOR (func_selector),
-				 functions, syntax_area,
-				 insert_function_into_syntax_area,
-				 NULL,
-				 NULL);
-
+  psppire_selector_set_select_func (PSPPIRE_SELECTOR (func_selector),
+				    insert_function_into_syntax_area, NULL);
 
   scd.xml = xml;
 
@@ -604,7 +595,6 @@ insert_source_row_into_text_view (GtkTreeIter iter,
   gint *idx;
   struct variable *var;
   GtkTreeIter dict_iter;
-  gchar *name;
   GtkTextBuffer *buffer;
 
   g_return_if_fail (GTK_IS_TEXT_VIEW (dest));
@@ -632,15 +622,10 @@ insert_source_row_into_text_view (GtkTreeIter iter,
 
   gtk_tree_path_free (path);
 
-  name = recode_string (UTF8, psppire_dict_encoding (dict),
-			var_get_name (var),
-			-1);
-
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dest));
 
   erase_selection (buffer);
 
-  gtk_text_buffer_insert_at_cursor (buffer, name, -1);
+  gtk_text_buffer_insert_at_cursor (buffer, var_get_name (var), -1);
 
-  g_free (name);
 }