=== modified file 'plugins/daapclient/__init__.py'
--- plugins/daapclient/__init__.py  2010-05-30 19:36:59 +0000
+++ plugins/daapclient/__init__.py  2011-02-13 02:57:33 +0000
@@ -76,14 +76,15 @@
         """
             Called when a new share is found.
         """
-        logger.info("DAAP: Found %s." % name)
+        logger.info("DAAP: Found {0} at {3} ({1}::{2}).".format(name,address,port,host))
         #Use all available info in key to avoid name conflicts.
         nstr = '%s%s%s%s%s' % (interface, protocol, name, type, domain)

         if name in self.services:   # using only name for conflicts (for multiple adapters)
             return

-        self.services[name] = (address, port)
+        server = host if host else address
+        self.services[name] = (server, port)
         self.new_share_menu_item(name)

     def remove_service(self, interface, protocol, name, type, domain, flags):

=== modified file 'plugins/daapserver/__init__.py'
--- plugins/daapserver/__init__.py  2010-05-29 23:42:55 +0000
+++ plugins/daapserver/__init__.py  2011-02-13 02:27:09 +0000
@@ -29,7 +29,6 @@
         self.map = []

     def __iter__(self):
-        print 'GEN ITERRR'
         i = 0
         self.map = []
         for t in self.collection: