From 99ce0da07ceb7de501a01626f08aac2d740635de Mon Sep 17 00:00:00 2001
From: David King <david.king@canonical.com>
Date: Thu, 18 Oct 2012 12:03:08 +0100
Subject: [PATCH] Add signond D-Bus API documentation

---
 .gitignore                             |  1 +
 docs/reference/libsignon-glib-docs.xml |  7 +++++++
 libsignon-glib/Makefile.am             | 21 +++++++++++++++------
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 95a98ed..53043fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ gtk-doc.make
 /libsignon-glib/signon-marshal.c
 /libsignon-glib/signon-marshal.h
 /libsignon-glib/sso-*-gen.*
+/libsignon-glib/sso-*-gen-doc-*
 libtool
 m4/gtk-doc.m4
 m4/libtool.m4
diff --git a/docs/reference/libsignon-glib-docs.xml b/docs/reference/libsignon-glib-docs.xml
index 4521f38..800c396 100644
--- a/docs/reference/libsignon-glib-docs.xml
+++ b/docs/reference/libsignon-glib-docs.xml
@@ -42,6 +42,13 @@
     </chapter>
   </part>
 
+  <part id="signond-dbus-api">
+    <title>signond D-Bus API</title>
+      <xi:include href="../../libsignon-glib/sso-auth-service-gen-doc-com.google.code.AccountsSSO.SingleSignOn.AuthService.xml"/>
+      <xi:include href="../../libsignon-glib/sso-auth-session-gen-doc-com.google.code.AccountsSSO.SingleSignOn.AuthSession.xml"/>
+      <xi:include href="../../libsignon-glib/sso-identity-gen-doc-com.google.code.AccountsSSO.SingleSignOn.Identity.xml"/>
+  </part>
+
   <part id="appendices">
     <title>Appendices</title>
     <index id="api-index-full">
diff --git a/libsignon-glib/Makefile.am b/libsignon-glib/Makefile.am
index 216bda0..17b0529 100644
--- a/libsignon-glib/Makefile.am
+++ b/libsignon-glib/Makefile.am
@@ -73,16 +73,25 @@ libsignon_glib_headers_with_enums = \
 DBUS_INTERFACES_DIR = /usr/share/dbus-1/interfaces
 
 sso-auth-service-gen.h sso-auth-service-gen.c: $(DBUS_INTERFACES_DIR)/com.google.code.AccountsSSO.SingleSignOn.AuthService.xml
-	$(AM_V_GEN)gdbus-codegen --generate-c-code sso-auth-service-gen \
-		--annotate "com.google.code.AccountsSSO.SingleSignOn.AuthService" org.gtk.GDBus.C.Name SsoAuthService $<
+	$(AM_V_GEN)gdbus-codegen \
+		--generate-c-code sso-auth-service-gen \
+		--generate-docbook sso-auth-service-gen-doc \
+		--annotate "com.google.code.AccountsSSO.SingleSignOn.AuthService" org.gtk.GDBus.C.Name SsoAuthService \
+		$<
 
 sso-auth-session-gen.h sso-auth-session-gen.c: $(DBUS_INTERFACES_DIR)/com.google.code.AccountsSSO.SingleSignOn.AuthSession.xml
-	$(AM_V_GEN)gdbus-codegen --generate-c-code sso-auth-session-gen \
-		--annotate "com.google.code.AccountsSSO.SingleSignOn.AuthSession" org.gtk.GDBus.C.Name SsoAuthSession $<
+	$(AM_V_GEN)gdbus-codegen \
+		--generate-c-code sso-auth-session-gen \
+		--generate-docbook sso-auth-session-gen-doc \
+		--annotate "com.google.code.AccountsSSO.SingleSignOn.AuthSession" org.gtk.GDBus.C.Name SsoAuthSession \
+		$<
 
 sso-identity-gen.h sso-identity-gen.c: $(DBUS_INTERFACES_DIR)/com.google.code.AccountsSSO.SingleSignOn.Identity.xml
-	$(AM_V_GEN)gdbus-codegen --generate-c-code sso-identity-gen \
-		--annotate "com.google.code.AccountsSSO.SingleSignOn.Identity" org.gtk.GDBus.C.Name SsoIdentity $<
+	$(AM_V_GEN)gdbus-codegen \
+		--generate-c-code sso-identity-gen \
+		--generate-docbook sso-identity-gen-doc \
+		--annotate "com.google.code.AccountsSSO.SingleSignOn.Identity" org.gtk.GDBus.C.Name SsoIdentity \
+		$<
 
 signon-marshal.h: signon-marshal.list Makefile
 	$(AM_V_GEN)glib-genmarshal --header --prefix=_signon_marshal $< > $@
-- 
2.34.1