The previous patch contained a logic error.  Here is a fixed version.

Tim.
*/

--- hplip-1.7.2/prnt/hpijs/hpijs.cpp.marker-supply	2007-03-30 17:44:32.000000000 +0100
+++ hplip-1.7.2/prnt/hpijs/hpijs.cpp	2007-03-30 17:53:23.000000000 +0100
@@ -516,7 +516,31 @@
       goto BUGOUT;
    }
    if (pSS->pPC->constructor_error < 0)
+   {
       bug("WARNING: %s\n", pSS->GetDriverMessage(pSS->pPC->constructor_error));
+      switch (pSS->pPC->constructor_error)
+      {
+      case WARN_LOW_INK_BOTH_PENS:
+      case WARN_LOW_INK_BLACK:
+      case WARN_LOW_INK_COLOR:
+      case WARN_LOW_INK_PHOTO:
+      case WARN_LOW_INK_GREY:
+      case WARN_LOW_INK_BLACK_PHOTO:
+      case WARN_LOW_INK_COLOR_PHOTO:
+      case WARN_LOW_INK_GREY_PHOTO:
+      case WARN_LOW_INK_COLOR_GREY:
+      case WARN_LOW_INK_COLOR_GREY_PHOTO:
+      case WARN_LOW_INK_COLOR_BLACK_PHOTO:
+      case WARN_LOW_INK_CYAN:
+      case WARN_LOW_INK_MAGENTA:
+      case WARN_LOW_INK_YELLOW:
+      case WARN_LOW_INK_MULTIPLE_PENS:
+	 bug("STATE: +marker-supply-low-warning\n");
+	 break;
+      default:
+	 bug("STATE: -marker-supply-low-warning\n");
+      }
+   }
 
 #if 0
    bug("device model=%s\n", pSS->pPC->PrinterModel());

Attachment: signature.asc
Description: This is a digitally signed message part

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
HPLIP-Devel mailing list
HPLIP-Devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/hplip-devel

Reply via email to