Attachment 35960 Details for Bug 28325 – a hacky workaround

[patch] a hacky workaround

hack.diff (text/plain), 1.79 KB, created by Danielle Madeley on 2010-05-30 20:19:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Danielle Madeley

Created: 2010-05-30 20:19:04 UTC

Size: 1.79 KB

patch

obsolete

>From 47899d5a3431c90945f1fe0572554c55558d1379 Mon Sep 17 00:00:00 2001
>From: Danielle Madeley <danielle.madeley@collabora.co.uk>
>Date: Mon, 31 May 2010 13:13:36 +1000
>Subject: [PATCH] HACK: hacky workaround to fix problem with doc-generator.xsl
>
>https://bugs.freedesktop.org/show_bug.cgi?id=28325
>---
> extensions/all.xml      |    2 +-
> tools/doc-generator.xsl |    9 ++++++++-
> 2 files changed, 9 insertions(+), 2 deletions(-)
>
>diff --git a/extensions/all.xml b/extensions/all.xml
>index 517c208..88f8e25 100644
>--- a/extensions/all.xml
>+++ b/extensions/all.xml
>@@ -27,7 +27,7 @@
>   <tp:external-type name="VCard_Type_Parameter" type="s"
>     from="Telepathy specification"/>
>   <tp:external-type name="Contact_Info_Field" type="sasas"
>-    from="Telepathy specification"/>
>+    tp:array-type="(sasas)" from="Telepathy specification"/>
> </tp:generic-types>
> 
> 
>diff --git a/tools/doc-generator.xsl b/tools/doc-generator.xsl
>index 76fc969..96927b3 100644
>--- a/tools/doc-generator.xsl
>+++ b/tools/doc-generator.xsl
>@@ -812,7 +812,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>           <xsl:text>}</xsl:text>
>         </xsl:when>
>         <xsl:when test="//tp:external-type[@name=$single-type]">
>-          <xsl:value-of select="string(//tp:external-type[@name=$single-type]/@type)"/>
>+          <xsl:choose>
>+            <xsl:when test="//tp:external-type[@name=$single-type]/@tp:array-type">
>+              <xsl:value-of select="string(//tp:external-type[@name=$single-type]/@tp:array-type)"/>
>+            </xsl:when>
>+            <xsl:otherwise>
>+              <xsl:value-of select="string(//tp:external-type[@name=$single-type]/@type)"/>
>+            </xsl:otherwise>
>+          </xsl:choose>
>         </xsl:when>
>         <xsl:otherwise>
>           <xsl:message terminate="yes">
>-- 
>1.7.0.4
>

Actions: View | Splinter Review

Attachments on bug 28325: 35960

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.