diff options
Diffstat (limited to 'src/service-discovery-applet.in')
| -rwxr-xr-x | src/service-discovery-applet.in | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/service-discovery-applet.in b/src/service-discovery-applet.in index 3949cec..6c23930 100755 --- a/src/service-discovery-applet.in +++ b/src/service-discovery-applet.in @@ -20,8 +20,8 @@ import subprocess import sys import pygtk -sys.path.append("@actionsdir@") -import services +import sdapplet.pluginloader +import sdapplet.pluginutils pygtk.require('2.0') @@ -207,6 +207,9 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet): self.zc_types = {} self.zc_services = {} + # Plugins + self.plugin = sdapplet.pluginloader.PluginLoader("@pluginsdir@") + self.sdaGconf = SDAGconf(self) self.show_local_services = self.sdaGconf.get_option("show_local_services") self.show_notifications = self.sdaGconf.get_option("show_notifications") @@ -282,8 +285,8 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet): print "\tHost %s (%s), port %i, TXT data: %s" % (host, address, port, avahi.txt_array_to_string_array(txt)) txts = avahi.txt_array_to_string_array(txt) - txts = services.pair_to_dict(txts) - services.handle(name, type, host, address, port, txts) + txts = sdapplet.pluginutils.pair_to_dict(txts) + self.plugin.plugins[type][0].connect(name, type, host, address, port, txts) def print_error(self, err): # FIXME we should use notifications @@ -307,7 +310,6 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet): if self.server.IsServiceLocal( interface, protocol, name, type, domain) == True: return else: -# FIXME not yet available in python avahi try: if flags & avahi.LOOKUP_RESULT_LOCAL: return |