diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rwxr-xr-x | src/service-discovery-applet.in | 28 |
2 files changed, 20 insertions, 10 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 01c41b7..49b5bec 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,6 +19,7 @@ service-discovery-applet: service-discovery-applet.in -e 's,@version\@,$(VERSION),g' \ -e 's,@iconsdir\@,$(ICONSDIR),g' \ -e 's,@scriptsdir\@,$(SCRIPTSDIR),g' \ + -e 's,@actionsdir\@,$(ACTIONSDIR),g' \ $< > $@ chmod +x $@ @@ -29,6 +30,7 @@ service-discovery-config: service-discovery-config.in -e 's,@iconsdir\@,$(ICONSDIR),g' \ -e 's,@interfacesdir\@,$(INTERFACESDIR),g' \ -e 's,@scriptsdir\@,$(SCRIPTSDIR),g' \ + -e 's,@actionsdir\@,$(ACTIONSDIR),g' \ $< > $@ chmod +x $@ diff --git a/src/service-discovery-applet.in b/src/service-discovery-applet.in index ad74f70..f4b246f 100755 --- a/src/service-discovery-applet.in +++ b/src/service-discovery-applet.in @@ -18,6 +18,10 @@ import os import subprocess import sys import pygtk + +sys.path.append("@actionsdir@") +import services + pygtk.require('2.0') def error_msg(msg): @@ -140,16 +144,20 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet): def service_resolved(self, interface, protocol, name, type, domain, host, aprotocol, address, port, txt): print "Service data for service '%s' of type '%s' in domain '%s' on %s.%i:" % (name, type, domain, self.siocgifname(interface), protocol) print "\tHost %s (%s), port %i, TXT data: %s" % (host, address, port, avahi.txt_array_to_string_array(txt)) - if os.path.exists("@scriptsdir@/%s.sh" % type): - cmd = [] - cmd.append("@scriptsdir@/%s.sh" % type) - cmd.append("%s" % name) - cmd.append("%s" % host) - cmd.append("%s" % address) - cmd.append("%i" % port) - cmd.append('%s' % " ".join(avahi.txt_array_to_string_array(txt))) - print cmd - pid = subprocess.Popen(cmd).pid + + txts = avahi.txt_array_to_string_array(txt) + txts = services.pair_to_dict(txts) + services.handle(name, type, host, address, port, txts) +# if os.path.exists("@scriptsdir@/%s.sh" % type): +# cmd = [] +# cmd.append("@scriptsdir@/%s.sh" % type) +# cmd.append("%s" % name) +# cmd.append("%s" % host) +# cmd.append("%s" % address) +# cmd.append("%i" % port) +# cmd.append('%s' % " ".join(avahi.txt_array_to_string_array(txt))) +# print cmd +# pid = subprocess.Popen(cmd).pid def print_error(self, err): print "Error:", str(err) |