Merge branch 'upstream_patches' into 'master'

various: upstream of patches from Ubuntu and Fedora.

See merge request sane-project/frontends!27

doc/scanadf.man

@@ -224,7 +224,7 @@ invoke
 via a command-line of the form:
 .PP
 .RS
-scanadf --help --device
+scanadf \-\-help \-\-device
 .I dev
 .RE
 .PP
@@ -273,13 +273,13 @@ work at this time are:
 - Bell+Howell Copiscan II series scanners.
 .br
 .B sane-hp
-- Hewlett Packard scanners.  The --source=ADF option must be specified (earlier
+- Hewlett Packard scanners.  The \-\-source=ADF option must be specified (earlier
-versions of the backend used the options --scantype=ADF
+versions of the backend used the options \-\-scantype=ADF
-or --scan-from-adf option, instead).
+or \-\-scan-from-adf option, instead).
 .br
 .B sane-umax
 - UMAX scanners.  Support exists in build 12 and later.
-The --source="Automatic Document Feeder" option must be specified.
+The \-\-source="Automatic Document Feeder" option must be specified.
 .br
 .RE
 

doc/xscanimage.man

@@ -15,7 +15,7 @@ xscanimage \- scan an image
 .B xscanimage
 provides a graphical user-interface to control an image
 acquisition device such as a flatbed scanner or a camera.  It allows
-previewing and scanning invidual images and can be invoked either
+previewing and scanning individual images and can be invoked either
 directly from the command-line or through The GIMP image manipulation
 program.  In the former case,
 .B xscanimage
@@ -45,11 +45,11 @@ simply copy it to one of the
 plug-ins directories.  If you want to conserve disk-space, you can
 create a symlink instead.  For example, for gimp-1.0.x the command
 .PP
-ln -s @BINDIR@/xscanimage ~/.gimp/plug-ins/
+ln \-s @BINDIR@/xscanimage ~/.gimp/plug-ins/
 .PP
 and for gimp-1.2.x the command
 .PP
-ln -s @BINDIR@/xscanimage ~/.gimp-1.2/plug-ins/
+ln \-s @BINDIR@/xscanimage ~/.gimp-1.2/plug-ins/
 .PP
 adds a symlink for the
 .B xscanimage

src/gtkglue.c

@@ -1502,12 +1502,7 @@ gsg_set_sensitivity (GSGDialog * dialog, int sensitive)
       if (!SANE_OPTION_IS_ACTIVE (opt->cap)
 	  || opt->type == SANE_TYPE_GROUP || !dialog->element[i].widget)
 	continue;
-#ifdef SANE_CAP_ALWAYS_SETTABLE
-      if (!(opt->cap & SANE_CAP_ALWAYS_SETTABLE))
-	gtk_widget_set_sensitive (dialog->element[i].widget, sensitive);
-#else
       gtk_widget_set_sensitive (dialog->element[i].widget, sensitive);
-#endif
     }
 }
 

src/xscanimage.c

@@ -329,7 +329,7 @@ query (void)
 			  _("Andy Beck, Tristan Tarrant, and David Mosberger"),
 			  _("8th June 1997"),
 			  _("<Toolbox>/File/Acquire/xscanimage/Device dialog..."),
-			  _("RGB, GRAY"),
+			  NULL,
 			  GIMP_EXTENSION,
 			  nargs, nreturn_vals, args, return_vals);
 
@@ -374,7 +374,7 @@ query (void)
 	 "interface."),
 	 _("Andy Beck, Tristan Tarrant, and David Mosberger"),
 	 _("Andy Beck, Tristan Tarrant, and David Mosberger"),
-	 _("8th June 1997"), mpath, _("RGB, GRAY"), GIMP_EXTENSION,
+	 _("8th June 1997"), mpath, NULL, GIMP_EXTENSION,
 	 nargs, nreturn_vals, args, return_vals);
     }
   sane_exit ();