wok view hplip/stuff/hplip-3.9.4b-glibc210.u @ rev 7503

Add glib-dev to json-glib-dev depends.
author Christopher Rogers <slaxemulator@gmail.com>
date Sat Dec 04 04:52:31 2010 +0000 (2010-12-04)
parents
children
line source
1 --- prnt/hpijs/registry.cpp.orig 2009-04-29 22:41:07.000000000 +0200
2 +++ prnt/hpijs/registry.cpp 2009-06-02 14:17:09.000000000 +0200
3 @@ -292,7 +292,7 @@ DRIVER_ERROR DeviceRegistry::SelectDevic
4 device = eDJ3320;
5 match = TRUE;
6 }
7 - char *cmdStr = strstr ((const char *) DevIDBuffer+2, "CMD:");
8 + const char *cmdStr = strstr ((const char *) DevIDBuffer+2, "CMD:");
9 if (!cmdStr)
10 {
11 cmdStr = strstr ((const char *) DevIDBuffer+2, "COMMAND SET:");
12 --- prnt/hpijs/dj3320.cpp.orig 2009-04-29 22:41:07.000000000 +0200
13 +++ prnt/hpijs/dj3320.cpp 2009-06-02 14:32:21.000000000 +0200
14 @@ -429,7 +429,7 @@ DISPLAY_STATUS DJ3320::ParseError (BYTE
15 pLDLEncap->bNewStatus = FALSE;
16
17 // First 10 bytes of m_pbyReadBuff are packet header. Status query from printer has $S:
18 - if ((pcStr = strstr((const char*)pLDLEncap->byStatusBuff + 10, "$S:")) == NULL)
19 + if ((pcStr = strstr((char*)pLDLEncap->byStatusBuff + 10, "$S:")) == NULL)
20 {
21 m_dsCurrentStatus = DISPLAY_COMM_PROBLEM;
22 return DISPLAY_COMM_PROBLEM;