X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fcompute-dialog.c;h=1154b5125581abc203ef04ace7ba202d2a5448b3;hb=b6088c04a2380078af7ce9c18b6ba52a0f6b38cf;hp=bac6216729350cd040ab447a4191e09b6f49e168;hpb=a9a69251edd625a50f271af5d64c157533b5fe48;p=pspp

diff --git a/src/ui/gui/compute-dialog.c b/src/ui/gui/compute-dialog.c
index bac6216729..1154b51255 100644
--- a/src/ui/gui/compute-dialog.c
+++ b/src/ui/gui/compute-dialog.c
@@ -363,15 +363,14 @@ contents_plausible (gpointer data)
 
 /* Pops up the Compute dialog box */
 void
-compute_dialog (GObject *o, gpointer data)
+compute_dialog (PsppireDataWindow *de)
 {
   gint response;
-  PsppireDataWindow *de = data;
 
   PsppireVarStore *vs = NULL;
   struct compute_dialog scd;
 
-  GtkBuilder *xml = builder_new ("psppire.ui");
+  GtkBuilder *xml = builder_new ("compute.ui");
 
   GtkWidget *dialog = get_widget_assert   (xml, "compute-variable-dialog");
 
@@ -379,7 +378,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");
@@ -402,19 +400,13 @@ compute_dialog (GObject *o, gpointer data)
 		"selection-mode", GTK_SELECTION_SINGLE,
 		NULL);
 
-  psppire_selector_set_subjects (PSPPIRE_SELECTOR (var_selector),
-				 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),
-				 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;
 
@@ -456,7 +448,7 @@ compute_dialog (GObject *o, gpointer data)
       {
 	gchar *syntax = generate_syntax (&scd);
 
-	paste_syntax_in_new_window (syntax);
+	paste_syntax_to_window (syntax);
 
 	g_free (syntax);
       }