Change new keyword to "cups-waiting-for-job-completed" (<rdar://problem/14323704>)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11406 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/backend/ipp.c b/backend/ipp.c
index 3f202427e1df63405b44e613b3e4b5d25024d12d..d42e27fd1f0c751298bd523f7dccc8b52fc20d21 100644 (file)
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1855,7 +1855,7 @@ main(int  argc,                           /* I - Number of command-line args */
     if (!job_id || !waitjob || !get_job_attrs)
       continue;
 
-    fputs("STATE: +cups-waiting-for-completed\n", stderr);
+    fputs("STATE: +cups-waiting-for-job-completed\n", stderr);
 
     _cupsLangPrintFilter(stderr, "INFO", _("Waiting for job to complete."));
 

diff --git a/backend/lpd.c b/backend/lpd.c
index 8400ecd9dd0896e0c20f58b2409b09e4bb09836b..872fb1cc630567bf8f249048e8070ad08b804e4f 100644 (file)
--- a/backend/lpd.c
+++ b/backend/lpd.c
@@ -1160,7 +1160,7 @@ lpd_queue(const char      *hostname,      /* I - Host to connect to */
                             _("Control file sent successfully."));
     }
 
-    fputs("STATE: +cups-waiting-for-completed\n", stderr);
+    fputs("STATE: +cups-waiting-for-job-completed\n", stderr);
 
    /*
     * Collect the final supply levels as needed...

diff --git a/backend/socket.c b/backend/socket.c
index bf70b40a6903816f20bdc6043592729ec1613eaa..8b87d8ef9c6060116e754fb460e9490ebb88494e 100644 (file)
--- a/backend/socket.c
+++ b/backend/socket.c
@@ -429,7 +429,7 @@ main(int  argc,                             /* I - Number of command-line arguments (6 or 7) */
       _cupsLangPrintFilter(stderr, "INFO", _("Print file sent."));
   }
 
