From 73f63cb9f8ca693ef211d283e8b3f83721e687b1 Mon Sep 17 00:00:00 2001 From: Sebastien Estienne Date: Fri, 25 Aug 2006 23:49:09 +0000 Subject: * remove test for avahi 0.6.9 from the code * move these tests in configure.ac * update README git-svn-id: file:///home/lennart/svn/public/service-discovery-applet/trunk@116 3be567f1-68ff-0310-b24a-ad7cc433fd2f --- src/service-discovery-applet.in | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/src/service-discovery-applet.in b/src/service-discovery-applet.in index 8f2b8b4..4cc43cc 100755 --- a/src/service-discovery-applet.in +++ b/src/service-discovery-applet.in @@ -89,17 +89,13 @@ class SDAGconf: self.gc_client.notify_add (self.gc_services, self.gc_services_cb) self.gc_client.notify_add (self.gc_options, self.gc_options_cb) - try: - for (stype, desc) in avahi.ServiceTypeDatabase.ServiceTypeDatabase().items(): - if not self.gc_client.get("%s/%s" % (self.gc_services, stype)): - if self.plugin.plugins.has_key(stype): - enabled = True - else: - enabled = False - self.gc_client.set_bool("%s/%s" % (self.gc_services, stype), enabled) - except: - error_msg(_("You need at least avahi 0.6.9")) - sys.exit() + for (stype, desc) in avahi.ServiceTypeDatabase.ServiceTypeDatabase().items(): + if not self.gc_client.get("%s/%s" % (self.gc_services, stype)): + if self.plugin.plugins.has_key(stype): + enabled = True + else: + enabled = False + self.gc_client.set_bool("%s/%s" % (self.gc_services, stype), enabled) def get_services(self): services = [] @@ -412,11 +408,6 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet): self.sdaNotifications.display_notification(_("Already Discovering"),"") return try: - try: - self.avahi_version = self.server.GetAPIVersion() >> 8 - except: - 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