Japanese supply level reporting did not always work.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10061 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.5.txt b/CHANGES-1.5.txt
index 736f43be451ec363b1b40987d2e48783d4ea719e..49b1bb23affc8f367421c78afa1c6373ae03573f 100644 (file)
--- a/CHANGES-1.5.txt
+++ b/CHANGES-1.5.txt
@@ -4,6 +4,7 @@ CHANGES-1.5.txt
 CHANGES IN CUPS V1.5.1
 
        - Documentation updates (STR #3885, STR #3946)
+       - Japanese supply level reporting did not always work.
        - The DBUS notifier could crash (STR #3947)
        - Relaxed some of the page size checks in cupstestppd.
        - The ipptool program now reports attributes that are repeated within

diff --git a/backend/backend-private.h b/backend/backend-private.h
index 626681859c588ff8b870fe2bb6b2e6158727ce7a..30d0bd7bb51bd6a55f2229294b7bed4553a933b8 100644 (file)
--- a/backend/backend-private.h
+++ b/backend/backend-private.h
@@ -274,6 +274,7 @@ extern "C" {
 #define CUPS_TC_csUTF32                                1017
 #define CUPS_TC_csUTF32BE                      1018
 #define CUPS_TC_csUTF32LE                      1019
+#define CUPS_TC_csWindows31J                   2024
 
 
 /*

diff --git a/backend/snmp-supplies.c b/backend/snmp-supplies.c
index 92febb60215416fa862d6c9f534907c1b639aebc..b823520635d2f90a88e79e5d2b32242701abda9e 100644 (file)
--- a/backend/snmp-supplies.c
+++ b/backend/snmp-supplies.c
@@ -801,6 +801,7 @@ backend_walk_cb(cups_snmp_t *packet,        /* I - SNMP packet */
           break;
 
       case CUPS_TC_csShiftJIS :
+      case CUPS_TC_csWindows31J : /* Close enough for our purposes */
          cupsCharsetToUTF8((cups_utf8_t *)supplies[i - 1].name,
                            (char *)packet->object_value.string.bytes,
                            sizeof(supplies[0].name), CUPS_JIS_X0213);