From 47966f7023580dcef964700b76f9b75a8ed622e6 Mon Sep 17 00:00:00 2001 From: Sebastien Estienne Date: Tue, 7 Mar 2006 17:29:14 +0000 Subject: * remove code that was no more usefull git-svn-id: file:///home/lennart/svn/public/service-discovery-applet/trunk@97 3be567f1-68ff-0310-b24a-ad7cc433fd2f --- src/service-discovery-applet.in | 31 ++++++++----------------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/src/service-discovery-applet.in b/src/service-discovery-applet.in index f2c3af2..7bf7eb0 100755 --- a/src/service-discovery-applet.in +++ b/src/service-discovery-applet.in @@ -285,9 +285,6 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet): else: return self.server.GetNetworkInterfaceNameByIndex(interface) - def service_resolved_old(self, interface, protocol, name, type, domain, host, aprotocol, address, port, txt): - self.service_resolved(interface, protocol, name, type, domain, host, aprotocol, address, port, txt, None) - def service_resolved(self, interface, protocol, name, type, domain, host, aprotocol, address, port, txt, flags): 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)) @@ -301,23 +298,15 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet): print "Error:", str(err) def menuitem_response(self, widget, interface, protocol, name, type, domain): - 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) + self.server.ResolveService(interface, protocol, name, type, domain, avahi.PROTO_INET, dbus.UInt32(0), reply_handler=self.service_resolved, error_handler=self.print_error) - def new_service_old(self, interface, protocol, name, type, domain): - self.new_service(interface, protocol, name, type, domain, None) - def new_service(self, interface, protocol, name, type, domain, flags): print "Found service '%s' of type '%s' in domain '%s' on %s.%i." % (name, type, domain, self.siocgifname(interface), protocol) try: if self.show_local_services == False: - if self.avahi_version >= 2: - try: - if flags & avahi.LOOKUP_RESULT_LOCAL: - return - except AttributeError: - pass + if flags & avahi.LOOKUP_RESULT_LOCAL: + return except dbus.dbus_bindings.DBusException: pass @@ -352,9 +341,6 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet): self.sdaNotifications.display_service_notification(True, name, type) - def remove_service_old(self, interface, protocol, name, type, domain): - self.remove_service(interface, protocol, name, type, domain, None) - def remove_service(self, interface, protocol, name, type, domain, flags): print "Service '%s' of type '%s' in domain '%s' on %s.%i disappeared." % (name, type, domain, self.siocgifname(interface), protocol) @@ -376,12 +362,11 @@ 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: - 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) + 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) self.service_browsers[(interface, protocol, type, domain)] = b -- cgit