summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastien Estienne <sebastien.estienne@gmail.com>2007-02-27 11:28:20 +0000
committerSebastien Estienne <sebastien.estienne@gmail.com>2007-02-27 11:28:20 +0000
commit77ce47d3afb1c55439f4f0020e44b33c73d2b78a (patch)
treedfb1ebbd99185b147d965e26d6f6cee9f5f37b7b
parentb8e740b1eaf3058457b6f50e200e28d5beefa3de (diff)
handle avahi restart
update to dbus api 1.0 git-svn-id: file:///home/lennart/svn/public/service-discovery-applet/trunk@131 3be567f1-68ff-0310-b24a-ad7cc433fd2f
-rwxr-xr-xsrc/service-discovery-applet.in21
1 files changed, 10 insertions, 11 deletions
diff --git a/src/service-discovery-applet.in b/src/service-discovery-applet.in
index 55655c1..08fb577 100755
--- a/src/service-discovery-applet.in
+++ b/src/service-discovery-applet.in
@@ -190,20 +190,12 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet):
self.domain = ""
try:
self.system_bus = dbus.SystemBus()
- self.server = dbus.Interface(self.system_bus.get_object(avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER),
- avahi.DBUS_INTERFACE_SERVER)
-
self.system_bus.add_signal_receiver(self.avahi_dbus_connect_cb, "NameOwnerChanged", "org.freedesktop.DBus", arg0="org.freedesktop.Avahi")
except dbus.DBusException, e:
error_msg(_("<b>DBus Error:</b>\nCan't contact the system bus.\n\n Exiting..."))
pprint.pprint(e)
sys.exit(1)
- try:
- self.use_host_names = self.server.IsNSSSupportAvailable()
- except:
- self.use_host_names = False
-
if not pynotify.init(_("Zeroconf Service Discovery")):
error_msg(_("<b>Notification Daemon Error:</b>\n Notifications won't work."))
self.applet.show_notifications = False
@@ -295,7 +287,7 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet):
if self.show_local_services == False:
if flags & avahi.LOOKUP_RESULT_LOCAL:
return
- except dbus.dbus_bindings.DBusException:
+ except dbus.DBusException:
pass
# if we found a service, remove "No service found"
@@ -366,7 +358,7 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet):
sb = self.service_browsers[service]
try:
sb.Free()
- except dbus.dbus_bindings.DBusException:
+ except dbus.DBusException:
pass
del self.service_browsers[service]
# delete the sub menu of service_type
@@ -413,11 +405,18 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet):
self.display_notification(_("Already Discovering"),"")
return
try:
- self.domain = self.server.GetDomainName()
+ self.server = dbus.Interface(self.system_bus.get_object(avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER),
+ avahi.DBUS_INTERFACE_SERVER)
+ self.domain = self.server.GetDomainName()
except:
self.display_notification(_("Error Detected!"),_("Check that the Avahi daemon is running!"))
return
+ try:
+ self.use_host_names = self.server.IsNSSSupportAvailable()
+ except:
+ self.use_host_names = False
+
self.display_notification(_("Starting discovery"),"")
self.interface = avahi.IF_UNSPEC