get rid of a lot of old svn cruft

[catta] / avahi-sharp / ServiceResolver.cs

diff --git a/avahi-sharp/ServiceResolver.cs b/avahi-sharp/ServiceResolver.cs
index a11721ac595aafd899201abcd7833d1b7ba33d28..7f8901a177a6beefe0ae7ac5a672bf29c0c421cc 100644 (file)
--- a/avahi-sharp/ServiceResolver.cs
+++ b/avahi-sharp/ServiceResolver.cs
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /***
   This file is part of avahi.
 
@@ -51,7 +49,7 @@ namespace Avahi
 
         private ArrayList foundListeners = new ArrayList ();
         private ArrayList timeoutListeners = new ArrayList ();
-        
+
         [DllImport ("avahi-client")]
         private static extern IntPtr avahi_service_resolver_new (IntPtr client, int iface, Protocol proto,
                                                                  byte[] name, byte[] type, byte[] domain,
@@ -82,7 +80,7 @@ namespace Avahi
                 Stop (false);
             }
         }
-        
+
         public event EventHandler Timeout
         {
             add {
@@ -115,7 +113,7 @@ namespace Avahi
                                                                             GetLookupFlags (service.Flags))
         {
         }
-        
+
         public ServiceResolver (Client client, int iface, Protocol proto, string name,
                                 string type, string domain, Protocol aproto, LookupFlags flags)
         {
@@ -182,9 +180,11 @@ namespace Avahi
             info.Name = Utility.PtrToString (name);
             info.HostName = Utility.PtrToString (host);
             info.Address = Utility.PtrToAddress (address);
-            info.Address.ScopeId = iface;
             info.Port = port;
 
+            if (proto == Protocol.IPv6)
+              info.Address.ScopeId = iface;
+
             ArrayList txtlist = new ArrayList ();
             for (IntPtr l = txt; l != IntPtr.Zero; l = avahi_string_list_get_next (l)) {
                 IntPtr buf = avahi_string_list_get_text (l);