add a missing file, and add EntryGroup.GetAlternativeServiceName

[catta] / avahi-sharp / ServiceTypeBrowser.cs

diff --git a/avahi-sharp/ServiceTypeBrowser.cs b/avahi-sharp/ServiceTypeBrowser.cs
index cd6bfbb0db978947e1cf95b289e6679d8af84f86..ab6a8668183d852a84ab0aa7997c084d09f350b5 100644 (file)
--- a/avahi-sharp/ServiceTypeBrowser.cs
+++ b/avahi-sharp/ServiceTypeBrowser.cs
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /***
   This file is part of avahi.
 
@@ -44,6 +46,7 @@ namespace Avahi
         private int iface;
         private Protocol proto;
         private string domain;
+        private ServiceTypeBrowserCallback cb;
 
         private ArrayList addListeners = new ArrayList ();
         private ArrayList removeListeners = new ArrayList ();
@@ -99,6 +102,7 @@ namespace Avahi
             this.iface = iface;
             this.proto = proto;
             this.domain = domain;
+            cb = OnServiceTypeBrowserCallback;
         }
 
         ~ServiceTypeBrowser ()
@@ -113,20 +117,27 @@ 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_service_type_browser_new (client.Handle, iface, (int) proto, domainPtr,
-                                                     OnServiceTypeBrowserCallback, IntPtr.Zero);
-            Utility.Free (domainPtr);
+            lock (client) {
+                IntPtr domainPtr = Utility.StringToPtr (domain);
+                handle = avahi_service_type_browser_new (client.Handle, iface, (int) proto, domainPtr,
+                                                         cb, IntPtr.Zero);
+                Utility.Free (domainPtr);
+            }
         }
 
         private void Stop (bool force)
         {
-            if (handle != IntPtr.Zero && (force || (addListeners.Count == 0 && removeListeners.Count == 0))) {
-                avahi_service_type_browser_free (handle);
-                handle = IntPtr.Zero;
+            if (client.Handle != IntPtr.Zero && handle != IntPtr.Zero &&
+                (force || (addListeners.Count == 0 && removeListeners.Count == 0))) {
+
+                lock (client) {
+                    avahi_service_type_browser_free (handle);
+                    handle = IntPtr.Zero;
+                }
             }
         }