[prev in list] [next in list] [prev in thread] [next in thread] 

List:       cups-commit
Subject:    [cups.commit] [CUPS] r7079 - in trunk: . berkeley
From:       cups-dev () easysw ! com
Date:       2007-11-30 1:58:32
Message-ID: 7183-cups.commit () news ! easysw ! com
[Download RAW message or body]

Author: mike
Date: 2007-11-29 17:58:31 -0800 (Thu, 29 Nov 2007)
New Revision: 7079
Log:
The lpc command did not work in non-UTF-8 locales (STR #2595)



Modified:
   trunk/CHANGES-1.3.txt
   trunk/berkeley/lpc.c

Modified: trunk/CHANGES-1.3.txt
===================================================================
--- trunk/CHANGES-1.3.txt	2007-11-30 01:53:17 UTC (rev 7078)
+++ trunk/CHANGES-1.3.txt	2007-11-30 01:58:31 UTC (rev 7079)
@@ -3,6 +3,8 @@
 
 CHANGES IN CUPS V1.3.5
 
+	- The lpc command did not work in non-UTF-8 locales (STR
+	  #2595)
 	- Subscriptions for printer-stopped events also received
 	  other state changes (STR #2572)
 	- cupstestppd incorrectly reported translation errors for

Modified: trunk/berkeley/lpc.c
===================================================================
--- trunk/berkeley/lpc.c	2007-11-30 01:53:17 UTC (rev 7078)
+++ trunk/berkeley/lpc.c	2007-11-30 01:58:31 UTC (rev 7079)
@@ -230,7 +230,6 @@
   ipp_t		*request,		/* IPP Request */
 		*response;		/* IPP Response */
   ipp_attribute_t *attr;		/* Current attribute */
-  cups_lang_t	*language;		/* Default language */
   char		*printer,		/* Printer name */
 		*device,		/* Device URI */
                 *delimiter;		/* Char search result */
@@ -263,19 +262,8 @@
   *    attributes-natural-language
   */
 
-  request = ippNew();
+  request = ippNewRequest(CUPS_GET_PRINTERS);
 
-  request->request.op.operation_id = CUPS_GET_PRINTERS;
-  request->request.op.request_id   = 1;
-
-  language = cupsLangDefault();
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-               "attributes-charset", NULL, cupsLangEncoding(language));
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-               "attributes-natural-language", NULL, language->language);
-
   ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
                 "requested-attributes", sizeof(requested) / sizeof(requested[0]),
 		NULL, requested);

_______________________________________________
cups-commit mailing list
cups-commit@easysw.com
http://lists.easysw.com/mailman/listinfo/cups-commit
[prev in list] [next in list] [prev in thread] [next in thread]