cupsEnumDests didn't always call the callback function (STR #4380)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11674 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES-1.7.txt b/CHANGES-1.7.txt
index f432d3b15ddf74e93811804216f94e370d77884d..c8e3da042eff56956ba152d810a8999c3fe928f0 100644 (file)
--- a/CHANGES-1.7.txt
+++ b/CHANGES-1.7.txt
@@ -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 f9853c8cd45c94a809332315655a265afb3e8457..c19caa741f4601a334a6a13b5e2d3fb916493d15 100644 (file)
--- a/cups/dest.c
+++ b/cups/dest.c
@@ -885,11 +885,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)