From: John Darrington <john@darrington.wattle.id.au>
Date: Thu, 4 Dec 2008 00:14:35 +0000 (+0900)
Subject: Merge branch 'master' into rewrite-sheet
X-Git-Tag: v0.7.1~73
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2165f59ab9eee5272b4037e45477811627cae078;hp=-c;p=pspp-builds.git

Merge branch 'master' into rewrite-sheet

Conflicts:

	src/ui/gui/psppire-case-file.c
	src/ui/gui/psppire-case-file.h
---

2165f59ab9eee5272b4037e45477811627cae078
diff --combined src/ui/gui/find-dialog.c
index c69bce82,66d3a2cd..332e2d8e
--- a/src/ui/gui/find-dialog.c
+++ b/src/ui/gui/find-dialog.c
@@@ -221,7 -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 +464,7 @@@ value_compare (const struct comparator 
  	       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));
  }