diff options
author | Jörg Frings-Fürst <debian@jff.email> | 2018-09-08 19:05:34 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff.email> | 2018-09-08 19:05:34 +0200 |
commit | 267f9007f6f0142853ba5f99f3f72a58f8fb857f (patch) | |
tree | f3869bbd7e4dcefff0c04a8eff4d3903abdc409d /debian/patches/06_word_list_fix.patch | |
parent | ac5d58282438345b4d12a24334efcc0299c15165 (diff) |
Rename patches and remove not used debian/patches/scanadf-sigchld.diff
Diffstat (limited to 'debian/patches/06_word_list_fix.patch')
-rw-r--r-- | debian/patches/06_word_list_fix.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/debian/patches/06_word_list_fix.patch b/debian/patches/06_word_list_fix.patch deleted file mode 100644 index 683e745..0000000 --- a/debian/patches/06_word_list_fix.patch +++ /dev/null @@ -1,38 +0,0 @@ -Author: <jblache@debian.org> -Description: Fix word list handling when current value is not part of the list. -Index: trunk/src/gtkglue.c -=================================================================== ---- trunk.orig/src/gtkglue.c -+++ trunk/src/gtkglue.c -@@ -913,6 +913,7 @@ panel_build (GSGDialog * dialog) - char **str_list; - int i, j; - int num_vector_opts = 0, *vector_opts; -+ SANE_Bool val_in_list; - - main_hbox = gtk_hbox_new (FALSE, 2); - -@@ -1073,13 +1074,23 @@ panel_build (GSGDialog * dialog) - case SANE_CONSTRAINT_WORD_LIST: - /* use a "list-selection" widget */ - num_words = opt->constraint.word_list[0]; -+ if (num_words == 0) -+ { -+ fprintf (stderr, "panel_build: empty word list!\n"); -+ break; -+ } -+ val_in_list = SANE_FALSE; - str_list = malloc ((num_words + 1) * sizeof (str_list[0])); - for (j = 0; j < num_words; ++j) - { -+ if (opt->constraint.word_list[j + 1] == val) -+ val_in_list = SANE_TRUE; - sprintf (str, "%d", opt->constraint.word_list[j + 1]); - str_list[j] = strdup (str); - } - str_list[j] = 0; -+ if (!val_in_list) -+ val = opt->constraint.word_list[1]; - sprintf (str, "%d", val); - option_menu_new (parent, title, str_list, str, elem, - dialog->tooltips, opt->desc, |