rpms/cups/FC-6 cups-str2121.patch, NONE, 1.1 cups.spec, 1.308, 1.309 cups-translate-prompt.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv5685

Modified Files:
	cups.spec 
Added Files:
	cups-str2121.patch 
Removed Files:
	cups-translate-prompt.patch 
Log Message:
* Thu Dec  7 2006 Tim Waugh <twaugh at redhat.com>
- Use upstream patch for STR #2121.


cups-str2121.patch:
 auth.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

--- NEW FILE cups-str2121.patch ---
--- cups-1.2.7/cups/auth.c.str2121	2006-09-16 20:08:36.000000000 +0100
+++ cups-1.2.7/cups/auth.c	2006-12-07 13:15:15.000000000 +0000
@@ -75,6 +75,7 @@
 		realm[HTTP_MAX_VALUE],	/* realm="xyz" string */
 		nonce[HTTP_MAX_VALUE],	/* nonce="xyz" string */
 		encode[512];		/* Encoded username:password */
+  _cups_globals_t *cg;			/* Global data */
 
 
   DEBUG_printf(("cupsDoAuthentication(http=%p, method=\"%s\", resource=\"%s\")\n",
@@ -114,8 +115,15 @@
     * Nope - get a new password from the user...
     */
 
-    snprintf(prompt, sizeof(prompt), _("Password for %s on %s? "), cupsUser(),
-             http->hostname[0] == '/' ? "localhost" : http->hostname);
+    cg = _cupsGlobals();
+
+    if (!cg->lang_default)
+      cg->lang_default = cupsLangDefault();
+
+    snprintf(prompt, sizeof(prompt),
+             _cupsLangString(cg->lang_default, _("Password for %s on %s? ")),
+	     cupsUser(),
+	     http->hostname[0] == '/' ? "localhost" : http->hostname);
 
     http->digest_tries  = strncasecmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE],
                                       "Digest", 5) != 0;


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-6/cups.spec,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -r1.308 -r1.309
--- cups.spec	7 Dec 2006 13:11:10 -0000	1.308
+++ cups.spec	7 Dec 2006 13:16:24 -0000	1.309
@@ -45,7 +45,7 @@
 Patch19: cups-eggcups.patch
 Patch20: cups-getpass.patch
 Patch21: cups-driverd-timeout.patch
-Patch22: cups-translate-prompt.patch
+Patch22: cups-str2121.patch
 Patch23: cups-str2111.patch
 Patch24: cups-str2133.patch
 Patch100: cups-lspp.patch
@@ -151,7 +151,7 @@
 %patch19 -p1 -b .eggcups
 %patch20 -p1 -b .getpass
 %patch21 -p1 -b .driverd-timeout
-%patch22 -p1 -b .translate-prompt
+%patch22 -p1 -b .str2121
 %patch23 -p1 -b .str2111
 %patch24 -p1 -b .str2133
 
@@ -437,6 +437,7 @@
 
 %changelog
 * Thu Dec  7 2006 Tim Waugh <twaugh at redhat.com>
+- Use upstream patch for STR #2121.
 - Fixed If-Modified-Since: handling in libcups (bug #217556, STR #2133).
 - Fixed extra EOF in pstops output (bug #216154, STR #2111).
 


--- cups-translate-prompt.patch DELETED ---