X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-sharp%2FDomainBrowser.cs;h=a1165dcc638e58086d3a8aa2ddd901b2e4841474;hb=7b124f6ae362a575460d2374dca39ebdce07c714;hp=fb32e774e19865693b7d3bffb03b3c375ea4c54d;hpb=cc272cf44768c9292879a9ee43783fec4b510ffd;p=catta

diff --git a/avahi-sharp/DomainBrowser.cs b/avahi-sharp/DomainBrowser.cs
index fb32e77..a1165dc 100644
--- a/avahi-sharp/DomainBrowser.cs
+++ b/avahi-sharp/DomainBrowser.cs
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /***
   This file is part of avahi.
 
@@ -22,6 +20,7 @@
 using System;
 using System.Collections;
 using System.Runtime.InteropServices;
+using System.Text;
 
 namespace Avahi
 {
@@ -29,10 +28,10 @@ namespace Avahi
                                                   IntPtr domain, LookupResultFlags flags, IntPtr userdata);
 
     public enum DomainBrowserType {
-        Register,
-        RegisterDefault,
         Browse,
         BrowseDefault,
+        Register,
+        RegisterDefault,
         BrowseLegacy
     }
 
@@ -44,9 +43,24 @@ namespace Avahi
         public LookupResultFlags Flags;
     }
 
-    public delegate void DomainInfoHandler (object o, DomainInfo info);
-    
-    public class DomainBrowser : IDisposable
+    public class DomainInfoArgs : EventArgs
+    {
+        private DomainInfo domain;
+
+        public DomainInfo Domain
+        {
+            get { return domain; }
+        }
+
+        public DomainInfoArgs (DomainInfo domain)
+        {
+            this.domain = domain;
+        }
+    }
+
+    public delegate void DomainInfoHandler (object o, DomainInfoArgs args);
+
+    public class DomainBrowser : BrowserBase, IDisposable
     {
         private IntPtr handle;
         private ArrayList infos = new ArrayList ();
@@ -60,10 +74,10 @@ namespace Avahi
 
         private ArrayList addListeners = new ArrayList ();
         private ArrayList removeListeners = new ArrayList ();
-        
+
         [DllImport ("avahi-client")]
         private static extern IntPtr avahi_domain_browser_new (IntPtr client, int iface, int proto,
-                                                               IntPtr domain, int btype, LookupFlags flags,
+                                                               byte[] domain, int btype, LookupFlags flags,
                                                                DomainBrowserCallback cb,
                                                                IntPtr userdata);
 
@@ -81,7 +95,7 @@ namespace Avahi
                 Stop (false);
             }
         }
-        
+
         public event DomainInfoHandler DomainRemoved
         {
             add {
@@ -102,7 +116,7 @@ namespace Avahi
         public DomainBrowser (Client client) : this (client, -1, Protocol.Unspecified, client.DomainName,
                                                      DomainBrowserType.Browse, LookupFlags.None) {
         }
-        
+
         public DomainBrowser (Client client, int iface, Protocol proto, string domain,
                               DomainBrowserType btype, LookupFlags flags)
         {
@@ -132,10 +146,12 @@ namespace Avahi
                 return;
 
             lock (client) {
-                IntPtr domainPtr = Utility.StringToPtr (domain);
-                handle = avahi_domain_browser_new (client.Handle, iface, (int) proto, domainPtr, (int) btype, flags,
+                handle = avahi_domain_browser_new (client.Handle, iface, (int) proto,
+                                                   Utility.StringToBytes (domain), (int) btype, flags,
                                                    cb, IntPtr.Zero);
-                Utility.Free (domainPtr);
+
+                if (handle == IntPtr.Zero)
+                    client.ThrowError ();
             }
         }
 
@@ -160,18 +176,22 @@ namespace Avahi
             info.Domain = Utility.PtrToString (domain);
             info.Flags = flags;
 
-            infos.Add (info);
-            
-            if (bevent == BrowserEvent.Added) {
+            switch (bevent) {
+            case BrowserEvent.Added:
                 infos.Add (info);
 
                 foreach (DomainInfoHandler handler in addListeners)
-                    handler (this, info);
-            } else {
+                    handler (this, new DomainInfoArgs (info));
+                break;
+            case BrowserEvent.Removed:
                 infos.Remove (info);
 
                 foreach (DomainInfoHandler handler in removeListeners)
-                    handler (this, info);
+                    handler (this, new DomainInfoArgs (info));
+                break;
+            default:
+                EmitBrowserEvent (bevent);
+                break;
             }
         }
     }