change name and description for new options

diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c
index a7c70c50021007e7b4d8d319529f800a9ba6175a..89598103e7e30220c39beeba1d11fd4afb6f3bc8 100644 (file)
--- a/src/kds_s2000w_option_descriptors.c
+++ b/src/kds_s2000w_option_descriptors.c
@@ -507,9 +507,9 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_color_sharpen()
        constraint_color_sharpen[4] = NULL;
 
        SANE_Option_Descriptor descriptor = {
-               "colorsharpen",
-               "colorsharpen",
-               "colorsharpen",
+               "color-sharpen",
+               "color sharpen",
+               "color sharpen",
                SANE_TYPE_STRING,
                SANE_UNIT_NONE,
                sizeof(SANE_String_Const*) * 5,
@@ -534,8 +534,8 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_multifeed_sensitivity()
 
        SANE_Option_Descriptor descriptor = {
                "multifeed-sensitivity",
-               "multifeed-sensitivity",
-               "multifeed-sensitivity",
+               "multifeed sensitivity",
+               "multifeed sensitivity",
                SANE_TYPE_STRING,
                SANE_UNIT_NONE,
                sizeof(SANE_String_Const*) * 5,

diff --git a/tests/kds_s2000w_option_descriptor_tests.c b/tests/kds_s2000w_option_descriptor_tests.c
index ffb8235d60aa6270634ac38763e49e25234408d1..4e833068f82339539a91dd4be139af56ec84ebe5 100644 (file)
--- a/tests/kds_s2000w_option_descriptor_tests.c
+++ b/tests/kds_s2000w_option_descriptor_tests.c
@@ -210,9 +210,9 @@ void kds_s2000w_option_get_descriptor_eleven_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(11);
 
-       assert_string_equal("colorsharpen", option->name);
-       assert_string_equal("colorsharpen", option->title);
-       assert_string_equal("colorsharpen", option->desc);
+       assert_string_equal("color-sharpen", option->name);
+       assert_string_equal("color sharpen", option->title);
+       assert_string_equal("color sharpen", option->desc);
        assert_int_equal(SANE_TYPE_STRING, option->type);
        assert_int_equal(SANE_UNIT_NONE, option->unit);
        assert_int_equal(sizeof(SANE_String_Const*) * 5,  option->size);
@@ -404,8 +404,8 @@ void kds_s2000w_option_get_descriptor_twentytwo_test()
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(22);
 
        assert_string_equal("multifeed-sensitivity", option->name);
-       assert_string_equal("multifeed-sensitivity", option->title);
-       assert_string_equal("multifeed-sensitivity", option->desc);
+       assert_string_equal("multifeed sensitivity", option->title);
+       assert_string_equal("multifeed sensitivity", option->desc);
        assert_int_equal(SANE_TYPE_STRING, option->type);
        assert_int_equal(SANE_UNIT_NONE, option->unit);
        assert_int_equal(sizeof(SANE_String_Const*) * 5, option->size);