* This should solve the avahi-bookmarks and checking for python modules problems more elegantly

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

1 files changed, 5 insertions, 2 deletions

diff --git a/avahi-utils/avahi-bookmarks.in b/avahi-utils/avahi-bookmarks.in
index 39c1d8c..ac8d3da 100755
--- a/avahi-utils/avahi-bookmarks.in
+++ b/avahi-utils/avahi-bookmarks.in
@@ -74,7 +74,10 @@ class AvahiBookmarks(resource.Resource):
 
         for k in l:
             if k[:5] == "path=":
-                return k[5:]
+                if k[5]:
+                    return "/" + k[5:]
+                else
+                    return k[5:]
 
         return "/"
 
@@ -101,7 +104,7 @@ class AvahiBookmarks(resource.Resource):
                 else:
                     ip = v[2]
 
-                t += '<li><a href="%s://%s%s/%s">%s</a></li>' % (urlproto[k[3]], ip, port, path, k[2])
+                t += '<li><a href="%s://%s%s%s">%s</a></li>' % (urlproto[k[4]], ip, port, path, k[2])
                 
             t += '</ul>'