From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Wed, 5 Mar 2014 12:53:37 +0000 (+0000)
Subject: Mirror fix from trunk.
X-Git-Tag: release-2.1.4~16^2~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=588cfd8b2270fc2c885779c78ec8677d53ef1760;p=thirdparty%2Fcups.git

Mirror fix from trunk.


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.7@11675 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/CHANGES.txt b/CHANGES.txt
index b1fc8d2a3a..0d737461de 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-CHANGES.txt - 1.7.2 - 2014-02-27
+CHANGES.txt - 1.7.2 - 2014-03-05
 --------------------------------
 
 CHANGES IN CUPS V1.7.2
@@ -7,6 +7,7 @@ CHANGES IN CUPS V1.7.2
 	  (STR #4356)
 	- Documentation fixes (STR #3259, STR #4346)
 	- Added a German localization (STR #4363)
+	- cupsEnumDests didn't always call the callback function (STR #4380)
 	- "lp -i job-id -H hold" did not work (STR #nnn)
 	- CUPS didn't compile on older platforms (STR #4338)
 	- Several libcups files did not have the Apple license exception
diff --git a/cups/dest.c b/cups/dest.c
index 36481f8082..855472dc11 100644
--- a/cups/dest.c
+++ b/cups/dest.c
@@ -953,11 +953,11 @@ cupsEnumDests(
   * Get Bonjour-shared printers...
   */
 
-  data.type    = type;
-  data.mask    = mask;
-  data.devices = cupsArrayNew3((cups_array_func_t)cups_dnssd_compare_devices,
-                               NULL, NULL, 0, NULL,
-                               (cups_afree_func_t)cups_dnssd_free_device);
+  data.type      = type;
+  data.mask      = mask;
+  data.cb        = cb;
+  data.user_data = user_data;
+  data.devices   = cupsArrayNew3((cups_array_func_t)cups_dnssd_compare_devices, NULL, NULL, 0, NULL, (cups_afree_func_t)cups_dnssd_free_device);
 
 #  ifdef HAVE_DNSSD
   if (DNSServiceCreateConnection(&data.main_ref) != kDNSServiceErr_NoError)