X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Ffind-dialog.c;h=332e2d8e0c3141c0c95a6690f9c087fbec3af55e;hb=38c2638eed90f33225870563c4be183097e4155a;hp=87c88bf6e227edb996042bf9204d61117a762f67;hpb=f82952d22e200e1b35cea23545857a2cf2f02c66;p=pspp-builds.git

diff --git a/src/ui/gui/find-dialog.c b/src/ui/gui/find-dialog.c
index 87c88bf6..332e2d8e 100644
--- a/src/ui/gui/find-dialog.c
+++ b/src/ui/gui/find-dialog.c
@@ -27,6 +27,7 @@ which match particular strings */
 #include "data-editor.h"
 #include "dict-display.h"
 #include <data/value.h>
+#include <data/format.h>
 #include <data/datasheet.h>
 #include <data/data-in.h>
 #include "psppire-data-store.h"
@@ -47,7 +48,6 @@ which match particular strings */
 
 
 /* FIXME: These shouldn't be here */
-#include <gtksheet/gtksheet.h>
 #include "psppire-var-store.h"
 
 struct find_dialog
@@ -115,8 +115,8 @@ do_find (GObject *obj, const struct find_dialog *fd)
 
   if ( x != -1)
     {
-      gtk_notebook_set_page (GTK_NOTEBOOK (fd->de->data_editor),
-			     PSPPIRE_DATA_EDITOR_DATA_VIEW);
+      gtk_notebook_set_current_page (GTK_NOTEBOOK (fd->de->data_editor),
+				     PSPPIRE_DATA_EDITOR_DATA_VIEW);
 
       g_object_set (fd->de->data_editor,
 		    "current-case", x,
@@ -221,7 +221,7 @@ find_dialog (GObject *o, gpointer data)
 		NULL);
 
   fd.dict = vs->dict;
-  fd.data = ds->case_file->datasheet;
+  fd.data = ds->datasheet;
 
   fd.variable_entry        = get_widget_assert (fd.xml, "find-variable-entry");
   fd.value_entry           = get_widget_assert (fd.xml, "find-value-entry");
@@ -464,7 +464,7 @@ value_compare (const struct comparator *cmptr,
 	       const union value *v)
 {
   const struct value_comparator *vc = (const struct value_comparator *) cmptr;
-  return 0 == compare_values (v, vc->pattern, var_get_width (cmptr->var));
+  return 0 == value_compare_3way (v, vc->pattern, var_get_width (cmptr->var));
 }