diff --git a/ChangeLog b/ChangeLog index 65e7fc296..b8497de2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2008-05-23 Jonathan Bravo Lopez + * backend/hp3900_sane.c: setting appropiate capabilities to some options. + 2008-05-22 Jonathan Bravo Lopez * backend/hp3900_sane.c: use 1.1.0 well-known option group strings. * backend/hp3900_config.c, backend/hp3900_debug.c, diff --git a/backend/hp3900_sane.c b/backend/hp3900_sane.c index b9bc91e05..f0f059b77 100644 --- a/backend/hp3900_sane.c +++ b/backend/hp3900_sane.c @@ -1557,9 +1557,7 @@ options_init (TScanner * scanner) pDesc->desc = SANE_I18N ("Shows chipset name used in device."); pDesc->type = SANE_TYPE_STRING; pDesc->constraint_type = SANE_CONSTRAINT_NONE; - pDesc->cap = - SANE_CAP_ADVANCED | SANE_CAP_SOFT_SELECT | - SANE_CAP_SOFT_DETECT; + pDesc->cap = SANE_CAP_ADVANCED | SANE_CAP_SOFT_DETECT; pVal->s = strdup (SANE_I18N ("Unknown")); break; @@ -1570,9 +1568,7 @@ options_init (TScanner * scanner) pDesc->type = SANE_TYPE_INT; pDesc->unit = SANE_UNIT_NONE; pDesc->constraint_type = SANE_CONSTRAINT_NONE; - pDesc->cap = - SANE_CAP_ADVANCED | SANE_CAP_SOFT_SELECT | - SANE_CAP_SOFT_DETECT; + pDesc->cap = SANE_CAP_ADVANCED | SANE_CAP_SOFT_DETECT; pVal->w = -1; break; @@ -1584,9 +1580,7 @@ options_init (TScanner * scanner) pDesc->type = SANE_TYPE_INT; pDesc->unit = SANE_UNIT_NONE; pDesc->constraint_type = SANE_CONSTRAINT_NONE; - pDesc->cap = - SANE_CAP_ADVANCED | SANE_CAP_SOFT_SELECT | - SANE_CAP_SOFT_DETECT; + pDesc->cap = SANE_CAP_ADVANCED | SANE_CAP_SOFT_DETECT; pVal->w = -1; break; @@ -2176,13 +2170,6 @@ option_set (TScanner * scanner, SANE_Int optid, void *value, SANE_Int * pInfo) info |= SANE_INFO_RELOAD_OPTIONS; break; - case opt_chipname: - case opt_chipid: - case opt_scancount: - bknd_info (scanner); - info |= SANE_INFO_RELOAD_OPTIONS; - break; - default: rst = SANE_STATUS_INVAL; break;