diff options
| author | Lennart Poettering <lennart@poettering.net> | 2005-07-30 16:30:18 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2005-07-30 16:30:18 +0000 |
| commit | f68a3a04e407e5bae5fffb703de8d4b981e4de53 (patch) | |
| tree | fdddbba60e83c7c1a4778bcb2951b5402a6f4dec /avahi-utils/avahi-dump-all | |
| parent | f9e13b26d751151c8dab7bbaf1b318554ef40c5b (diff) | |
* fix Server introspection data
* define interface, path and service names in avahi.py
* DBUS: server object is now available on path "/"
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@202 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-utils/avahi-dump-all')
| -rwxr-xr-x | avahi-utils/avahi-dump-all | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/avahi-utils/avahi-dump-all b/avahi-utils/avahi-dump-all index 03efa85..035f581 100755 --- a/avahi-utils/avahi-dump-all +++ b/avahi-utils/avahi-dump-all @@ -39,7 +39,7 @@ def new_service_type(interface, protocol, type, domain): print "Browsing for services of type '%s' in domain '%s' on %i.%i ..." % (type, domain, interface, protocol) - b = dbus.Interface(bus.get_object("org.freedesktop.Avahi", server.ServiceBrowserNew(interface, protocol, type, domain)), 'org.freedesktop.Avahi.ServiceBrowser') + b = dbus.Interface(bus.get_object(avahi.DBUS_NAME, server.ServiceBrowserNew(interface, protocol, type, domain)), avahi.DBUS_INTERFACE_SERVICE_BROWSER) b.connect_to_signal('ItemNew', new_service) b.connect_to_signal('ItemRemove', remove_service) @@ -54,7 +54,7 @@ def browse_domain(interface, protocol, domain): print "Browsing domain '%s' on %i.%i ..." % (domain, interface, protocol) - b = dbus.Interface(bus.get_object("org.freedesktop.Avahi", server.ServiceTypeBrowserNew(interface, protocol, domain)), 'org.freedesktop.Avahi.ServiceTypeBrowser') + b = dbus.Interface(bus.get_object(avahi.DBUS_NAME, server.ServiceTypeBrowserNew(interface, protocol, domain)), avahi.DBUS_INTERFACE_SERVICE_TYPE_BROWSER) b.connect_to_signal('ItemNew', new_service_type) service_type_browsers[(interface, protocol, domain)] = b @@ -72,14 +72,14 @@ if len(sys.argv) > 1: domain = sys.argv[1] bus = dbus.SystemBus() -server = dbus.Interface(bus.get_object("org.freedesktop.Avahi", '/org/freedesktop/Avahi/Server'), 'org.freedesktop.Avahi.Server') +server = dbus.Interface(bus.get_object(avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER), avahi.DBUS_INTERFACE_SERVER) if domain is None: # Explicitly browse .local browse_domain(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, "local") # Browse for other browsable domains - db = dbus.Interface(bus.get_object("org.freedesktop.Avahi", server.DomainBrowserNew(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, "", avahi.DOMAIN_BROWSER_BROWSE)), 'org.freedesktop.Avahi.DomainBrowser') + db = dbus.Interface(bus.get_object(avahi.DBUS_NAME, server.DomainBrowserNew(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, "", avahi.DOMAIN_BROWSER_BROWSE)), avahi.DBUS_INTERFACE_DOMAIN_BROWSER) db.connect_to_signal('ItemNew', new_domain) else: |