diff options
Diffstat (limited to 'avahi-utils')
| -rw-r--r-- | avahi-utils/Makefile.am | 4 | ||||
| -rwxr-xr-x | avahi-utils/avahi-bookmarks.in | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am index 3adf84c..f5c69fa 100644 --- a/avahi-utils/Makefile.am +++ b/avahi-utils/Makefile.am @@ -35,11 +35,11 @@ EXTRA_DIST = \ if HAVE_PYTHON -if HAVE_DBUS +if HAVE_PYTHON_DBUS SUBDIRS=avahi -if HAVE_GTK +if HAVE_PYGTK desktopdir = $(datadir)/applications desktop_DATA = avahi-discover.desktop 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>' |