diff options
| author | Sebastien Estienne <sebastien.estienne@gmail.com> | 2005-10-28 20:05:45 +0000 |
|---|---|---|
| committer | Sebastien Estienne <sebastien.estienne@gmail.com> | 2005-10-28 20:05:45 +0000 |
| commit | 8d0cb6fed6808d71ee321915a4503f9e73677d85 (patch) | |
| tree | ae3d789fa819ccc5caa82f8347fee909c44cc8f4 | |
| parent | 1e145d148a8defa60dc8fb0bd13e91c8725f14e9 (diff) | |
* catch exception of missing avahi define
git-svn-id: file:///home/lennart/svn/public/service-discovery-applet/trunk@74 3be567f1-68ff-0310-b24a-ad7cc433fd2f
| -rwxr-xr-x | src/service-discovery-applet.in | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/service-discovery-applet.in b/src/service-discovery-applet.in index 11dbcf9..5a13bc8 100755 --- a/src/service-discovery-applet.in +++ b/src/service-discovery-applet.in @@ -150,7 +150,6 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet): self.server = dbus.Interface(self.system_bus.get_object(avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER), avahi.DBUS_INTERFACE_SERVER) - self.avahi_version = self.server.GetVersionString() self.session_bus = dbus.SessionBus() obj = self.session_bus.get_object("org.freedesktop.Notifications", "/org/freedesktop/Notifications") self.notif = dbus.Interface(obj, "org.freedesktop.Notifications") @@ -203,8 +202,12 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet): if self.server.IsServiceLocal( interface, protocol, name, type, domain) == True: return else: - if flags & avahi.AVAHI_LOOKUP_RESULT_IS_LOCAL: - return +# FIXME not yet available in python avahi + try: + if flags & avahi.AVAHI_LOOKUP_RESULT_IS_LOCAL: + return + except AttributeError: + pass except dbus.dbus_bindings.DBusException: pass @@ -331,6 +334,7 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet): self.display_notification(_("Already Discovering"),"") return try: + self.avahi_version = self.server.GetVersionString() self.domain = self.server.GetDomainName() except: self.display_notification(_("Error Detected!"),_("Check that the Avahi daemon is running!")) |