fix some small bugs in publishing and resolving, and make uninstall work

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@568 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/avahi-sharp/EntryGroup.cs b/avahi-sharp/EntryGroup.cs
index 9ca996e78fde525b776797b4bbd4175ae1573819..aa97dbda2adac0b21e5df4ee6a596ca3c75017b3 100644 (file)
--- a/avahi-sharp/EntryGroup.cs
+++ b/avahi-sharp/EntryGroup.cs
@@ -68,7 +68,7 @@ namespace Avahi
         private static extern IntPtr avahi_string_list_new (IntPtr txt);
 
         [DllImport ("avahi-common")]
-        private static extern void avahi_string_list_add (IntPtr list, IntPtr txt);
+        private static extern IntPtr avahi_string_list_add (IntPtr list, IntPtr txt);
 
         [DllImport ("avahi-common")]
         private static extern void avahi_string_list_free (IntPtr list);
@@ -131,7 +131,7 @@ namespace Avahi
             if (txt != null) {
                 foreach (string item in txt) {
                     IntPtr itemPtr = Utility.StringToPtr (item);
-                    avahi_string_list_add (list, itemPtr);
+                    list = avahi_string_list_add (list, itemPtr);
                     Utility.Free (itemPtr);
                 }
             }
@@ -145,8 +145,6 @@ namespace Avahi
             avahi_string_list_free (list);
 
             client.CheckError ();
-            
-            Console.WriteLine ("Added service: {0}, {1}, {2}, {3}, {4}", name, type, domain, host, port);
         }
 
         private void OnEntryGroupCallback (IntPtr group, EntryGroupState state, IntPtr userdata)

diff --git a/avahi-sharp/HostNameResolver.cs b/avahi-sharp/HostNameResolver.cs
index 8b529c702b0bbda9edb0ef02a92cfe603096ef81..a8cf0f17052d117cdf83313e6ea0c7dc9a90ebee 100644 (file)
--- a/avahi-sharp/HostNameResolver.cs
+++ b/avahi-sharp/HostNameResolver.cs
@@ -123,7 +123,7 @@ namespace Avahi
 
             IntPtr hostPtr = Utility.StringToPtr (hostname);
             handle = avahi_host_name_resolver_new (client.Handle, iface, proto, hostPtr, aproto,
-                                                   OnHostNameResolverCallback, IntPtr.Zero);
+                                                   cb, IntPtr.Zero);
             Utility.Free (hostPtr);
         }
 

diff --git a/avahi-sharp/Makefile.am b/avahi-sharp/Makefile.am
index 070b29cb2f28fdf36d38f51693a5f52aa367924d..d361221882dec301d02efa3a007617923007393f 100644 (file)
--- a/avahi-sharp/Makefile.am
+++ b/avahi-sharp/Makefile.am
@@ -41,6 +41,9 @@ $(ASSEMBLY): $(AVAHISOURCES)
 if HAVE_MONO
 all: $(ASSEMBLY)
 
-install-data-hook:
+install-data-hook: $(ASSEMBLY)
        $(GACUTIL) /i $(ASSEMBLY) /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
+
+uninstall-hook: $(ASSEMBLY)
+       $(GACUTIL) /u avahi-sharp /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
 endif

diff --git a/avahi-sharp/ServiceResolver.cs b/avahi-sharp/ServiceResolver.cs
index ef1f3037155ca927b836304b70ae53ba049f238c..558ba539d6ac86c4532f51287077130572e16789 100644 (file)
--- a/avahi-sharp/ServiceResolver.cs
+++ b/avahi-sharp/ServiceResolver.cs
@@ -161,6 +161,7 @@ namespace Avahi
                                                 IntPtr domain, IntPtr host, IntPtr address,
                                                 UInt16 port, IntPtr txt, IntPtr userdata)
         {
+
             ServiceInfo info;
             info.NetworkInterface = iface;
             info.Protocol = proto;