[Telepathy-commits] [telepathy-qt4/master] Add the bus daemon interface as a 1:1 proxy

[Olli Salli]

---
 TelepathyQt4/cli-dbus.h      |    4 ++-
 TelepathyQt4/dbus-daemon.xml |   80 ++++++++++++++++++++++++++++++++++++++++++
 TelepathyQt4/dbus.xml        |    3 +-
 3 files changed, 85 insertions(+), 2 deletions(-)
 create mode 100644 TelepathyQt4/dbus-daemon.xml

diff --git a/TelepathyQt4/cli-dbus.h b/TelepathyQt4/cli-dbus.h
index f6bc513..5b130e4 100644
--- a/TelepathyQt4/cli-dbus.h
+++ b/TelepathyQt4/cli-dbus.h
@@ -39,7 +39,9 @@
  *
  * Proxy objects representing well-known generic D-Bus interfaces on remote
  * objects. Note that QDBus already has QDBusConnectionInterface for accessing
- * the bus daemon, so that functionality is not provided by this library.
+ * the bus daemon, so in the parts where there is an overlap in the
+ * functionality, using the QDBus proxy should be given consideration instead
+ * of blindly using the proxy provided here.
  */
 
 #include <TelepathyQt4/_gen/cli-dbus.h>
diff --git a/TelepathyQt4/dbus-daemon.xml b/TelepathyQt4/dbus-daemon.xml
new file mode 100644
index 0000000..675b879
--- /dev/null
+++ b/TelepathyQt4/dbus-daemon.xml
@@ -0,0 +1,80 @@
+<tp:spec
+  xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+
+  <tp:title>D-Bus Daemon</tp:title>
+
+  <node name="/DBus_Daemon">
+    <interface name="org.freedesktop.DBus">
+      <method name="Hello">
+        <arg direction="out" type="s"/>
+      </method>
+      <method name="RequestName">
+        <arg direction="in" type="s" name="Name"/>
+        <arg direction="in" type="u" name="Flags"/>
+        <arg direction="out" type="u"/>
+      </method>
+      <method name="ReleaseName">
+        <arg direction="in" type="s" name="Name"/>
+        <arg direction="out" type="u"/>
+      </method>
+      <method name="StartServiceByName">
+        <arg direction="in" type="s" name="Service"/>
+        <arg direction="in" type="u" name="Flags"/>
+        <arg direction="out" type="u"/>
+      </method>
+      <method name="NameHasOwner">
+        <arg direction="in" type="s" name="Name_To_Check"/>
+        <arg direction="out" type="b"/>
+      </method>
+      <method name="ListNames">
+        <arg direction="out" type="as"/>
+      </method>
+      <method name="ListActivatableNames">
+        <arg direction="out" type="as"/>
+      </method>
+      <method name="AddMatch">
+        <arg direction="in" type="s" name="Rule"/>
+      </method>
+      <method name="RemoveMatch">
+        <arg direction="in" type="s" name="Rule"/>
+      </method>
+      <method name="GetNameOwner">
+        <arg direction="in" type="s" name="Name"/>
+        <arg direction="out" type="s"/>
+      </method>
+      <method name="ListQueuedOwners">
+        <arg direction="in" type="s" name="Name"/>
+        <arg direction="out" type="as"/>
+      </method>
+      <method name="GetConnectionUnixUser">
+        <arg direction="in" type="s" name="Connection_Name"/>
+        <arg direction="out" type="u"/>
+      </method>
+      <method name="GetConnectionUnixProcessID">
+        <arg direction="in" type="s" name="Connection_Name"/>
+        <arg direction="out" type="u"/>
+      </method>
+      <method name="GetConnectionSELinuxSecurityContext">
+        <arg direction="in" type="s" name="Connection_Name"/>
+        <arg direction="out" type="ay"/>
+      </method>
+      <method name="ReloadConfig">
+      </method>
+      <method name="GetId">
+        <arg direction="out" type="s"/>
+      </method>
+      <signal name="NameOwnerChanged">
+        <arg type="s" name="Name"/>
+        <arg type="s" name="Old_Owner"/>
+        <arg type="s" name="New_Owner"/>
+      </signal>
+      <signal name="NameLost">
+        <arg type="s" name="Name"/>
+      </signal>
+      <signal name="NameAcquired">
+        <arg type="s" name="Name"/>
+      </signal>
+    </interface>
+  </node>
+
+</tp:spec>
diff --git a/TelepathyQt4/dbus.xml b/TelepathyQt4/dbus.xml
index 78647b3..99af441 100644
--- a/TelepathyQt4/dbus.xml
+++ b/TelepathyQt4/dbus.xml
@@ -4,8 +4,9 @@
 
 <tp:title>D-Bus interfaces</tp:title>
 
-<xi:include href="dbus-peer.xml"/>
+<xi:include href="dbus-daemon.xml"/>
 <xi:include href="dbus-introspectable.xml"/>
+<xi:include href="dbus-peer.xml"/>
 <xi:include href="dbus-properties.xml"/>
 
 </tp:spec>
-- 
1.5.6.5