casa-mp-base

# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=487475

diff -urw ../xsane-0.996.orig/src/xsane-back-gtk.c ./src/xsane-back-gtk.c

--- ../xsane-0.996.orig/src/xsane-back-gtk.c    2007-08-13 09:49:34.000000000 +0200

+++ ./src/xsane-back-gtk.c  2010-05-01 20:48:41.000000000 +0200

@@ -2226,11 +2226,13 @@

 /* ----------------------------------------------------------------------------------------------------------------- */

 void xsane_back_gtk_option_menu_new(GtkWidget *parent, const char *name, char *str_list[],

-        const char *val, DialogElement *elem,

+        const char *val, SANE_Constraint_Type constraint_type, DialogElement *elem,

         GtkTooltips *tooltips, const char *desc, SANE_Int settable)

 {

  GtkWidget *hbox, *label, *option_menu, *menu, *item;

  MenuItem *menu_items;

+ int dup_string;

+ char *strval;

  int i, num_items;

   DBG(DBG_proc, "xsane_back_gtk_option_menu_new(%s)\n", name);

@@ -2248,16 +2250,23 @@

   menu_items = malloc((num_items + 1) * sizeof(menu_items[0]));

+  dup_string = (constraint_type == SANE_CONSTRAINT_STRING_LIST);

+

   menu = gtk_menu_new();

   for (i = 0; i < num_items; ++i)

   {

-    item = gtk_menu_item_new_with_label(_BGT(str_list[i]));

+    if (dup_string)

+      strval = strdup(str_list[i]);

+    else

+      strval = str_list[i];

+

+    item = gtk_menu_item_new_with_label(_BGT(strval));

     gtk_container_add(GTK_CONTAINER(menu), item);

     g_signal_connect(GTK_OBJECT(item), "activate", (GtkSignalFunc) xsane_back_gtk_option_menu_callback, menu_items + i);

     gtk_widget_show(item);

-    menu_items[i].label = str_list[i];

+    menu_items[i].label = strval;

     menu_items[i].elem = elem;

     menu_items[i].index = i;

   }

@@ -2403,14 +2412,15 @@

   xsane.standard_hbox = NULL;

   xsane.advanced_hbox = NULL;

-  /* free the menu labels of integer/fix-point word-lists: */

+  /* free the menu labels */

   for (i = 0; i < xsane.num_elements; ++i)

   {

     if (xsane.element[i].menu)

     {

       opt = xsane_get_option_descriptor(xsane.dev, i);

       elem = xsane.element + i;

-      if (opt->type != SANE_TYPE_STRING)

+      if ((opt->type != SANE_TYPE_STRING)

+     || (opt->constraint_type == SANE_CONSTRAINT_STRING_LIST))

       {

         for (j = 0; j < elem->menu_size; ++j)

         {