summaryrefslogtreecommitdiff
path: root/backend/snmp-supplies.c
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2011-11-08 00:30:03 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2011-11-08 00:30:03 +0000
commita2326b5b72c5117a00d4342dde8e4d20ff41defe (patch)
treeecd2d60a15f7bad184a6f6e7c20f846e8a4cfadf /backend/snmp-supplies.c
parentd7225fc298cb8397b85758198e70fc5399a44720 (diff)
Merge changes from CUPS 1.6svn-r10112.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3486 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'backend/snmp-supplies.c')
-rw-r--r--backend/snmp-supplies.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/backend/snmp-supplies.c b/backend/snmp-supplies.c
index 92febb602..b82352063 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);