dbus: move interfaces into standard D-Bus interfaces directory

http://avahi.org/ticket/268

20 files changed, 52 insertions, 66 deletions

diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index c21e30f..04843fb 100644
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -25,7 +25,7 @@ if HAVE_XML
 
 pkgsysconfdir=$(sysconfdir)/avahi
 servicedir=$(pkgsysconfdir)/services
-introspectiondir=$(pkgdatadir)/introspection
+introspectiondir=$(datadir)/dbus-1/interfaces
 
 AM_CFLAGS+= \
 	-DAVAHI_DAEMON_RUNTIME_DIR=\"$(avahi_runtime_dir)/avahi-daemon/\" \
@@ -68,11 +68,11 @@ pkgsysconf_DATA = \
 	avahi-daemon.conf \
 	hosts
 
-service_DATA = \
+dist_service_DATA = \
 	ssh.service \
 	sftp-ssh.service
 
-pkgdata_DATA = \
+dist_pkgdata_DATA = \
 	avahi-service.dtd
 
 if ENABLE_CHROOT
@@ -116,39 +116,26 @@ avahi_daemon_LDADD += \
 
 avahi_daemon_CFLAGS += $(DBUS_CFLAGS) -DDBUS_SYSTEM_BUS_DEFAULT_ADDRESS=\"$(DBUS_SYSTEM_BUS_DEFAULT_ADDRESS)\"
 
-dbusservice_DATA = avahi-dbus.conf
+dist_dbusservice_DATA = avahi-dbus.conf
 
-introspection_DATA = \
-	Server.introspect \
-	EntryGroup.introspect \
-	DomainBrowser.introspect \
-	ServiceTypeBrowser.introspect \
-	ServiceBrowser.introspect \
-	ServiceResolver.introspect \
-	AddressResolver.introspect \
-	HostNameResolver.introspect \
-	RecordBrowser.introspect
+dist_introspection_DATA = \
+	org.freedesktop.Avahi.Server.xml \
+	org.freedesktop.Avahi.EntryGroup.xml \
+	org.freedesktop.Avahi.DomainBrowser.xml \
+	org.freedesktop.Avahi.ServiceTypeBrowser.xml \
+	org.freedesktop.Avahi.ServiceBrowser.xml \
+	org.freedesktop.Avahi.ServiceResolver.xml \
+	org.freedesktop.Avahi.AddressResolver.xml \
+	org.freedesktop.Avahi.HostNameResolver.xml \
+	org.freedesktop.Avahi.RecordBrowser.xml
 
 endif
 endif
 endif
 
 EXTRA_DIST = \
-	avahi-service.dtd \
 	avahi-daemon.conf \
 	example.service \
-	avahi-dbus.conf \
-	Server.introspect \
-	EntryGroup.introspect \
-	DomainBrowser.introspect \
-	ServiceTypeBrowser.introspect \
-	ServiceBrowser.introspect \
-	ServiceResolver.introspect \
-	AddressResolver.introspect \
-	HostNameResolver.introspect \
-	RecordBrowser.introspect \
-	ssh.service \
-	sftp-ssh.service \
 	hosts \
 	example.service \
 	introspect.dtd \
