Merge branch 'master' into rewrite-sheet

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

diff --git a/src/ui/gui/find-dialog.c b/src/ui/gui/find-dialog.c
index 7764d04a9633b2cac6aed1decddbd858e45bd830..332e2d8e0c3141c0c95a6690f9c087fbec3af55e 100644 (file)
--- a/src/ui/gui/find-dialog.c
+++ b/src/ui/gui/find-dialog.c
@@ -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, cmptr->var);
+  return 0 == value_compare_3way (v, vc->pattern, var_get_width (cmptr->var));
 }