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

List:       cups-commit
Subject:    [cups.commit] [CUPS] r10540 - in trunk: . berkeley
From:       cups-dev () easysw ! com
Date:       2012-07-16 16:50:33
Message-ID: 11312-cups.commit () news ! easysw ! com
[Download RAW message or body]

Author: mike
Date: 2012-07-16 09:50:32 -0700 (Mon, 16 Jul 2012)
New Revision: 10540
Log:
The lpq command did not show the owner or title of jobs unless passed a username
on the command-line (STR #4135)



Modified:
   trunk/CHANGES-1.5.txt
   trunk/berkeley/lpq.c

Modified: trunk/CHANGES-1.5.txt
===================================================================
--- trunk/CHANGES-1.5.txt	2012-06-25 15:46:35 UTC (rev 10539)
+++ trunk/CHANGES-1.5.txt	2012-07-16 16:50:32 UTC (rev 10540)
@@ -4,6 +4,8 @@
 CHANGES IN CUPS V1.5.4
 
 	- Documentation updates (STR #4112)
+	- The lpq command did not show the owner or title of jobs unless passed
+	  a username on the command-line (STR #4135)
 	- Localized empty strings contained the message catalog metadata
 	  (STR #4119)
 	- Fixed a crash in the libusb-based USB backend (STR #4099)

Modified: trunk/berkeley/lpq.c
===================================================================
--- trunk/berkeley/lpq.c	2012-06-25 15:46:35 UTC (rev 10539)
+++ trunk/berkeley/lpq.c	2012-07-16 16:50:32 UTC (rev 10540)
@@ -3,7 +3,7 @@
  *
  *   "lpq" command for CUPS.
  *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -371,6 +371,7 @@
   *    attributes-natural-language
   *    job-uri or printer-uri
   *    requested-attributes
+  *    requesting-user-name
   */
 
   request = ippNewRequest(id ? IPP_GET_JOB_ATTRIBUTES : IPP_GET_JOBS);
@@ -399,6 +400,9 @@
                  "requesting-user-name", NULL, user);
     ippAddBoolean(request, IPP_TAG_OPERATION, "my-jobs", 1);
   }
+  else
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+                 "requesting-user-name", NULL, cupsUser());
 
   ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
                 "requested-attributes",
@@ -447,8 +451,8 @@
       jobpriority = 50;
 #endif /* __osf__ */
       jobstate    = IPP_JOB_PENDING;
-      jobname     = "untitled";
-      jobuser     = NULL;
+      jobname     = "unknown";
+      jobuser     = "unknown";
       jobdest     = NULL;
       jobcopies   = 1;
 

_______________________________________________
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]