Merge changes from CUPS 1.5svn-r9198.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2309 a1ca3aef-8c08-0410-bb20-df032aa958be

1 files changed, 28 insertions, 9 deletions

diff --git a/backend/socket.c b/backend/socket.c
index 53f8dc0b5..84e5fe5f6 100644
--- a/backend/socket.c
+++ b/backend/socket.c
@@ -302,18 +302,40 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
         return (CUPS_BACKEND_FAILED);
       }
 
+      fprintf(stderr, "DEBUG: Connection error: %s\n", strerror(error));
+
       if (error == ECONNREFUSED || error == EHOSTDOWN ||
           error == EHOSTUNREACH)
       {
         if (contimeout && (time(NULL) - start_time) > contimeout)
 	{
-	  _cupsLangPuts(stderr, _("ERROR: Printer not responding\n"));
+	  _cupsLangPuts(stderr, _("ERROR: The printer is not responding.\n"));
 	  return (CUPS_BACKEND_FAILED);
 	}
 
-	_cupsLangPrintf(stderr,
-			_("WARNING: Network host \'%s\' is busy; will retry in "
-			  "%d seconds...\n"), hostname, delay);
+	switch (error)
+	{
+	  case EHOSTDOWN :
+	      _cupsLangPrintf(stderr,
+			      _("WARNING: Network printer \'%s\' may not exist "
+			        "or is unavailable at this time.\n"), 
+			      hostname);
+	      break;
+
+	  case EHOSTUNREACH :
+	      _cupsLangPrintf(stderr,
+			      _("WARNING: Network printer \'%s\' is "
+			        "unreachable at this time.\n"), 
+			      hostname);
+	      break;
+
+	  case ECONNREFUSED :
+	  default :
+	      _cupsLangPrintf(stderr,
+			      _("WARNING: Network printer \'%s\' is busy.\n"),
+			      hostname);
+	      break;
+        }
 
 	sleep(delay);
 
@@ -322,11 +344,8 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
       }
       else
       {
-        _cupsLangPrintf(stderr, "DEBUG: Connection error: %s\n",
-	                strerror(errno));
-	_cupsLangPuts(stderr,
-	              _("ERROR: Unable to connect to printer; will retry in 30 "
-		        "seconds...\n"));
+	_cupsLangPrintf(stderr, _("ERROR: Network printer \'%s\' is not "
+	                          "responding.\n"), hostname);
 	sleep(30);
       }
     }