[Telepathy-commits] [telepathy-qt4/master] Add AccountManager and Account code-generation

[Simon McVittie]

---
 TelepathyQt4/Client/AccountManager |   16 ++++++++++++++++
 TelepathyQt4/Makefile.am           |   14 ++++++++++++++
 TelepathyQt4/account-manager.xml   |    9 +++++++++
 TelepathyQt4/account.xml           |   13 +++++++++++++
 TelepathyQt4/stable-interfaces.xml |    2 ++
 5 files changed, 54 insertions(+), 0 deletions(-)
 create mode 100644 TelepathyQt4/Client/AccountManager
 create mode 100644 TelepathyQt4/account-manager.xml
 create mode 100644 TelepathyQt4/account.xml

diff --git a/TelepathyQt4/Client/AccountManager b/TelepathyQt4/Client/AccountManager
new file mode 100644
index 0000000..c515b7a
--- /dev/null
+++ b/TelepathyQt4/Client/AccountManager
@@ -0,0 +1,16 @@
+#ifndef _TelepathyQt4_Client_AccountManager_HEADER_GUARD_
+#define _TelepathyQt4_Client_AccountManager_HEADER_GUARD_
+
+#include "TelepathyQt4/_gen/cli-account.h"
+
+#include "TelepathyQt4/_gen/cli-account-manager.h"
+
+#if 0
+#include "TelepathyQt4/_gen/cli-account-interface-avatar.h"
+
+#include "TelepathyQt4/_gen/cli-account-manager-interface-creation.h"
+#include "TelepathyQt4/_gen/cli-account-manager-interface-query.h"
+#endif
+
+#endif
+// vim:set ft=cpp:
diff --git a/TelepathyQt4/Makefile.am b/TelepathyQt4/Makefile.am
index 82e6c6d..0ac9f23 100644
--- a/TelepathyQt4/Makefile.am
+++ b/TelepathyQt4/Makefile.am
@@ -6,6 +6,8 @@ pkgconfigdir = ${libdir}/pkgconfig
 pkgconfig_DATA = TelepathyQt4.pc
 
 EXTRA_DIST = \
+    account.xml \
+    account-manager.xml \
     channel.xml \
     connection.xml \
     connection-manager.xml \
@@ -43,6 +45,8 @@ libtelepathy_qt4_la_SOURCES = \
     header-compile-test.cpp
 
 nodist_libtelepathy_qt4_la_SOURCES = \
+    _gen/cli-account-body.hpp \
+    _gen/cli-account-manager-body.hpp \
     _gen/cli-channel-body.hpp \
     _gen/cli-channel.moc.hpp \
     _gen/cli-connection-body.hpp \
@@ -88,6 +92,8 @@ tpqt4clientinclude_HEADERS = \
     Client/Properties
 
 nodist_geninclude_HEADERS = \
+    _gen/cli-account.h \
+    _gen/cli-account-manager.h \
     _gen/cli-channel.h \
     _gen/cli-connection.h \
     _gen/cli-connection-manager.h \
@@ -180,6 +186,14 @@ _gen/cli-%.h _gen/cli-%-body.hpp: _gen/spec-%.xml \
 			group='clientchannel'; \
 			prettyinclude='Channel'; \
 			mainiface='--mainiface=Telepathy::Client::ChannelInterface';; \
+		account) \
+			group='clientaccount'; \
+			prettyinclude='AccountManager'; \
+			mainiface='--mainiface=Telepathy::Client::AccountInterface';; \
+		account-manager) \
+			group='clientam'; \
+			prettyinclude='AccountManager'; \
+			mainiface='--mainiface=Telepathy::Client::AccountManagerInterface';; \
 		connection) \
 			group='clientconn'; \
 			prettyinclude='Connection'; \
diff --git a/TelepathyQt4/account-manager.xml b/TelepathyQt4/account-manager.xml
new file mode 100644
index 0000000..278f427
--- /dev/null
+++ b/TelepathyQt4/account-manager.xml
@@ -0,0 +1,9 @@
+<tp:spec
+  xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
+  xmlns:xi="http://www.w3.org/2001/XInclude">
+
+<tp:title>Account Manager interfaces</tp:title>
+
+<xi:include href="../spec/Account_Manager.xml"/>
+
+</tp:spec>
diff --git a/TelepathyQt4/account.xml b/TelepathyQt4/account.xml
new file mode 100644
index 0000000..e12055c
--- /dev/null
+++ b/TelepathyQt4/account.xml
@@ -0,0 +1,13 @@
+<tp:spec
+  xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
+  xmlns:xi="http://www.w3.org/2001/XInclude">
+
+<tp:title>Account interfaces</tp:title>
+
+<xi:include href="../spec/Account.xml"/>
+
+<!--
+<xi:include href="../spec/Account_Interface_Avatar.xml"/>
+-->
+
+</tp:spec>
diff --git a/TelepathyQt4/stable-interfaces.xml b/TelepathyQt4/stable-interfaces.xml
index 5dfab78..831a1ba 100644
--- a/TelepathyQt4/stable-interfaces.xml
+++ b/TelepathyQt4/stable-interfaces.xml
@@ -12,6 +12,8 @@
 <xi:include href="media-stream-handler.xml"/>
 <xi:include href="dbus.xml"/>
 <xi:include href="properties.xml"/>
+<xi:include href="account-manager.xml"/>
+<xi:include href="account.xml"/>
 
 <xi:include href="../spec/generic-types.xml"/>
 <xi:include href="../spec/errors.xml"/>
-- 
1.5.6.5