diff options
Diffstat (limited to 'backend/usb-darwin.c')
| -rw-r--r-- | backend/usb-darwin.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/backend/usb-darwin.c b/backend/usb-darwin.c index 8b249a9f..fe2ec9f6 100644 --- a/backend/usb-darwin.c +++ b/backend/usb-darwin.c @@ -1,7 +1,7 @@ /* -* "$Id: usb-darwin.c 9887 2011-08-11 22:04:59Z mike $" +* "$Id: usb-darwin.c 10431 2012-04-23 19:19:19Z mike $" * -* Copyright 2005-2011 Apple Inc. All rights reserved. +* Copyright 2005-2012 Apple Inc. All rights reserved. * * IMPORTANT: This Apple software is supplied to you by Apple Computer, * Inc. ("Apple") in consideration of your agreement to the following @@ -820,10 +820,10 @@ print_device(const char *uri, /* I - Device URI */ /* * If it didn't exit abort the pending read and wait an additional second... */ - + if (!g.read_thread_done) { - fputs("DEBUG: Read thread still active, aborting the pending read...\n", + fputs("DEBUG: Read thread still active, aborting the pending read...\n", stderr); g.wait_eof = 0; @@ -833,7 +833,7 @@ print_device(const char *uri, /* I - Device URI */ gettimeofday(&tv, NULL); cond_timeout.tv_sec = tv.tv_sec + 1; cond_timeout.tv_nsec = tv.tv_usec * 1000; - + while (!g.read_thread_done) { if (pthread_cond_timedwait(&g.read_thread_cond, &g.read_thread_mutex, @@ -1283,7 +1283,7 @@ static Boolean find_device_cb(void *refcon, if (!keepLooking && g.status_timer != NULL) { fputs("STATE: -offline-report\n", stderr); - _cupsLangPrintFilter(stderr, "INFO", _("Printer is now online.")); + _cupsLangPrintFilter(stderr, "INFO", _("The printer is now online.")); CFRunLoopRemoveTimer(CFRunLoopGetCurrent(), g.status_timer, kCFRunLoopDefaultMode); CFRelease(g.status_timer); g.status_timer = NULL; @@ -1304,7 +1304,7 @@ static void status_timer_cb(CFRunLoopTimerRef timer, (void)info; fputs("STATE: +offline-report\n", stderr); - _cupsLangPrintFilter(stderr, "INFO", _("Printer is offline.")); + _cupsLangPrintFilter(stderr, "INFO", _("The printer is offline.")); if (getenv("CLASS") != NULL) { @@ -2265,5 +2265,5 @@ static void get_device_id(cups_sc_status_t *status, /* - * End of "$Id: usb-darwin.c 9887 2011-08-11 22:04:59Z mike $". + * End of "$Id: usb-darwin.c 10431 2012-04-23 19:19:19Z mike $". */ |