diff --git a/avahi-daemon/chroot.c b/avahi-daemon/chroot.c
index a418780..d796a39 100644
--- a/avahi-daemon/chroot.c
+++ b/avahi-daemon/chroot.c
@@ -64,15 +64,15 @@ static const char* const get_file_name_table[AVAHI_CHROOT_MAX] = {
     NULL,
     "/etc/resolv.conf",
 #ifdef HAVE_DBUS
-    AVAHI_DBUS_INTROSPECTION_DIR"/Server.introspect",
-    AVAHI_DBUS_INTROSPECTION_DIR"/EntryGroup.introspect",
-    AVAHI_DBUS_INTROSPECTION_DIR"/AddressResolver.introspect",
-    AVAHI_DBUS_INTROSPECTION_DIR"/DomainBrowser.introspect",
-    AVAHI_DBUS_INTROSPECTION_DIR"/HostNameResolver.introspect",
-    AVAHI_DBUS_INTROSPECTION_DIR"/ServiceBrowser.introspect",
-    AVAHI_DBUS_INTROSPECTION_DIR"/ServiceResolver.introspect",
-    AVAHI_DBUS_INTROSPECTION_DIR"/ServiceTypeBrowser.introspect",
-    AVAHI_DBUS_INTROSPECTION_DIR"/RecordBrowser.introspect",
+    AVAHI_DBUS_INTROSPECTION_DIR"/org.freedesktop.Avahi.Server.xml",
+    AVAHI_DBUS_INTROSPECTION_DIR"/org.freedesktop.Avahi.EntryGroup.xml",
+    AVAHI_DBUS_INTROSPECTION_DIR"/org.freedesktop.Avahi.AddressResolver.xml",
+    AVAHI_DBUS_INTROSPECTION_DIR"/org.freedesktop.Avahi.DomainBrowser.xml",
+    AVAHI_DBUS_INTROSPECTION_DIR"/org.freedesktop.Avahi.HostNameResolver.xml",
+    AVAHI_DBUS_INTROSPECTION_DIR"/org.freedesktop.Avahi.ServiceBrowser.xml",
+    AVAHI_DBUS_INTROSPECTION_DIR"/org.freedesktop.Avahi.ServiceResolver.xml",
+    AVAHI_DBUS_INTROSPECTION_DIR"/org.freedesktop.Avahi.ServiceTypeBrowser.xml",
+    AVAHI_DBUS_INTROSPECTION_DIR"/org.freedesktop.Avahi.RecordBrowser.xml",
 #endif
     NULL,
     NULL
diff --git a/avahi-daemon/dbus-async-address-resolver.c b/avahi-daemon/dbus-async-address-resolver.c
index 5be08c2..a77e03c 100644
--- a/avahi-daemon/dbus-async-address-resolver.c
+++ b/avahi-daemon/dbus-async-address-resolver.c
@@ -115,7 +115,7 @@ DBusHandlerResult avahi_dbus_msg_async_address_resolver_impl(DBusConnection *c,
 
     /* Introspection */
     if (dbus_message_is_method_call(m, DBUS_INTERFACE_INTROSPECTABLE, "Introspect"))
-        return avahi_dbus_handle_introspect(c, m, "AddressResolver.introspect");
+        return avahi_dbus_handle_introspect(c, m, "org.freedesktop.Avahi.AddressResolver.xml");
 
     /* Access control */
     if (strcmp(dbus_message_get_sender(m), i->client->name))
diff --git a/avahi-daemon/dbus-async-host-name-resolver.c b/avahi-daemon/dbus-async-host-name-resolver.c
index 588bc11..7c2d063 100644
--- a/avahi-daemon/dbus-async-host-name-resolver.c
+++ b/avahi-daemon/dbus-async-host-name-resolver.c
@@ -113,7 +113,7 @@ DBusHandlerResult avahi_dbus_msg_async_host_name_resolver_impl(DBusConnection *c
 
     /* Introspection */
     if (dbus_message_is_method_call(m, DBUS_INTERFACE_INTROSPECTABLE, "Introspect"))
-        return avahi_dbus_handle_introspect(c, m, "HostNameResolver.introspect");
+        return avahi_dbus_handle_introspect(c, m, "org.freedesktop.Avahi.HostNameResolver.xml");
 
     /* Access control */
     if (strcmp(dbus_message_get_sender(m), i->client->name))
diff --git a/avahi-daemon/dbus-async-service-resolver.c b/avahi-daemon/dbus-async-service-resolver.c
index 19da6ff..2b58e2d 100644
--- a/avahi-daemon/dbus-async-service-resolver.c
+++ b/avahi-daemon/dbus-async-service-resolver.c
@@ -152,7 +152,7 @@ DBusHandlerResult avahi_dbus_msg_async_service_resolver_impl(DBusConnection *c,
 
     /* Introspection */
     if (dbus_message_is_method_call(m, DBUS_INTERFACE_INTROSPECTABLE, "Introspect"))
-        return avahi_dbus_handle_introspect(c, m, "ServiceResolver.introspect");
+        return avahi_dbus_handle_introspect(c, m, "org.freedesktop.Avahi.ServiceResolver.xml");
 
     /* Access control */
     if (strcmp(dbus_message_get_sender(m), i->client->name))
diff --git a/avahi-daemon/dbus-domain-browser.c b/avahi-daemon/dbus-domain-browser.c
index 47a5f42..e51996f 100644
--- a/avahi-daemon/dbus-domain-browser.c
+++ b/avahi-daemon/dbus-domain-browser.c
@@ -67,7 +67,7 @@ DBusHandlerResult avahi_dbus_msg_domain_browser_impl(DBusConnection *c, DBusMess
 
     /* Introspection */
     if (dbus_message_is_method_call(m, DBUS_INTERFACE_INTROSPECTABLE, "Introspect"))
-        return avahi_dbus_handle_introspect(c, m, "DomainBrowser.introspect");
+        return avahi_dbus_handle_introspect(c, m, "org.freedesktop.Avahi.DomainBrowser.xml");
 
     /* Access control */
     if (strcmp(dbus_message_get_sender(m), i->client->name))
diff --git a/avahi-daemon/dbus-entry-group.c b/avahi-daemon/dbus-entry-group.c
index 0b86436..4e879a5 100644
--- a/avahi-daemon/dbus-entry-group.c
+++ b/avahi-daemon/dbus-entry-group.c
@@ -103,7 +103,7 @@ DBusHandlerResult avahi_dbus_msg_entry_group_impl(DBusConnection *c, DBusMessage
 
     /* Introspection */
     if (dbus_message_is_method_call(m, DBUS_INTERFACE_INTROSPECTABLE, "Introspect"))
-        return avahi_dbus_handle_introspect(c, m, "EntryGroup.introspect");
+        return avahi_dbus_handle_introspect(c, m, "org.freedesktop.Avahi.EntryGroup.xml");
 
     /* Access control */
     if (strcmp(dbus_message_get_sender(m), i->client->name))
diff --git a/avahi-daemon/dbus-protocol.c b/avahi-daemon/dbus-protocol.c
index 542b5ca..91ea8fa 100644
--- a/avahi-daemon/dbus-protocol.c
+++ b/avahi-daemon/dbus-protocol.c
@@ -249,7 +249,7 @@ static DBusHandlerResult msg_server_impl(DBusConnection *c, DBusMessage *m, AVAH
                     dbus_message_get_member(m));
 
     if (dbus_message_is_method_call(m, DBUS_INTERFACE_INTROSPECTABLE, "Introspect"))
-        return avahi_dbus_handle_introspect(c, m, "Server.introspect");
+        return avahi_dbus_handle_introspect(c, m, "org.freedesktop.Avahi.Server.xml");
 
     else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVER, "GetHostName")) {
 
diff --git a/avahi-daemon/dbus-record-browser.c b/avahi-daemon/dbus-record-browser.c
index f4cd217..c0337cf 100644
--- a/avahi-daemon/dbus-record-browser.c
+++ b/avahi-daemon/dbus-record-browser.c
@@ -66,7 +66,7 @@ DBusHandlerResult avahi_dbus_msg_record_browser_impl(DBusConnection *c, DBusMess
 
     /* Introspection */
     if (dbus_message_is_method_call(m, DBUS_INTERFACE_INTROSPECTABLE, "Introspect"))
-        return avahi_dbus_handle_introspect(c, m, "RecordBrowser.introspect");
+        return avahi_dbus_handle_introspect(c, m, "org.freedesktop.Avahi.RecordBrowser.xml");
 
     /* Access control */
     if (strcmp(dbus_message_get_sender(m), i->client->name))
diff --git a/avahi-daemon/dbus-service-browser.c b/avahi-daemon/dbus-service-browser.c
index 104165b..962dca0 100644
--- a/avahi-daemon/dbus-service-browser.c
+++ b/avahi-daemon/dbus-service-browser.c
@@ -67,7 +67,7 @@ DBusHandlerResult avahi_dbus_msg_service_browser_impl(DBusConnection *c, DBusMes
 
     /* Introspection */
     if (dbus_message_is_method_call(m, DBUS_INTERFACE_INTROSPECTABLE, "Introspect"))
-        return avahi_dbus_handle_introspect(c, m, "ServiceBrowser.introspect");
+        return avahi_dbus_handle_introspect(c, m, "org.freedesktop.Avahi.ServiceBrowser.xml");
 
     /* Access control */
     if (strcmp(dbus_message_get_sender(m), i->client->name))
diff --git a/avahi-daemon/dbus-service-type-browser.c b/avahi-daemon/dbus-service-type-browser.c
index 03cc091..20afdbe 100644
--- a/avahi-daemon/dbus-service-type-browser.c
+++ b/avahi-daemon/dbus-service-type-browser.c
@@ -67,7 +67,7 @@ DBusHandlerResult avahi_dbus_msg_service_type_browser_impl(DBusConnection *c, DB
 
     /* Introspection */
     if (dbus_message_is_method_call(m, DBUS_INTERFACE_INTROSPECTABLE, "Introspect"))
-        return avahi_dbus_handle_introspect(c, m, "ServiceTypeBrowser.introspect");
+        return avahi_dbus_handle_introspect(c, m, "org.freedesktop.Avahi.ServiceTypeBrowser.xml");
 
     /* Access control */
     if (strcmp(dbus_message_get_sender(m), i->client->name))
diff --git a/avahi-daemon/AddressResolver.introspect b/avahi-daemon/org.freedesktop.Avahi.AddressResolver.xml
index b4250ec..bae9c2f 100644
--- a/avahi-daemon/AddressResolver.introspect
+++ b/avahi-daemon/org.freedesktop.Avahi.AddressResolver.xml
@@ -4,7 +4,7 @@
 
 <!--
   This file is part of avahi.
- 
+
   avahi is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2 of the
@@ -32,7 +32,7 @@
   <interface name="org.freedesktop.Avahi.AddressResolver">
 
     <method name="Free"/>
-      
+
     <signal name="Found">
       <arg name="interface" type="i" direction="out"/>
       <arg name="protocol" type="i" direction="out"/>
@@ -46,5 +46,5 @@
       <arg name="error" type="s"/>
     </signal>
 
-  </interface> 
+  </interface>
 </node>
diff --git a/avahi-daemon/DomainBrowser.introspect b/avahi-daemon/org.freedesktop.Avahi.DomainBrowser.xml
index 7338e69..22c614e 100644
--- a/avahi-daemon/DomainBrowser.introspect
+++ b/avahi-daemon/org.freedesktop.Avahi.DomainBrowser.xml
@@ -4,7 +4,7 @@
 
 <!--
   This file is part of avahi.
- 
+
   avahi is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2 of the
@@ -22,7 +22,7 @@
 -->
 
 <node>
-  
+
   <interface name="org.freedesktop.DBus.Introspectable">
     <method name="Introspect">
       <arg name="data" type="s" direction="out" />
@@ -32,7 +32,7 @@
   <interface name="org.freedesktop.Avahi.DomainBrowser">
 
     <method name="Free"/>
-      
+
     <signal name="ItemNew">
       <arg name="interface" type="i"/>
       <arg name="protocol" type="i"/>
@@ -55,6 +55,5 @@
 
     <signal name="CacheExhausted"/>
 
-  </interface> 
+  </interface>
 </node>
-
diff --git a/avahi-daemon/EntryGroup.introspect b/avahi-daemon/org.freedesktop.Avahi.EntryGroup.xml
index cb56772..43fd63c 100644
--- a/avahi-daemon/EntryGroup.introspect
+++ b/avahi-daemon/org.freedesktop.Avahi.EntryGroup.xml
@@ -4,7 +4,7 @@
 
 <!--
   This file is part of avahi.
- 
+
   avahi is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2 of the
diff --git a/avahi-daemon/HostNameResolver.introspect b/avahi-daemon/org.freedesktop.Avahi.HostNameResolver.xml
index 0b43752..0b43752 100644
--- a/avahi-daemon/HostNameResolver.introspect
+++ b/avahi-daemon/org.freedesktop.Avahi.HostNameResolver.xml
diff --git a/avahi-daemon/RecordBrowser.introspect b/avahi-daemon/org.freedesktop.Avahi.RecordBrowser.xml
index f1755d9..9ba86f4 100644
--- a/avahi-daemon/RecordBrowser.introspect
+++ b/avahi-daemon/org.freedesktop.Avahi.RecordBrowser.xml
@@ -4,7 +4,7 @@
 
 <!--
   This file is part of avahi.
- 
+
   avahi is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2 of the
@@ -22,7 +22,7 @@
 -->
 
 <node>
-  
+
   <interface name="org.freedesktop.DBus.Introspectable">
     <method name="Introspect">
       <arg name="data" type="s" direction="out" />
@@ -32,7 +32,7 @@
   <interface name="org.freedesktop.Avahi.RecordBrowser">
 
     <method name="Free"/>
-      
+
     <signal name="ItemNew">
       <arg name="interface" type="i"/>
       <arg name="protocol" type="i"/>
@@ -61,5 +61,5 @@
 
     <signal name="CacheExhausted"/>
 
-  </interface> 
+  </interface>
 </node>
diff --git a/avahi-daemon/Server.introspect b/avahi-daemon/org.freedesktop.Avahi.Server.xml
index 923e05f..c291274 100644
--- a/avahi-daemon/Server.introspect
+++ b/avahi-daemon/org.freedesktop.Avahi.Server.xml
@@ -4,7 +4,7 @@
 
 <!--
   This file is part of avahi.
- 
+
   avahi is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2 of the
diff --git a/avahi-daemon/ServiceBrowser.introspect b/avahi-daemon/org.freedesktop.Avahi.ServiceBrowser.xml
index d80298d..d80298d 100644
--- a/avahi-daemon/ServiceBrowser.introspect
+++ b/avahi-daemon/org.freedesktop.Avahi.ServiceBrowser.xml
diff --git a/avahi-daemon/ServiceResolver.introspect b/avahi-daemon/org.freedesktop.Avahi.ServiceResolver.xml
index 1b906ba..623f209 100644
--- a/avahi-daemon/ServiceResolver.introspect
+++ b/avahi-daemon/org.freedesktop.Avahi.ServiceResolver.xml
@@ -4,7 +4,7 @@
 
 <!--
   This file is part of avahi.
- 
+
   avahi is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2 of the
@@ -32,7 +32,7 @@
   <interface name="org.freedesktop.Avahi.ServiceResolver">
 
     <method name="Free"/>
-      
+
     <signal name="Found">
       <arg name="interface" type="i" direction="out"/>
       <arg name="protocol" type="i" direction="out"/>
@@ -51,5 +51,5 @@
       <arg name="error" type="s"/>
     </signal>
 
-  </interface> 
+  </interface>
 </node>
diff --git a/avahi-daemon/ServiceTypeBrowser.introspect b/avahi-daemon/org.freedesktop.Avahi.ServiceTypeBrowser.xml
index 57c418b..4efec82 100644
--- a/avahi-daemon/ServiceTypeBrowser.introspect
+++ b/avahi-daemon/org.freedesktop.Avahi.ServiceTypeBrowser.xml
@@ -4,7 +4,7 @@
 
 <!--
   This file is part of avahi.
- 
+
   avahi is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2 of the
@@ -22,7 +22,7 @@
 -->
 
 <node>
-  
+
   <interface name="org.freedesktop.DBus.Introspectable">
     <method name="Introspect">
       <arg name="data" type="s" direction="out" />
@@ -32,7 +32,7 @@
   <interface name="org.freedesktop.Avahi.ServiceTypeBrowser">
 
     <method name="Free"/>
-      
+
     <signal name="ItemNew">
       <arg name="interface" type="i"/>
       <arg name="protocol" type="i"/>
@@ -57,5 +57,5 @@
 
     <signal name="CacheExhausted"/>
 
-  </interface> 
+  </interface>
 </node>