Mirror 1.1.x changes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@3666 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.1.txt b/CHANGES-1.1.txt
index 02a0cb550df9ec9354430f06e92bd1cbda627ee4..7dfba3e3ced8e2bc848b7613927c6c263990d689 100644 (file)
--- a/CHANGES-1.1.txt
+++ b/CHANGES-1.1.txt
@@ -3,6 +3,8 @@ CHANGES-1.1.txt
 
 CHANGES IN CUPS V1.1.19rc3
 
+       - Updated the French man pages (translation provided by
+         Gilles QUERRET)
        - The scheduler would delete all printers from
          printers.conf if a job was active when a HUP signal
          was handled (STR #47)

diff --git a/CREDITS.txt b/CREDITS.txt
index 0f067824f78a807452f5701c56785f3de045959d..522774972d2fc564abbc2b751156d1ddaadd8196 100644 (file)
--- a/CREDITS.txt
+++ b/CREDITS.txt
@@ -1,4 +1,4 @@
-CREDITS.txt - 04/23/2003
+CREDITS.txt - 04/26/2003
 ------------------------
 
 Few projects are completed by one person, and CUPS is no exception.  We'd
@@ -24,6 +24,7 @@ like to thank the following individuals for their contributions:
     Ulrich Oldendorf    - German locale.
     Giulio Orsero       - Bug fixes and testing.
     Kurt Pfeifle        - Bug fixes, beta testing, evangelism.
+    Gilles QUERRET      - French man pages.
     Petter Reinholdtsen - HP-UX compiler stuff.
     Stuart Stevens      - HP JetDirect IPP information.
     Andrea Suatoni      - IRIX desktop integration and testing.

diff --git a/scheduler/classes.c b/scheduler/classes.c
index f1b277d8801b48d54a745ca3306ceca069495c97..49cfee461d42e966284b712bd385d8eb7dfbb1a6 100644 (file)
--- a/scheduler/classes.c
+++ b/scheduler/classes.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: classes.c,v 1.34.2.15 2003/04/25 15:30:19 mike Exp $"
+ * "$Id: classes.c,v 1.34.2.16 2003/04/26 17:19:41 mike Exp $"
  *
  *   Printer class routines for the Common UNIX Printing System (CUPS).
  *
@@ -215,7 +215,7 @@ DeletePrinterFromClasses(printer_t *p)      /* I - Printer to delete */
 
     if ((c->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT)) &&
         c->num_printers == 0)
-      DeletePrinter(c);
+      DeletePrinter(c, 1);
   }
 }
 
@@ -236,7 +236,7 @@ DeleteAllClasses(void)
     next = c->next;
 
     if (c->type & CUPS_PRINTER_CLASS)
-      DeletePrinter(c);
+      DeletePrinter(c, 0);
   }
 }
 
@@ -675,5 +675,5 @@ SaveAllClasses(void)
 
 
 /*
- * End of "$Id: classes.c,v 1.34.2.15 2003/04/25 15:30:19 mike Exp $".
+ * End of "$Id: classes.c,v 1.34.2.16 2003/04/26 17:19:41 mike Exp $".
  */

diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index de9423708a474d1e155a2b57eb1bb5541aa5b59e..aed7d2f3013cfc0128c6bb826a188761a1412c6c 100644 (file)
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: dirsvc.c,v 1.73.2.30 2003/04/02 13:17:59 mike Exp $"
+ * "$Id: dirsvc.c,v 1.73.2.31 2003/04/26 17:19:41 mike Exp $"
  *
  *   Directory services routines for the Common UNIX Printing System (CUPS).
  *
@@ -547,7 +547,7 @@ SendBrowseList(void)
       {
         LogMessage(L_INFO, "Remote destination \"%s\" has timed out; deleting it...",
                   p->name);
-        DeletePrinter(p);
+        DeletePrinter(p, 1);
       }
     }
     else if (p->browse_time < ut && count > 0 &&
@@ -1929,5 +1929,5 @@ UpdateSLPBrowse(void)
 
 
 /*
- * End of "$Id: dirsvc.c,v 1.73.2.30 2003/04/02 13:17:59 mike Exp $".
+ * End of "$Id: dirsvc.c,v 1.73.2.31 2003/04/26 17:19:41 mike Exp $".
  */

diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index c5059764a93a705e3f25e5e5c4b1fa8e4ae6e7b3..2760ace1a1be2ca1ec6db4fc583d3000bce43b50 100644 (file)
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp.c,v 1.127.2.65 2003/04/25 15:30:20 mike Exp $"
+ * "$Id: ipp.c,v 1.127.2.66 2003/04/26 17:19:42 mike Exp $"
  *
  *   IPP routines for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -676,7 +676,7 @@ add_class(client_t        *con,             /* I - Client connection */
       SortPrinters();
     }
     else
-      DeletePrinter(pclass);
+      DeletePrinter(pclass, 1);
 
    /*
     * Add the class as a new local class...
@@ -1103,7 +1103,7 @@ add_printer(client_t        *con, /* I - Client connection */
       SortPrinters();
     }
     else
