From 9ba4bc93654f0723297fe1b05dd09921b8296ae8 Mon Sep 17 00:00:00 2001 From: Sebastian Droege Date: Sat, 4 Mar 2006 14:49:36 +0000 Subject: * Raise avahi requirements to 0.6.9 git-svn-id: file:///home/lennart/svn/public/service-discovery-applet/trunk@94 3be567f1-68ff-0310-b24a-ad7cc433fd2f --- src/service-discovery-applet.in | 43 ++++++++++++++++------------------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/src/service-discovery-applet.in b/src/service-discovery-applet.in index ee0c013..f2c3af2 100755 --- a/src/service-discovery-applet.in +++ b/src/service-discovery-applet.in @@ -60,17 +60,21 @@ except ImportError, e: # SERVICES THAT WILL BE ADDED TO GCONF ON THE FIRST RUN # # default browsing value -first_run_services = {} -for (stype, description) in avahi.ServiceTypeDatabase.ServiceTypeDatabase().items(): - first_run_services[stype] = False - -first_run_services["_http._tcp"] = True -first_run_services["_https._tcp"] = True -first_run_services["_ssh._tcp"] = True -first_run_services["_sftp-ssh._tcp"] = True -first_run_services["_ftp._tcp"] = True -first_run_services["_webdav._tcp"] = True -first_run_services["_webdavs._tcp"] = True +try: + first_run_services = {} + for (stype, desc) in avahi.ServiceTypeDatabase.ServiceTypeDatabase().items(): + first_run_services[stype] = False + + first_run_services["_http._tcp"] = True + first_run_services["_https._tcp"] = True + first_run_services["_ssh._tcp"] = True + first_run_services["_sftp-ssh._tcp"] = True + first_run_services["_ftp._tcp"] = True + first_run_services["_webdav._tcp"] = True + first_run_services["_webdavs._tcp"] = True +except: + error_msg(_("You need at least avahi 0.6.9")) + sys.exit() ############################################################################### @@ -299,8 +303,6 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet): 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) - 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): self.new_service(interface, protocol, name, type, domain, None) @@ -316,9 +318,6 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet): 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 @@ -383,12 +382,6 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet): , avahi.DBUS_INTERFACE_SERVICE_BROWSER) b.connect_to_signal('ItemNew', self.new_service) b.connect_to_signal('ItemRemove', self.remove_service) - 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) - b.connect_to_signal('ItemNew', self.new_service_old) - b.connect_to_signal('ItemRemove', self.remove_service_old) self.service_browsers[(interface, protocol, type, domain)] = b @@ -447,10 +440,8 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet): 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 + error_msg(_("You need at least avahi 0.6.9")) + sys.exit() self.domain = self.server.GetDomainName() except: self.sdaNotifications.display_notification(_("Error Detected!"),_("Check that the Avahi daemon is running!")) -- cgit