Load cups into easysw/current.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@136 a1ca3aef-8c08-0410-bb20-df032aa958be

1 files changed, 11 insertions, 11 deletions

diff --git a/scheduler/mime.c b/scheduler/mime.c
index 1de12fe34..9c298e6fc 100644
--- a/scheduler/mime.c
+++ b/scheduler/mime.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: mime.c 5057 2006-02-02 20:38:29Z mike $"
+ * "$Id: mime.c 5394 2006-04-14 18:20:04Z mike $"
  *
  *   MIME database file routines for the Common UNIX Printing System (CUPS).
  *
@@ -97,15 +97,6 @@ mimeDelete(mime_t *mime)		/* I - MIME database */
     return;
 
  /*
-  * Loop through the file types and delete any rules...
-  */
-
-  for (type = (mime_type_t *)cupsArrayFirst(mime->types);
-       type;
-       type = (mime_type_t *)cupsArrayNext(mime->types))
-    mimeDeleteType(mime, type);
-
- /*
   * Loop through filters and free them...
   */
 
@@ -115,6 +106,15 @@ mimeDelete(mime_t *mime)		/* I - MIME database */
     mimeDeleteFilter(mime, filter);
 
  /*
+  * Loop through the file types and delete any rules...
+  */
+
+  for (type = (mime_type_t *)cupsArrayFirst(mime->types);
+       type;
+       type = (mime_type_t *)cupsArrayNext(mime->types))
+    mimeDeleteType(mime, type);
+
+ /*
   * Free the types and filters arrays, and then the MIME database structure.
   */
 
@@ -711,5 +711,5 @@ load_types(mime_t     *mime,		/* I - MIME database */
 
 
 /*
- * End of "$Id: mime.c 5057 2006-02-02 20:38:29Z mike $".
+ * End of "$Id: mime.c 5394 2006-04-14 18:20:04Z mike $".
  */