diff options
| -rwxr-xr-x | src/service-discovery-applet.in | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/service-discovery-applet.in b/src/service-discovery-applet.in index aef3193..d01e709 100755 --- a/src/service-discovery-applet.in +++ b/src/service-discovery-applet.in @@ -293,7 +293,7 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet): print "Error:", str(err) def menuitem_response(self, widget, interface, protocol, name, type, domain): - if self.avahi_version >= 514: + 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: self.server.ResolveService(interface, protocol, name, type, domain, avahi.PROTO_INET, reply_handler=self.service_resolved_old, error_handler=self.print_error) @@ -306,7 +306,7 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet): try: if self.show_local_services == False: - if self.avahi_version < 514: + if self.avahi_version < 2: if self.server.IsServiceLocal( interface, protocol, name, type, domain) == True: return else: @@ -373,7 +373,7 @@ 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 >= 514: + 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) @@ -440,7 +440,13 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet): self.sdaNotifications.display_notification(_("Already Discovering"),"") return try: - self.avahi_version = self.server.GetAPIVersion() + try: + self.avahi_version = self.server.GetAPIVersion() >> 8 + except: + if self.server.GetVersionString() == "avahi 0.6": + self.avahi_version = 0x0201 >> 8 + else: + self.avahi_version = 0x0000 >> 8 self.domain = self.server.GetDomainName() except: self.sdaNotifications.display_notification(_("Error Detected!"),_("Check that the Avahi daemon is running!")) |