Merge changes from CUPS 1.5svn-r8916.

[thirdparty/cups.git] / cups / dest.c

diff --git a/cups/dest.c b/cups/dest.c
index 54a393421b9643cdce7e45194063db621c8c0dd3..099f451d8248c778ade3db9238d87366529ca0d1 100644 (file)
--- a/cups/dest.c
+++ b/cups/dest.c
@@ -33,7 +33,6 @@
  *                           server.
  *   appleCopyLocations()  - Copy the location history array.
  *   appleCopyNetwork()    - Get the network ID for the current location.
- *   appleGetDefault()     - Get the default printer for this location.
  *   appleGetPaperSize()   - Get the default paper size.
  *   appleGetPrinter()     - Get a printer from the history array.
  *   appleSetDefault()     - Set the default printer for this location.
@@ -549,7 +548,7 @@ cupsGetNamedDest(http_t     *http,  /* I - Connection to server or @code CUPS_HTT
 
   if (!cups_get_sdests(http, op, name, 0, &dest))
   {
-    if (op == CUPS_GET_DEFAULT)
+    if (op == CUPS_GET_DEFAULT || name)
       return (NULL);
 
    /*
@@ -1288,6 +1287,9 @@ appleUseLastPrinter(void)
   CFPropertyListRef    uselast;        /* Use last printer preference value */
 
 
+  if (getenv("CUPS_DISABLE_APPLE_DEFAULT"))
+    return (0);
+
   if ((uselast = CFPreferencesCopyAppValue(kUseLastPrinterAsCurrentPrinterKey,
                                            kPMPrintingPreferences)) != NULL)
   {