X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Ffind-dialog.c;h=11ec0603d4dfd98ee65954b1fed34af49feb4bc2;hb=66153a44d861ccddf6a176ec5a94ffb959232ad6;hp=faeb8f6490578ad703096f40cbce96cce44886a8;hpb=b40baf410822471fbdeeec553693619d60d7c7b6;p=pspp-builds.git diff --git a/src/ui/gui/find-dialog.c b/src/ui/gui/find-dialog.c index faeb8f64..11ec0603 100644 --- a/src/ui/gui/find-dialog.c +++ b/src/ui/gui/find-dialog.c @@ -219,7 +219,8 @@ find_dialog (GObject *o, gpointer data) "data-store", &ds, NULL); - fd.dict = vs->dict; + g_object_get (vs, "dictionary", &fd.dict, NULL); + fd.data = ds->datasheet; fd.variable_entry = get_widget_assert (fd.xml, "find-variable-entry"); @@ -585,8 +586,6 @@ cmptr_value_destroy (struct comparator *cmptr) static struct comparator * value_comparator_create (const struct variable *var, const PsppireDict *dict, const char *target) { - const struct fmt_spec *fmt; - int width ; struct value_comparator *vc = xzalloc (sizeof (*vc)); struct comparator *cmptr = (struct comparator *) vc; @@ -596,12 +595,7 @@ value_comparator_create (const struct variable *var, const PsppireDict *dict, co cmptr->destroy = cmptr_value_destroy; cmptr->dict = dict; - width = var_get_width (var); - fmt = var_get_write_format (var); - - value_init (&vc->pattern, width); - - text_to_value (target, &vc->pattern, dict, *var_get_write_format (var) ); + text_to_value (target, dict, var, &vc->pattern); return cmptr; }