From: msweet Date: Fri, 28 Sep 2007 20:09:54 +0000 (+0000) Subject: Import changes from CUPS 1.3svn-r7000. X-Git-Tag: release-1.6.3~204 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=7dfedb921d49c26230599519e7ddb624d6677372;p=thirdparty%2Fcups.git Import changes from CUPS 1.3svn-r7000. git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@485 a1ca3aef-8c08-0410-bb20-df032aa958be --- diff --git a/backend/usb-darwin.c b/backend/usb-darwin.c index efce4826db..d90c85361e 100644 --- a/backend/usb-darwin.c +++ b/backend/usb-darwin.c @@ -1,5 +1,5 @@ /* -* "$Id: usb-darwin.c 6953 2007-09-13 22:41:21Z mike $" +* "$Id: usb-darwin.c 6996 2007-09-28 18:30:31Z mike $" * * Copyright ï¿½ 2005-2007 Apple Inc. All rights reserved. * @@ -105,7 +105,7 @@ */ #define WAIT_EOF_DELAY 7 #define WAIT_SIDE_DELAY 3 -#define DEFAULT_TIMEOUT 60L +#define DEFAULT_TIMEOUT 5000L #define USB_INTERFACE_KIND CFUUIDGetUUIDBytes(kIOUSBInterfaceInterfaceID190) #define kUSBLanguageEnglish 0x409 @@ -342,6 +342,13 @@ print_device(const char *uri, /* I - Device URI */ g.serial = cfstr_create_trim(serial); g.location = location; + if (!g.make || !g.model) + { + _cupsLangPrintf(stderr, + _("ERROR: Unable to create make and model strings\n")); + return CUPS_BACKEND_STOP; + } + fputs("STATE: +connecting-to-device\n", stderr); countdown = INITIAL_LOG_INTERVAL; @@ -1073,9 +1080,9 @@ static Boolean find_device_cb(void *refcon, CFStringRef make = NULL, model = NULL, serial = NULL; copy_deviceinfo(idString, &make, &model, &serial); - if (CFStringCompare(make, g.make, kCFCompareCaseInsensitive) == kCFCompareEqualTo) + if (make && CFStringCompare(make, g.make, kCFCompareCaseInsensitive) == kCFCompareEqualTo) { - if (CFStringCompare(model, g.model, kCFCompareCaseInsensitive) == kCFCompareEqualTo) + if (model && CFStringCompare(model, g.model, kCFCompareCaseInsensitive) == kCFCompareEqualTo) { if (g.serial != NULL && CFStringGetLength(g.serial) > 0) { @@ -1972,7 +1979,7 @@ static void soft_reset() * Send the reset... */ - (*g.classdriver)->SoftReset(g.classdriver, 0); + (*g.classdriver)->SoftReset(g.classdriver, DEFAULT_TIMEOUT); /* * Release the I/O lock... @@ -2010,5 +2017,5 @@ static void get_device_id(cups_sc_status_t *status, /* - * End of "$Id: usb-darwin.c 6953 2007-09-13 22:41:21Z mike $". + * End of "$Id: usb-darwin.c 6996 2007-09-28 18:30:31Z mike $". */ diff --git a/doc/de/index.html.in b/doc/de/index.html.in index 252b205679..b7c9b22c31 100644 --- a/doc/de/index.html.in +++ b/doc/de/index.html.in @@ -115,8 +115,8 @@ WIDTH="15" HEIGHT="15" ALT="">

diff --git a/doc/help/spec-ppd.html b/doc/help/spec-ppd.html index 6dd4e91f90..1e618eebbd 100644 --- a/doc/help/spec-ppd.html +++ b/doc/help/spec-ppd.html @@ -8,7 +8,7 @@