ifdef some code to compile with current sane-backends

Changelog

@@ -1,3 +1,9 @@
+2010-05-24 m. allan noah <kitno455 at gmail dot com>
+	* src/preview.c, src/scanadf.c, src/xcam.c, src/xscanimage.c:
+	- hide SANE_STATUS_WARMING_UP, patch by Ilmars Poikans
+	* configure.in, configure: change version number to 1.0.15git
+	- dont require sane-backends version >= 1.1.0
+
 2009-11-14 Julien Blache <jb@jblache.org>
 	* src/gtkglue.c: fix handling of word list when the current value is
 	not in the list. Patch from Jan Echternach <jan@goneko.de>.

configure.in

@@ -6,9 +6,9 @@ AC_CONFIG_HEADER(include/sane/config.h)
 
 # version code:
 V_MAJOR=1
-V_MINOR=1
+V_MINOR=0
-V_BUILD=0
+V_BUILD=15
-V_EXTRA=-cvs
+V_EXTRA=git
 
 PACKAGE=sane-frontends
 
@@ -112,7 +112,7 @@ fi
 
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
-AM_PATH_SANE(1.1.0, HAVE_SANE=yes, )
+AM_PATH_SANE(1.0.10, HAVE_SANE=yes, )
 dnl Print error message if sane is missing
 if test "x${HAVE_SANE}" = "x"; then
   echo "**********************************************************************"
@@ -235,7 +235,6 @@ echo "* ... PLEASE READ SANE DOCUMENTATION BEFORE STARTING SANE ...  *"
 echo "* ------------------------------------------------------------ *"
 echo "*                                                              *"
 echo "* If you experience any problems with sane-frontends please    *"
-echo "* write to the sane mailing list or contact:                   *"
+echo "* write to the sane list at sane-devel@lists.alioth.debian.org *"
-echo "* Oliver Rauch <Oliver.Rauch@Rauch-domain.de>                  *"
 echo "*                                                              *"
 echo "****************************************************************"

src/preview.c

@@ -887,6 +887,7 @@ scan_start (Preview * p)
   gsg_sync (p->dialog);
 
   status = sane_start (dev);
+#ifdef SANE_STATUS_WARMING_UP
   if (status == SANE_STATUS_WARMING_UP)
     {
       snprintf (buf, sizeof (buf), "Scanner is warming up.");
@@ -909,6 +910,7 @@ scan_start (Preview * p)
 	}
       progress_free (progress);
     }
+#endif /* SANE_STATUS_WARMING_UP */
   if (status != SANE_STATUS_GOOD)
     {
       snprintf (buf, sizeof (buf),

src/scanadf.c

@@ -989,10 +989,14 @@ scan_it_raw (const char *fname, SANE_Bool raw, const char *script,
 
   do
     {
+#ifdef SANE_STATUS_WARMING_UP
       do
         {
           status = sane_start (device);
 	} while (status == SANE_STATUS_WARMING_UP);
+#else
+      status = sane_start (device);
+#endif
       if (status != SANE_STATUS_GOOD)
 	{
 	  if (status != SANE_STATUS_NO_DOCS)

src/xcam.c

@@ -1221,11 +1221,15 @@ next_frame (void)
   DBG (DBG_debug, "xcam: next frame, start gsg_sync\n");
   gsg_sync (dialog);
 
+#ifdef SANE_STATUS_WARMING_UP
   do
     {
       status = sane_start (gsg_dialog_get_device (dialog));
     }
   while (status == SANE_STATUS_WARMING_UP);
+#else
+  status = sane_start (gsg_dialog_get_device (dialog));
+#endif
   if (status != SANE_STATUS_GOOD)
     {
       sprintf (buf, "Failed to start webcam: %s.", sane_strstatus (status));

src/xscanimage.c

@@ -1095,6 +1095,7 @@ scan_start (void)
     gtk_main_iteration ();
 
   status = sane_start (dev);
+#ifdef SANE_STATUS_WARMING_UP
   if (status == SANE_STATUS_WARMING_UP)
     {
       if (scan_win.progress)
@@ -1119,6 +1120,7 @@ scan_start (void)
       progress_free (scan_win.progress);
       scan_win.progress = 0;
     }
+#endif /* SANE_STATUS_WARMING_UP */
   if (status != SANE_STATUS_GOOD)
     {
       gsg_set_sensitivity (dialog, TRUE);