diff options
| -rwxr-xr-x | src/service-discovery-applet.in | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/service-discovery-applet.in b/src/service-discovery-applet.in index d01e709..0ff8691 100755 --- a/src/service-discovery-applet.in +++ b/src/service-discovery-applet.in @@ -293,9 +293,9 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet): print "Error:", str(err) def menuitem_response(self, widget, interface, protocol, name, type, domain): - if self.avahi_version == 2: + if self.avahi_version >= 2: self.server.ResolveService(interface, protocol, name, type, domain, avahi.PROTO_INET, dbus.UInt32(0), reply_handler=self.service_resolved, error_handler=self.print_error) - else: + elif self.avahi_version == 0: self.server.ResolveService(interface, protocol, name, type, domain, avahi.PROTO_INET, reply_handler=self.service_resolved_old, error_handler=self.print_error) def new_service_old(self, interface, protocol, name, type, domain): @@ -306,15 +306,15 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet): try: if self.show_local_services == False: - if self.avahi_version < 2: - if self.server.IsServiceLocal( interface, protocol, name, type, domain) == True: - return - else: + if self.avahi_version >= 2: try: if flags & avahi.LOOKUP_RESULT_LOCAL: return except AttributeError: pass + elif self.avahi_version == 0: + if self.server.IsServiceLocal( interface, protocol, name, type, domain) == True: + return except dbus.dbus_bindings.DBusException: pass @@ -373,13 +373,13 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet): print "Browsing for services of type '%s' in domain '%s' on %s.%i ..." % (type, domain, self.siocgifname(interface), protocol) - if self.avahi_version == 2: + if self.avahi_version >= 2: b = dbus.Interface(self.system_bus.get_object(avahi.DBUS_NAME, self.server.ServiceBrowserNew(interface, protocol, type, domain, dbus.UInt32(0))) , avahi.DBUS_INTERFACE_SERVICE_BROWSER) b.connect_to_signal('ItemNew', self.new_service) b.connect_to_signal('ItemRemove', self.remove_service) - else: + elif self.avahi_version == 0: b = dbus.Interface(self.system_bus.get_object(avahi.DBUS_NAME, self.server.ServiceBrowserNew(interface, protocol, type, domain)) , avahi.DBUS_INTERFACE_SERVICE_BROWSER) |