-  fputs("STATE: +cups-waiting-for-completed\n", stderr);
+  fputs("STATE: +cups-waiting-for-job-completed\n", stderr);
 
   if (waiteof)
   {

diff --git a/backend/usb-darwin.c b/backend/usb-darwin.c
index 2359d9360b4b2686728d059a63cd6f8f6fa22141..c1248426811d7cde5ef214606bf31a2afeb850e8 100644 (file)
--- a/backend/usb-darwin.c
+++ b/backend/usb-darwin.c
@@ -761,7 +761,7 @@ print_device(const char *uri,               /* I - Device URI */
   }
 
   fprintf(stderr, "DEBUG: Sent %lld bytes...\n", (off_t)total_bytes);
-  fputs("STATE: +cups-waiting-for-completed\n", stderr);
+  fputs("STATE: +cups-waiting-for-job-completed\n", stderr);
 
  /*
   * Signal the side channel thread to exit...

diff --git a/scheduler/job.c b/scheduler/job.c
index 1d1a0fae13de58a4242f34b85cdb97cbf3e9f7d2..626d8bdbb7ba8c326abf060100b6fe6b97bfb7f2 100644 (file)
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -2933,13 +2933,13 @@ finalize_job(cupsd_job_t *job,          /* I - Job */
   cupsdLogMessage(CUPSD_LOG_DEBUG2, "finalize_job(job=%p(%d))", job, job->id);
 
  /*
-  * Clear the "connecting-to-device" and "cups-waiting-for-completed" reasons,
-  * which are only valid when a printer is processing, along with any remote
-  * printing job state...
+  * Clear the "connecting-to-device" and "cups-waiting-for-job-completed"
+  * reasons, which are only valid when a printer is processing, along with any
+  * remote printing job state...
   */
 
   cupsdSetPrinterReasons(job->printer, "-connecting-to-device,"
-                                       "cups-waiting-for-completed,"
+                                       "cups-waiting-for-job-completed,"
                                       "cups-remote-pending,"
                                       "cups-remote-pending-held,"
                                       "cups-remote-processing,"

diff --git a/scheduler/job.h b/scheduler/job.h
index 64e725a9ccdc2bb118077a8053ed05169763122d..29032263bf20b4938f1bc6d43b286af390261de2 100644 (file)
--- a/scheduler/job.h
+++ b/scheduler/job.h
@@ -74,7 +74,7 @@ struct cupsd_job_s                    /**** Job request ****/
   int                  backend;        /* Backend process ID */
   int                  status;         /* Status code from filters */
   int                  tries;          /* Number of tries for this job */
-  int                  completed;      /* cups-waiting-for-completed seen */
+  int                  completed;      /* cups-waiting-for-job-completed seen */
   char                 *auth_env[3],   /* AUTH_xxx environment variables,
                                          * if any */
                        *auth_uid;      /* AUTH_UID environment variable */

diff --git a/scheduler/printers.c b/scheduler/printers.c
index b9bb4e86463cfeb22b2e3c08af801856f40bc199..48e7e0e4e29265f584dac1bb8d55b68adda23624 100644 (file)
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -2471,7 +2471,7 @@ cupsdSetPrinterReasons(
           if (!strcmp(reason, "paused") && p->state == IPP_PRINTER_STOPPED)
            cupsdSetPrinterState(p, IPP_PRINTER_IDLE, 1);
 
-          if (!strcmp(reason, "cups-waiting-for-completed") && p->job)
+          if (!strcmp(reason, "cups-waiting-for-job-completed") && p->job)
             p->job->completed = 0;
 
           if (strcmp(reason, "connecting-to-device"))
@@ -2511,7 +2511,7 @@ cupsdSetPrinterReasons(
        if (!strcmp(reason, "paused") && p->state != IPP_PRINTER_STOPPED)
          cupsdSetPrinterState(p, IPP_PRINTER_STOPPED, 1);
 
-       if (!strcmp(reason, "cups-waiting-for-completed") && p->job)
+       if (!strcmp(reason, "cups-waiting-for-job-completed") && p->job)
          p->job->completed = 1;
 
        if (strcmp(reason, "connecting-to-device"))

diff --git a/scheduler/sysman.c b/scheduler/sysman.c
index 9235ef9edcf795dd9ef1ed0320d44e9ce84fea6d..16d10eb87d36e7bf3c85c40c8ef747a4d0bf20d0 100644 (file)
--- a/scheduler/sysman.c
+++ b/scheduler/sysman.c
@@ -820,9 +820,9 @@ sysUpdate(void)
     {
      /*
       * If there are active printers that don't have the connecting-to-device
-      * or cups-waiting-for-completed printer-state-reason then cancel the sleep
-      * request, i.e., these reasons indicate a job that is not actively doing
-      * anything...
+      * or cups-waiting-for-job-completed printer-state-reason then cancel the
+      * sleep request, i.e., these reasons indicate a job that is not actively
+      * doing anything...
       */
 
       for (p = (cupsd_printer_t *)cupsArrayFirst(Printers);
@@ -833,7 +833,7 @@ sysUpdate(void)
         {
          for (i = 0; i < p->num_reasons; i ++)
            if (!strcmp(p->reasons[i], "connecting-to-device") ||
-               !strcmp(p->reasons[i], "cups-waiting-for-completed"))
+               !strcmp(p->reasons[i], "cups-waiting-for-job-completed"))
              break;
 
          if (!p->num_reasons || i >= p->num_reasons)
@@ -881,7 +881,7 @@ sysUpdate(void)
       {
        /*
        * If there are active printers that don't have the connecting-to-device
-       * or cups-waiting-for-completed printer-state-reasons then delay the
+       * or cups-waiting-for-job-completed printer-state-reasons then delay the
        * sleep request, i.e., these reasons indicate a job is active...
        */
 
@@ -893,7 +893,7 @@ sysUpdate(void)
          {
            for (i = 0; i < p->num_reasons; i ++)
              if (!strcmp(p->reasons[i], "connecting-to-device") ||
-                 !strcmp(p->reasons[i], "cups-waiting-for-completed"))
+                 !strcmp(p->reasons[i], "cups-waiting-for-job-completed"))
                break;
 
            if (!p->num_reasons || i >= p->num_reasons)