From 335b78e9e21cdf6411b386ffe06cdc7a6db50349 Mon Sep 17 00:00:00 2001 From: mike Date: Wed, 23 Apr 2003 18:55:28 +0000 Subject: [PATCH] Mirror 1.1.x changes. git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@3657 7a7537e8-13f0-0310-91df-b6672ffda945 --- CHANGES-1.1.txt | 1 + scheduler/conf.c | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGES-1.1.txt b/CHANGES-1.1.txt index 86ac1b2cd5..0157a01b22 100644 --- a/CHANGES-1.1.txt +++ b/CHANGES-1.1.txt @@ -3,6 +3,7 @@ CHANGES-1.1.txt CHANGES IN CUPS V1.1.19rc3 + - Scan backends first, PPDs second (STR #37) - Updated the Netatalk documentation in the SAM (STR #38 and #39) - The test suite sent text files to a non-PS print queue, diff --git a/scheduler/conf.c b/scheduler/conf.c index b5492d3490..4dd7c318c4 100644 --- a/scheduler/conf.c +++ b/scheduler/conf.c @@ -1,5 +1,5 @@ /* - * "$Id: conf.c,v 1.77.2.39 2003/04/10 21:18:35 mike Exp $" + * "$Id: conf.c,v 1.77.2.40 2003/04/23 18:55:28 mike Exp $" * * Configuration routines for the Common UNIX Printing System (CUPS). * @@ -702,12 +702,12 @@ ReadConfiguration(void) * Load devices and PPDs... */ - snprintf(temp, sizeof(temp), "%s/model", DataDir); - LoadPPDs(temp); - snprintf(temp, sizeof(temp), "%s/backend", ServerBin); LoadDevices(temp); + snprintf(temp, sizeof(temp), "%s/model", DataDir); + LoadPPDs(temp); + /* * Load queued jobs... */ @@ -2293,5 +2293,5 @@ CDSAGetServerCerts(void) /* - * End of "$Id: conf.c,v 1.77.2.39 2003/04/10 21:18:35 mike Exp $". + * End of "$Id: conf.c,v 1.77.2.40 2003/04/23 18:55:28 mike Exp $". */ -- 2.47.3