From 7a6f2ddf613f9f19cc2694a05047d182afec103f Mon Sep 17 00:00:00 2001
From: Henning Geinitz <sane@geinitz.org>
Date: Wed, 27 Aug 2003 11:49:52 +0000
Subject: [PATCH] Added Mustek ScanMagic 1200 UB Plus. Minor bugfix.

---
 ChangeLog                    | 6 ++++++
 backend/gt68xx.c             | 2 +-
 doc/descriptions/gt68xx.desc | 5 +++++
 doc/gt68xx/gt68xx.CHANGES    | 5 +++++
 doc/sane-gt68xx.man          | 2 ++
 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 098c2926e..16b08705c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-08-27  Henning Meier-Geinitz <henning@meier-geinitz.de>
+
+	* backend/gt68xx.c doc/sane-gt68xx.man
+	  doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES:
+	  Added Mustek ScanMagic 1200 UB Plus. Minor bugfix.
+
 2003-08-22  Henning Meier-Geinitz <henning@meier-geinitz.de>
 
 	* po/Makefile.in po/sane-backends.it.po: Added Italien translation
diff --git a/backend/gt68xx.c b/backend/gt68xx.c
index aeead34a4..9254e8ee3 100644
--- a/backend/gt68xx.c
+++ b/backend/gt68xx.c
@@ -755,7 +755,7 @@ attach (SANE_String_Const devname, GT68xx_Device ** devp, SANE_Bool may_wait)
     }
 
   dev->file_name = strdup (devname);
-  if (!dev)
+  if (!dev->file_name)
     return SANE_STATUS_NO_MEM;
   DBG (2, "attach: found %s flatbed scanner %s at %s\n", dev->model->vendor,
        dev->model->model, dev->file_name);
diff --git a/doc/descriptions/gt68xx.desc b/doc/descriptions/gt68xx.desc
index fb8c25c98..c1c45f936 100644
--- a/doc/descriptions/gt68xx.desc
+++ b/doc/descriptions/gt68xx.desc
@@ -165,6 +165,11 @@
 :status :minimal
 :comment "Should be detected but may need some more work in the code. Testers welcome."
 
+:model "ScanMagic 1200 UB Plus"
+:interface "USB"
+:status :good
+:comment "Same as ScanExpress 1200 UB Plus"
+
 ; -----------------------------------------------------------------------------
 
 :mfg "Packard Bell"
diff --git a/doc/gt68xx/gt68xx.CHANGES b/doc/gt68xx/gt68xx.CHANGES
index d08050142..b21f9f335 100644
--- a/doc/gt68xx/gt68xx.CHANGES
+++ b/doc/gt68xx/gt68xx.CHANGES
@@ -1,5 +1,10 @@
 gt68xx.CHANGES -*-text-*-
 
+V 1.0-49 (2003-0?-??)
+
+* Fixed wrong test for allocation in gt68xx.c.
+* Added ScanMagic 1200 UB Plus to man page and .desc.
+
 V 1.0-48 (2003-07-25)
 
 * Added RevScan 19200i to manpage and .desc file.
diff --git a/doc/sane-gt68xx.man b/doc/sane-gt68xx.man
index 4231b52ae..2bb487dc8 100644
--- a/doc/sane-gt68xx.man
+++ b/doc/sane-gt68xx.man
@@ -53,6 +53,8 @@ Mustek ScanExpress 1200 UB Plus
 .br
 Mustek ScanExpress 2400 USB
 .br
+Mustek ScanMagic 1200 UB Plus
+.br
 Packard Bell Diamond 1200 (Plus)
 .br
 Plustek OpticPro 1248U