From: Michael Sweet <michael.r.sweet@gmail.com>
Date: Wed, 11 May 2016 19:05:40 +0000 (-0400)
Subject: Rename "job-actual-printer-uri" to "job-printer-uri-actual".
X-Git-Tag: v2.2b1~29
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fcups.git;a=commitdiff_plain;h=a6fd57bc6672f27c293ef2c778d183741e9a9536

Rename "job-actual-printer-uri" to "job-printer-uri-actual".
---

diff --git a/scheduler/job.c b/scheduler/job.c
index 759689dcf..a2d0e9863 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -387,16 +387,14 @@ cupsdCheckJobs(void)
         if (pclass)
 	{
 	 /*
-	  * Add/update a job-actual-printer-uri attribute for this job
+	  * Add/update a job-printer-uri-actual attribute for this job
 	  * so that we know which printer actually printed the job...
 	  */
 
-          if ((attr = ippFindAttribute(job->attrs, "job-actual-printer-uri",
-	                               IPP_TAG_URI)) != NULL)
+          if ((attr = ippFindAttribute(job->attrs, "job-printer-uri-actual", IPP_TAG_URI)) != NULL)
             ippSetString(job->attrs, &attr, 0, printer->uri);
 	  else
-	    ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_URI,
-	                 "job-actual-printer-uri", NULL, printer->uri);
+	    ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_URI, "job-printer-uri-actual", NULL, printer->uri);
 
           job->dirty = 1;
           cupsdMarkDirty(CUPSD_DIRTY_JOBS);