Add missing struct types.5.0.beta27

git-svn-id: https://mission-control.svn.sourceforge.net/svnroot/mission-control/trunk@520 d91c8aed-3f2b-0410-a83d-924a1c20a0ba

5 files changed, 54 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 09c1f595..2cc5370c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 
 2008-08-22  Alberto Mardegan  <alberto.mardegan@nokia.com>
 
+	* xml/Account_Interface_Avatar.xml, xml/Makefile.am,
+	xml/MissionControl.xml, xml/all.xml:
+	Add missing struct types.
+
 	* src/mcd-channel.c:
 	Cancel the _call_when_ready() callback if che channel object is
 	deleted.
diff --git a/xml/Account_Interface_Avatar.xml b/xml/Account_Interface_Avatar.xml
index cb58256e..4d99ecb6 100644
--- a/xml/Account_Interface_Avatar.xml
+++ b/xml/Account_Interface_Avatar.xml
@@ -35,7 +35,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     </tp:docstring>
     <tp:added version="0.17.6"/>
 
-    <property name="Avatar" type="(ays)" access="readwrite">
+    <tp:struct name="AvatarInfo" >
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>A struct containing the avatar</p>
+        <ul>
+          <li>Avatar data</li>
+          <li>MIME type</li>
+        </ul>
+      </tp:docstring>
+      <tp:member type="ay" name="Avatar_Data"/>
+      <tp:member type="s" name="Mime_Type"/>
+    </tp:struct>
+
+    <property name="Avatar" tp:type="AvatarInfo" type="(ays)" access="readwrite">
       <tp:docstring>
         The avatar to set on this account for display to other contacts,
         represented as a structure containing the bytes of the avatar,
diff --git a/xml/Makefile.am b/xml/Makefile.am
index 51bd0648..a32207f8 100644
--- a/xml/Makefile.am
+++ b/xml/Makefile.am
@@ -2,6 +2,7 @@ tools_dir = $(top_srcdir)/tools
 
 XSLTFLAGS = --nonet --novalid
 DROP_NAMESPACE = sed -e 's@xmlns:tp="http://telepathy\.freedesktop\.org/wiki/DbusSpec.extensions-v0"@@g'
+DROP_TPTYPE = sed -e 's@tp:type="[^"]*"@@g'
 
 SPECS = MissionControl.xml \
 	Account_Manager.xml \
@@ -17,6 +18,10 @@ SPECS_GEN = ${SPECS:.xml=-gen.xml}
 
 all-local: $(SPECS_GEN)
 
+MissionControl-gen.xml: MissionControl.xml $(tools_dir)/spec-to-introspect.xsl
+	$(XSLTPROC) $(XSLTFLAGS) $(tools_dir)/spec-to-introspect.xsl $< \
+		| $(DROP_NAMESPACE) | $(DROP_TPTYPE) > $@
+
 %-gen.xml: %.xml $(tools_dir)/spec-to-introspect.xsl
 	$(XSLTPROC) $(XSLTFLAGS) $(tools_dir)/spec-to-introspect.xsl $< \
 		| $(DROP_NAMESPACE) > $@
diff --git a/xml/MissionControl.xml b/xml/MissionControl.xml
index 5110e43e..802ab5ba 100644
--- a/xml/MissionControl.xml
+++ b/xml/MissionControl.xml
@@ -20,6 +20,33 @@
     <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="mcd_service"/>
     <annotation name="org.freedesktop.DBus.GLib.ClientCSymbol" 
       value="mission_control_dbus"/>
+
+    <tp:struct name="AccountState" array-name="AccountStateList">
+      <tp:docstring>
+        A struct representing the account state.
+      </tp:docstring>
+      <tp:member type="s" name="Account_Name">
+        <tp:docstring>
+          The account name
+        </tp:docstring>
+      </tp:member>
+      <tp:member type="u" tp:type="Connection_Status" name="Connection_State">
+        <tp:docstring>
+          The account's connection status
+        </tp:docstring>
+      </tp:member>
+      <tp:member type="u" tp:type="Connection_Presence_Type" name="Presence">
+        <tp:docstring>
+          The presence
+        </tp:docstring>
+      </tp:member>
+      <tp:member type="u" tp:type="Connection_Status_Reason" name="Flags">
+        <tp:docstring>
+          The connection status reason
+        </tp:docstring>
+      </tp:member>
+    </tp:struct>
+
     <method name="SetPresence">
       <tp:docstring>
         Request a presence.
@@ -205,7 +232,7 @@
       <arg type="u" name="requested_presence" direction="out">
         <tp:docstring>Requested presence</tp:docstring>
       </arg>
-      <arg type="a(suuu)" name="accounts" direction="out">
+      <arg type="a(suuu)" tp:type="AccountState[]" name="accounts" direction="out">
         <tp:docstring>
           An array of structures specifying the accounts' state, fields being:
           <ul>
diff --git a/xml/all.xml b/xml/all.xml
index 4f2e92ad..dbc0bdd8 100644
--- a/xml/all.xml
+++ b/xml/all.xml
@@ -8,6 +8,10 @@
 <xi:include href="nmc5.xml"/>
 
 <tp:generic-types>
+    <tp:external-type name="Connection_Status" type="u"
+	from="Telepathy specification (Connection)"/>
+    <tp:external-type name="Connection_Status_Reason" type="u"
+	from="Telepathy specification (Connection)"/>
     <tp:external-type name="Connection_Presence_Type" type="u"
 	from="Telepathy specification (Connection)"/>
     <tp:external-type name="Connection_Manager_Name" type="s"