-      DeletePrinter(printer);
+      DeletePrinter(printer, 1);
 
    /*
     * Add the printer as a new local printer...
@@ -3242,7 +3242,7 @@ delete_printer(client_t        *con,      /* I - Client connection */
     LogMessage(L_INFO, "Class \'%s\' deleted by \'%s\'.", dest,
                con->username);
 
-    DeletePrinter(printer);
+    DeletePrinter(printer, 0);
     SaveAllClasses();
   }
   else
@@ -3250,7 +3250,7 @@ delete_printer(client_t        *con,      /* I - Client connection */
     LogMessage(L_INFO, "Printer \'%s\' deleted by \'%s\'.", dest,
                con->username);
 
-    DeletePrinter(printer);
+    DeletePrinter(printer, 0);
     SaveAllPrinters();
   }
 
@@ -6621,5 +6621,5 @@ validate_user(client_t   *con,            /* I - Client connection */
 
 
 /*
- * End of "$Id: ipp.c,v 1.127.2.65 2003/04/25 15:30:20 mike Exp $".
+ * End of "$Id: ipp.c,v 1.127.2.66 2003/04/26 17:19:42 mike Exp $".
  */

diff --git a/scheduler/printers.c b/scheduler/printers.c
index 473a6eb745cc351e5f9ebcc3599d1a59484de8f8..a20af796db9d625358ede968afa4d7591aa88baa 100644 (file)
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.c,v 1.93.2.48 2003/04/25 15:30:26 mike Exp $"
+ * "$Id: printers.c,v 1.93.2.49 2003/04/26 17:19:47 mike Exp $"
  *
  *   Printer routines for the Common UNIX Printing System (CUPS).
  *
@@ -314,7 +314,7 @@ DeleteAllPrinters(void)
     next = p->next;
 
     if (!(p->type & CUPS_PRINTER_CLASS))
-      DeletePrinter(p);
+      DeletePrinter(p, 0);
   }
 
   if (CommonData)
@@ -330,7 +330,8 @@ DeleteAllPrinters(void)
  */
 
 void
-DeletePrinter(printer_t *p)    /* I - Printer to delete */
+DeletePrinter(printer_t *p,    /* I - Printer to delete */
+             int  update)      /* I - Update printers.conf? */
 {
   int          i;              /* Looping var */
   printer_t    *current,       /* Current printer in list */
@@ -375,7 +376,7 @@ DeletePrinter(printer_t *p) /* I - Printer to delete */
   * Stop printing on this printer...
   */
 
-  StopPrinter(p, 1);
+  StopPrinter(p, update);
 
  /*
   * Remove the dummy interface/icon/option files under IRIX...
@@ -2388,5 +2389,5 @@ write_irix_state(printer_t *p)            /* I - Printer to update */
 
 
 /*
- * End of "$Id: printers.c,v 1.93.2.48 2003/04/25 15:30:26 mike Exp $".
+ * End of "$Id: printers.c,v 1.93.2.49 2003/04/26 17:19:47 mike Exp $".
  */

diff --git a/scheduler/printers.h b/scheduler/printers.h
index cbebece9b0a6111e0199ff3b58aaffe2a21be883..d195acc2b0498e31dca8703722eb33766159fabc 100644 (file)
--- a/scheduler/printers.h
+++ b/scheduler/printers.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.h,v 1.22.2.13 2003/04/25 15:30:28 mike Exp $"
+ * "$Id: printers.h,v 1.22.2.14 2003/04/26 17:19:49 mike Exp $"
  *
  *   Printer definitions for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -101,7 +101,7 @@ extern void         AddPrinterHistory(printer_t *p);
 extern void            AddPrinterUser(printer_t *p, const char *username);
 extern quota_t         *AddQuota(printer_t *p, const char *username);
 extern void            DeleteAllPrinters(void);
-extern void            DeletePrinter(printer_t *p);
+extern void            DeletePrinter(printer_t *p, int update);
 extern void            DeletePrinterFilters(printer_t *p);
 extern printer_t       *FindDest(const char *name);
 extern printer_t       *FindPrinter(const char *name);
@@ -125,5 +125,5 @@ extern void         WritePrintcap(void);
 
 
 /*
- * End of "$Id: printers.h,v 1.22.2.13 2003/04/25 15:30:28 mike Exp $".
+ * End of "$Id: printers.h,v 1.22.2.14 2003/04/26 17:19:49 mike Exp $".
  */