update to current avahi-core API

[catta] / avahi-sharp / DomainBrowser.cs

diff --git a/avahi-sharp/DomainBrowser.cs b/avahi-sharp/DomainBrowser.cs
index 32948dfb4232add9015f1376afa3b4ebb2d8850c..76438f813d27fc854550734b929d9e8256dd1ed8 100644 (file)
--- a/avahi-sharp/DomainBrowser.cs
+++ b/avahi-sharp/DomainBrowser.cs
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /***
   This file is part of avahi.
 
@@ -52,6 +54,7 @@ namespace Avahi
         private Protocol proto;
         private string domain;
         private DomainBrowserType btype;
+        private DomainBrowserCallback cb;
 
         private ArrayList addListeners = new ArrayList ();
         private ArrayList removeListeners = new ArrayList ();
@@ -104,6 +107,7 @@ namespace Avahi
             this.proto = proto;
             this.domain = domain;
             this.btype = btype;
+            cb = OnDomainBrowserCallback;
         }
 
         ~DomainBrowser ()
@@ -118,20 +122,26 @@ namespace Avahi
 
         private void Start ()
         {
-            if (handle != IntPtr.Zero || (addListeners.Count == 0 && removeListeners.Count == 0))
+            if (client.Handle == IntPtr.Zero && handle != IntPtr.Zero ||
+                (addListeners.Count == 0 && removeListeners.Count == 0))
                 return;
 
-            IntPtr domainPtr = Utility.StringToPtr (domain);
-            handle = avahi_domain_browser_new (client.Handle, iface, (int) proto, domainPtr, (int) btype,
-                                               OnDomainBrowserCallback, IntPtr.Zero);
-            Utility.Free (domainPtr);
+            lock (client) {
+                IntPtr domainPtr = Utility.StringToPtr (domain);
+                handle = avahi_domain_browser_new (client.Handle, iface, (int) proto, domainPtr, (int) btype,
+                                                   cb, IntPtr.Zero);
+                Utility.Free (domainPtr);
+            }
         }
 
         private void Stop (bool force)
         {
-            if (handle != IntPtr.Zero && (force || (addListeners.Count == 0 && removeListeners.Count == 0))) {
-                avahi_domain_browser_free (handle);
-                handle = IntPtr.Zero;
+            if (client.Handle != IntPtr.Zero && handle != IntPtr.Zero &&
+                (force || (addListeners.Count == 0 && removeListeners.Count == 0))) {
+                lock (client) {
+                    avahi_domain_browser_free (handle);
+                    handle = IntPtr.Zero;
+                }
             }
         }