* 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

4 files changed, 11 insertions, 12 deletions

diff --git a/avahi-daemon/DBUS-API b/avahi-daemon/DBUS-API
index ff3cc78..2ad5fa1 100644
--- a/avahi-daemon/DBUS-API
+++ b/avahi-daemon/DBUS-API
@@ -1,6 +1,6 @@
 $Id$
 
-org.freedesktop.Avahi.Server               -- Accessible through /org/freedesktop/Avahi/Server
+org.freedesktop.Avahi.Server               
         string GetHostName()
         string GetHostNameFqdn()
         string GetDomainName()
@@ -11,7 +11,7 @@ org.freedesktop.Avahi.Server               -- Accessible through /org/freedeskto
         [int32 interface, int32 protocol, string name, int32 aprotocol, string address] ResolveHostName(int32 interface, int32 protocol, string name, int32 aprotocol)
         [int32 interface, int32 protocol, int32 aprotocol, string address, string name] ResolveAddress(int32 interface, int32 protocol, string address)
         [int32 interface, int32 protocol, string name, string type, string domain, string host, int32 aprotocol, string address, uint16 port, string txt[]] ResolveService(int32 interface, int32 protocol, string name, string type, string domain, int32 aprotocol) 
-        path EntryGroupNew()               -- Creates a new org.freedesktop.Avahi.EntryGroup object
+        path EntryGroupNew()              
         path DomainBrowserNew(int32 interface, int32 protocol, string domain, int32 btype)
         path ServiceTypeBrowserNew(int32 interface, int32 protocol, string domain)
         path ServiceBrowserNew(int32 interface, int32 protocol, string type, string domain)
diff --git a/avahi-daemon/Server.introspect b/avahi-daemon/Server.introspect
index cff7bae..da7eb36 100644
--- a/avahi-daemon/Server.introspect
+++ b/avahi-daemon/Server.introspect
@@ -42,7 +42,6 @@
       <arg name="name" type="s" direction="out"/>
     </method>
 
-
     <method name="ResolveHostName">
       <arg name="interface" type="i" direction="in"/>
       <arg name="protocol" type="i" direction="in"/>
@@ -89,7 +88,7 @@
     </method>
 
     <method name="EntryGroupNew">
-      <arg name="path" type="s" direction="out"/> <!-- FIXME -->
+      <arg name="path" type="o" direction="out"/>
     </method>
 
     <method name="DomainBrowserNew">
@@ -98,7 +97,7 @@
       <arg name="domain" type="s" direction="in"/>
       <arg name="btype" type="i" direction="in"/>
 
-      <arg name="path" type="s" direction="out"/> <!-- FIXME -->
+      <arg name="path" type="o" direction="out"/>
     </method>
 
     <method name="ServiceTypeBrowserNew">
@@ -106,7 +105,7 @@
       <arg name="protocol" type="i" direction="in"/>
       <arg name="domain" type="s" direction="in"/>
 
-      <arg name="path" type="s" direction="out"/> <!-- FIXME -->
+      <arg name="path" type="o" direction="out"/>
     </method>
 
     <method name="ServiceBrowserNew">
@@ -115,7 +114,7 @@
       <arg name="type" type="s" direction="in"/>
       <arg name="domain" type="s" direction="in"/>
 
-      <arg name="path" type="s" direction="out"/> <!-- FIXME -->
+      <arg name="path" type="o" direction="out"/>
     </method>
 
   </interface>
diff --git a/avahi-daemon/dbus-protocol.c b/avahi-daemon/dbus-protocol.c
index b5c3e9a..626e4a0 100644
--- a/avahi-daemon/dbus-protocol.c
+++ b/avahi-daemon/dbus-protocol.c
@@ -989,7 +989,7 @@ static DBusHandlerResult msg_server_impl(DBusConnection *c, DBusMessage *m, void
         i = g_new(EntryGroupInfo, 1);
         i->id = ++client->current_id;
         i->client = client;
-        i->path = g_strdup_printf("/org/freedesktop/Avahi/Client%u/EntryGroup%u", client->id, i->id);
+        i->path = g_strdup_printf("/Client%u/EntryGroup%u", client->id, i->id);
         AVAHI_LLIST_PREPEND(EntryGroupInfo, entry_groups, client->entry_groups, i);
 
         if (!(i->entry_group = avahi_entry_group_new(avahi_server, entry_group_callback, i))) {
@@ -1105,7 +1105,7 @@ static DBusHandlerResult msg_server_impl(DBusConnection *c, DBusMessage *m, void
         i = g_new(DomainBrowserInfo, 1);
         i->id = ++client->current_id;
         i->client = client;
-        i->path = g_strdup_printf("/org/freedesktop/Avahi/Client%u/DomainBrowser%u", client->id, i->id);
+        i->path = g_strdup_printf("/Client%u/DomainBrowser%u", client->id, i->id);
 
         AVAHI_LLIST_PREPEND(DomainBrowserInfo, domain_browsers, client->domain_browsers, i);
 
@@ -1150,7 +1150,7 @@ static DBusHandlerResult msg_server_impl(DBusConnection *c, DBusMessage *m, void
         i = g_new(ServiceTypeBrowserInfo, 1);
         i->id = ++client->current_id;
         i->client = client;
-        i->path = g_strdup_printf("/org/freedesktop/Avahi/Client%u/ServiceTypeBrowser%u", client->id, i->id);
+        i->path = g_strdup_printf("/Client%u/ServiceTypeBrowser%u", client->id, i->id);
 
         AVAHI_LLIST_PREPEND(ServiceTypeBrowserInfo, service_type_browsers, client->service_type_browsers, i);
 
@@ -1196,7 +1196,7 @@ static DBusHandlerResult msg_server_impl(DBusConnection *c, DBusMessage *m, void
         i = g_new(ServiceBrowserInfo, 1);
         i->id = ++client->current_id;
         i->client = client;
-        i->path = g_strdup_printf("/org/freedesktop/Avahi/Client%u/ServiceBrowser%u", client->id, i->id);
+        i->path = g_strdup_printf("/Client%u/ServiceBrowser%u", client->id, i->id);
 
         AVAHI_LLIST_PREPEND(ServiceBrowserInfo, service_browsers, client->service_browsers, i);
 
diff --git a/avahi-daemon/dbus-test.py b/avahi-daemon/dbus-test.py
index baebf40..310a3c2 100755
--- a/avahi-daemon/dbus-test.py
+++ b/avahi-daemon/dbus-test.py
@@ -7,7 +7,7 @@ except ImportError, e: pass
 
 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("org.freedesktop.Avahi", '/'), 'org.freedesktop.Avahi.Server')
 
 def server_state_changed_callback(t):
     print "Server::StateChanged: ", t