Imported Debian patch 0.997-1debian/0.997-1

1 files changed, 28 insertions, 28 deletions

diff --git a/debian/patches/fix_options_handling_fix.patch b/debian/patches/fix_options_handling_fix.patch
index 11d814f..4b6565c 100644
--- a/debian/patches/fix_options_handling_fix.patch
+++ b/debian/patches/fix_options_handling_fix.patch
@@ -4,11 +4,11 @@ Description: Fixup options handling
  be stable, and actually isn't stable when the net backend is used.
 Author: Julien BLACHE <jblache@debian.org>
 
-Index: xsane-0.996/src/xsane-back-gtk.c
+Index: xsane-0.997/src/xsane-back-gtk.c
 ===================================================================
---- xsane-0.996.orig/src/xsane-back-gtk.c	2010-03-13 20:42:28.869742439 +0100
-+++ xsane-0.996/src/xsane-back-gtk.c	2010-03-13 20:43:00.696742544 +0100
-@@ -2226,11 +2226,13 @@
+--- xsane-0.997.orig/src/xsane-back-gtk.c	2002-10-02 13:05:52.000000000 +0200
++++ xsane-0.997/src/xsane-back-gtk.c	2010-05-29 12:30:37.652409969 +0200
+@@ -2229,11 +2229,13 @@
  /* ----------------------------------------------------------------------------------------------------------------- */
  
  void xsane_back_gtk_option_menu_new(GtkWidget *parent, const char *name, char *str_list[],
@@ -23,7 +23,7 @@ Index: xsane-0.996/src/xsane-back-gtk.c
   int i, num_items;
  
    DBG(DBG_proc, "xsane_back_gtk_option_menu_new(%s)\n", name);
-@@ -2248,16 +2250,23 @@
+@@ -2251,16 +2253,23 @@
  
    menu_items = malloc((num_items + 1) * sizeof(menu_items[0]));
  
@@ -49,7 +49,7 @@ Index: xsane-0.996/src/xsane-back-gtk.c
      menu_items[i].elem = elem;
      menu_items[i].index = i;
    }
-@@ -2403,14 +2412,15 @@
+@@ -2406,14 +2415,15 @@
    xsane.standard_hbox = NULL;
    xsane.advanced_hbox = NULL;
  
@@ -67,10 +67,10 @@ Index: xsane-0.996/src/xsane-back-gtk.c
        {
          for (j = 0; j < elem->menu_size; ++j)
          {
-Index: xsane-0.996/src/xsane-back-gtk.h
+Index: xsane-0.997/src/xsane-back-gtk.h
 ===================================================================
---- xsane-0.996.orig/src/xsane-back-gtk.h	2010-03-13 20:42:28.877742647 +0100
-+++ xsane-0.996/src/xsane-back-gtk.h	2010-03-13 20:43:00.696742544 +0100
+--- xsane-0.997.orig/src/xsane-back-gtk.h	2007-02-24 01:56:54.000000000 +0100
++++ xsane-0.997/src/xsane-back-gtk.h	2010-05-29 12:30:37.652409969 +0200
 @@ -117,7 +117,7 @@
  	   gfloat quant, int automatic,
  	   DialogElement *elem, GtkTooltips *tooltips, const char *desc, SANE_Int settable);
@@ -80,10 +80,10 @@ Index: xsane-0.996/src/xsane-back-gtk.h
  extern void xsane_back_gtk_text_entry_new(GtkWidget *parent, const char *name, const char *val,
                  DialogElement *elem, GtkTooltips *tooltips, const char *desc, SANE_Int settable);
  extern void xsane_back_gtk_push_button_callback(GtkWidget *widget, gpointer data);
-Index: xsane-0.996/src/xsane-front-gtk.c
+Index: xsane-0.997/src/xsane-front-gtk.c
 ===================================================================
---- xsane-0.996.orig/src/xsane-front-gtk.c	2010-03-13 20:42:28.886742036 +0100
-+++ xsane-0.996/src/xsane-front-gtk.c	2010-03-13 20:43:00.700741126 +0100
+--- xsane-0.997.orig/src/xsane-front-gtk.c	2002-10-02 13:04:33.000000000 +0200
++++ xsane-0.997/src/xsane-front-gtk.c	2010-05-29 12:30:37.681408559 +0200
 @@ -64,10 +64,10 @@
                                           int *state, void *xsane_toggle_button_callback);
  GtkWidget *xsane_button_new_with_pixmap(GdkWindow *window, GtkWidget *parent, const char *xpm_d[], const char *desc,
@@ -97,7 +97,7 @@ Index: xsane-0.996/src/xsane-front-gtk.c
                                         GtkWidget **data, int option,
                                         void *option_menu_callback, SANE_Int settable, const gchar *widget_name);
  void xsane_range_new(GtkBox *parent, char *labeltext, const char *desc,
-@@ -1007,12 +1007,14 @@
+@@ -1011,12 +1011,14 @@
  
  /* ---------------------------------------------------------------------------------------------------------------------- */
  
@@ -113,7 +113,7 @@ Index: xsane-0.996/src/xsane-front-gtk.c
   int i, num_items;
  
    DBG(DBG_proc, "xsane_option_menu_new\n");
-@@ -1031,9 +1033,16 @@
+@@ -1035,9 +1037,16 @@
      gtk_widget_set_name(menu, widget_name);
    }
  
@@ -131,7 +131,7 @@ Index: xsane-0.996/src/xsane-front-gtk.c
      gtk_container_add(GTK_CONTAINER(menu), item);
  
      if (option_menu_callback)
