Merge changes from CUPS 1.4svn-r7485.

[thirdparty/cups.git] / scheduler / server.c

diff --git a/scheduler/server.c b/scheduler/server.c
index dcff28baa91ea39745d8d092a81b45e34dd6c6a4..9483ae65898c1a02f4cf0028592fb434b2e4e3ea 100644 (file)
--- a/scheduler/server.c
+++ b/scheduler/server.c
@@ -3,7 +3,7 @@
  *
  *   Server start/stop routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007 by Apple Inc.
+ *   Copyright 2007-2008 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -137,7 +137,6 @@ cupsdStopServer(void)
   cupsdStopPolling();
   cupsdStopBrowsing();
   cupsdStopAllNotifiers();
-  cupsdSaveRemoteCache();
   cupsdDeleteAllCerts();
 
   if (Clients)
@@ -203,6 +202,13 @@ cupsdStopServer(void)
   cupsdDestroyProfile(DefaultProfile);
   DefaultProfile = NULL;
 
+ /*
+  * Write out any dirty files...
+  */
+
+  if (DirtyFiles)
+    cupsdCleanDirty();
+
   started = 0;
 }