From 1dc3191285499819a15beab0db34933eb32deab1 Mon Sep 17 00:00:00 2001 From: mike Date: Fri, 7 Oct 2011 20:42:17 +0000 Subject: [PATCH] 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 --- CHANGES-1.5.txt | 1 + backend/backend-private.h | 1 + backend/snmp-supplies.c | 1 + 3 files changed, 3 insertions(+) diff --git a/CHANGES-1.5.txt b/CHANGES-1.5.txt index 736f43be45..49b1bb23af 100644 --- 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 626681859c..30d0bd7bb5 100644 --- 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 92febb6021..b823520635 100644 --- 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); -- 2.47.2