-@@ -1047,7 +1056,7 @@
+@@ -1051,7 +1060,7 @@
  
      gtk_widget_show(item);
  
@@ -140,7 +140,7 @@ Index: xsane-0.996/src/xsane-front-gtk.c
      menu_items[i].elem  = elem;
      menu_items[i].index = i;
    }
-@@ -1075,7 +1084,7 @@
+@@ -1079,7 +1088,7 @@
  /* ---------------------------------------------------------------------------------------------------------------------- */
  
  void xsane_option_menu_new_with_pixmap(GdkWindow *window, GtkBox *parent, const char *xpm_d[], const char *desc,
@@ -149,7 +149,7 @@ Index: xsane-0.996/src/xsane-front-gtk.c
                                         GtkWidget **data, int option,
                                         void *option_menu_callback, SANE_Int settable, const gchar *widget_name)
  {
-@@ -1094,7 +1103,7 @@
+@@ -1098,7 +1107,7 @@
    gtk_box_pack_start(GTK_BOX(hbox), pixmapwidget, FALSE, FALSE, 2);
    gtk_widget_show(pixmapwidget);
  
@@ -158,10 +158,10 @@ Index: xsane-0.996/src/xsane-front-gtk.c
    gtk_widget_show(hbox);
  }
  
-Index: xsane-0.996/src/xsane-front-gtk.h
+Index: xsane-0.997/src/xsane-front-gtk.h
 ===================================================================
---- xsane-0.996.orig/src/xsane-front-gtk.h	2010-03-13 20:42:28.895741949 +0100
-+++ xsane-0.996/src/xsane-front-gtk.h	2010-03-13 20:43:00.734228256 +0100
+--- xsane-0.997.orig/src/xsane-front-gtk.h	2007-05-17 14:45:19.000000000 +0200
++++ xsane-0.997/src/xsane-front-gtk.h	2010-05-29 12:30:37.705467626 +0200
 @@ -54,10 +54,10 @@
  extern GtkWidget *xsane_button_new_with_pixmap(GdkWindow *window, GtkWidget *parent, const char *xpm_d[], const char *desc, 
                                                 void *xsane_button_callback, gpointer data);
@@ -175,10 +175,10 @@ Index: xsane-0.996/src/xsane-front-gtk.h
                                                GtkWidget **data, int option,
                                                void *option_menu_callback, SANE_Int settable, const gchar *widget_name);
  extern void xsane_range_new(GtkBox *parent, char *labeltext, const char *desc,
-Index: xsane-0.996/src/xsane.c
+Index: xsane-0.997/src/xsane.c
 ===================================================================
---- xsane-0.996.orig/src/xsane.c	2010-03-13 20:42:59.978765829 +0100
-+++ xsane-0.996/src/xsane.c	2010-03-13 20:43:00.759741117 +0100
+--- xsane-0.997.orig/src/xsane.c	2010-05-29 12:30:32.277409114 +0200
++++ xsane-0.997/src/xsane.c	2010-05-29 12:30:37.711409616 +0200
 @@ -876,7 +876,7 @@
              str_list[j] = 0;
              sprintf(str, "%d", (int) val);
@@ -197,7 +197,7 @@ Index: xsane-0.996/src/xsane.c
                                              xsane_resolution_list_callback, SANE_OPTION_IS_SETTABLE(opt->cap), widget_name);
            free(str_list);
          }
-@@ -1490,7 +1490,7 @@
+@@ -1496,7 +1496,7 @@
            set = malloc(opt->size);
            status = xsane_control_option(xsane.dev, xsane.well_known.scansource, SANE_ACTION_GET_VALUE, set, 0);
  
@@ -206,7 +206,7 @@ Index: xsane-0.996/src/xsane.c
                                  _BGT(opt->desc), 0, SANE_OPTION_IS_SETTABLE(opt->cap), 0);
           }
           break;
-@@ -1529,7 +1529,7 @@
+@@ -1536,7 +1536,7 @@
            set = malloc(opt->size);
            status = xsane_control_option(xsane.dev, xsane.well_known.scanmode, SANE_ACTION_GET_VALUE, set, 0);
  
@@ -215,7 +215,7 @@ Index: xsane-0.996/src/xsane.c
                                  _BGT(opt->desc), xsane_scanmode_menu_callback, SANE_OPTION_IS_SETTABLE(opt->cap), 0);
          }
           break;
-@@ -4636,7 +4636,7 @@
+@@ -4646,7 +4646,7 @@
                }
                str_list[j] = 0;
                sprintf(str, "%d", val);
@@ -224,7 +224,7 @@ Index: xsane-0.996/src/xsane.c
                                    SANE_OPTION_IS_SETTABLE(opt->cap));
                free(str_list);
                gtk_widget_show(parent->parent);
-@@ -4734,7 +4734,7 @@
+@@ -4744,7 +4744,7 @@
                }
                str_list[j] = 0;
                sprintf(str, "%g", SANE_UNFIX(val));
@@ -233,7 +233,7 @@ Index: xsane-0.996/src/xsane.c
                free (str_list);
                gtk_widget_show(parent->parent);
              }
-@@ -4771,7 +4771,7 @@
+@@ -4789,7 +4789,7 @@
                   (strcmp (opt->name, SANE_NAME_SCAN_SOURCE) != 0) ) /* do not show scansource */
              {
                /* use a "list-selection" widget */