The scheduler now clears the printer-state-reasons when the driver is changed

(STR #3570)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@9179 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.4.txt b/CHANGES-1.4.txt
index 8d3ba96f5528ff6f95a568461eec1d59b832d2df..e95b0053cec6ebe82bfb1cebe54f0155f768debd 100644 (file)
--- a/CHANGES-1.4.txt
+++ b/CHANGES-1.4.txt
@@ -4,6 +4,8 @@ CHANGES-1.4.txt
 CHANGES IN CUPS V1.4.5
 
        - Documentation fixes (STR #3542)
+       - The scheduler now clears the printer-state-reasons when the driver is
+         changed (STR #3570)
        - The web interface did not allow a user to change the driver
          (STR #3537, STR #3601)
        - The scheduler was not setting the PATH_INFO environment variable when

diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index 757d98200ca16b452ef796b2574122f94358b4a3..555bf8a4422680c74b265e0684ddc1c182d09cb1 100644 (file)
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -2939,7 +2939,7 @@ add_printer(cupsd_client_t  *con, /* I - Client connection */
   {
    /*
     * If we changed the PPD/interface script, then remove the printer's cache
-    * file...
+    * file and clear the printer-state-reasons...
     */
 
     char cache_name[1024];             /* Cache filename for printer attrs */
@@ -2952,6 +2952,8 @@ add_printer(cupsd_client_t  *con, /* I - Client connection */
              printer->name);
     unlink(cache_name);
 
+    cupsdSetPrinterReasons(printer, "none");
+
 #ifdef __APPLE__
    /*
     * (Re)register color profiles...

diff --git a/scheduler/printers.c b/scheduler/printers.c
index 39781b9fcebb693973940bd301b560a1c609df25..0172190fae92c98e81050d533d8b17ab8322a939 100644 (file)
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -2683,8 +2683,8 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */
 
 int                                    /* O - 1 if something changed, 0 otherwise */
 cupsdSetPrinterReasons(
-    cupsd_printer_t  *p,               /* I - Printer */
-    const char *s)                     /* I - Reasons strings */
+    cupsd_printer_t *p,                        /* I - Printer */
+    const char      *s)                        /* I - Reasons strings */
 {
   int          i,                      /* Looping var */
                changed = 0;            /* Did something change? */