banshee r3635 - in trunk/banshee: . src/Extensions/Banshee.Daap/Banshee.Daap src/Extensions/Banshee.Daap/Daap

[ahixon svn gnome org]

Author: ahixon
Date: Tue Apr  1 08:07:20 2008
New Revision: 3635
URL: http://svn.gnome.org/viewvc/banshee?rev=3635&view=rev

Log:
2008-04-01  Alexander Hixon  <hixon alexander mediati org>

	* src/Extensions/Banshee.Daap/Daap/ServiceLocator.cs: Slightly better
	workaround for IPv6 addresses (that is, only listen for IPv4 addresses).

	* src/Extensions/Banshee.Daap/Banshee.Daap/DaapContainerSource.cs: Remove
	commented Add/RemoveChildSource and Count overrides.


Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Extensions/Banshee.Daap/Banshee.Daap/DaapContainerSource.cs
   trunk/banshee/src/Extensions/Banshee.Daap/Daap/ServiceLocator.cs

Modified: trunk/banshee/src/Extensions/Banshee.Daap/Banshee.Daap/DaapContainerSource.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Daap/Banshee.Daap/DaapContainerSource.cs	(original)
+++ trunk/banshee/src/Extensions/Banshee.Daap/Banshee.Daap/DaapContainerSource.cs	Tue Apr  1 08:07:20 2008
@@ -51,23 +51,6 @@
             get { return false; }
         }
         
-        /*private int count;
-        public override int Count {
-            get { return count; }
-        }
-        
-        public override void AddChildSource (Source child)
-        {
-            count++;
-            base.AddChildSource (child);
-        }
-        
-        public override void RemoveChildSource (Source child)
-        {
-            count--;
-            base.RemoveChildSource (child);
-        }*/
-        
         protected override string TypeUniqueId {
             get { return "daap-container"; }
         }

Modified: trunk/banshee/src/Extensions/Banshee.Daap/Daap/ServiceLocator.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Daap/Daap/ServiceLocator.cs	(original)
+++ trunk/banshee/src/Extensions/Banshee.Daap/Daap/ServiceLocator.cs	Tue Apr  1 08:07:20 2008
@@ -145,8 +145,9 @@
             
             IPAddress address = args.Service.HostEntry.AddressList[0];
             if (address.AddressFamily == AddressFamily.InterNetworkV6) {
-                // XXX: Workaround a Mono bug where we can't resolve IPv6 addresses properly, so we fix it here
-                address = Dns.GetHostEntry (args.Service.HostEntry.HostName).AddressList[0];
+                // XXX: Workaround a Mono bug where we can't resolve IPv6 addresses properly
+                //address = Dns.GetHostEntry (args.Service.HostEntry.HostName).AddressList[0];
+                return;
             }
             
             DAAP.Service svc = new DAAP.Service (address, (ushort)service.Port,