From 49bbaf8e31009227b5c5ff1abf95fe6afb40d496 Mon Sep 17 00:00:00 2001
From: Aleksander Morgado <aleksander@lanedo.com>
Date: Tue, 22 Nov 2011 12:37:20 +0100
Subject: build: disable autogeneration of the 0.5 API header file

But keep it around as a static file, while we do the migration to the new
interface.
---
 build-aux/Makefile.am              |   1 -
 build-aux/header-generator-new.xsl | 190 -------------------------------
 build-aux/header-generator.xsl     | 227 +++++++++----------------------------
 3 files changed, 56 insertions(+), 362 deletions(-)
 delete mode 100644 build-aux/header-generator-new.xsl

(limited to 'build-aux')

diff --git a/build-aux/Makefile.am b/build-aux/Makefile.am
index 9fc2b976..1bf1c38d 100644
--- a/build-aux/Makefile.am
+++ b/build-aux/Makefile.am
@@ -1,7 +1,6 @@
 
 EXTRA_DIST = \
 	header-generator.xsl \
-	header-generator-new.xsl \
 	mm-enums-types.h.template \
 	mm-enums-types.c.template \
 	mm-enums-errors.h.template \
diff --git a/build-aux/header-generator-new.xsl b/build-aux/header-generator-new.xsl
deleted file mode 100644
index 4cd0dea0..00000000
--- a/build-aux/header-generator-new.xsl
+++ /dev/null
@@ -1,190 +0,0 @@
-<!-- Generate a C header file from the Modem Manager specification.
-
-Copyright (C) 2006, 2007 Collabora Limited
-Copyright (C) 2011 Google, Inc.
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
--->
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
-  exclude-result-prefixes="tp">
-
-  <!--Don't move the declaration of the HTML namespace up here - XMLNSs
-  don't work ideally in the presence of two things that want to use the
-  absence of a prefix, sadly. -->
-
-  <xsl:strip-space elements="node interface"/>
-  <xsl:template match="*" mode="identity">
-    <xsl:copy>
-      <xsl:apply-templates mode="identity"/>
-    </xsl:copy>
-  </xsl:template>
-
-  <xsl:template match="signal">
-    <xsl:variable name="varname">
-      <xsl:value-of select="translate(@name,
-			    'abcdefghijklmnopqrstuvwxyz. ',
-			    'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
-    </xsl:variable>
-    <xsl:variable name="intname">
-      <xsl:choose>
-        <xsl:when test="starts-with(../@name, 'org.freedesktop.ModemManager1.')">
-          <xsl:value-of select="translate(substring-after(../@name, 'org.freedesktop.ModemManager1.'),
-			       'abcdefghijklmnopqrstuvwxyz. ',
-			       'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
-         </xsl:when>
-         <xsl:otherwise>
-           <xsl:text>MANAGER</xsl:text>
-         </xsl:otherwise>
-       </xsl:choose>
-    </xsl:variable>
-#define <xsl:value-of select="concat('MM_', $intname, '_SIGNAL_', $varname)"/> "<xsl:value-of select="@name"/>"</xsl:template>
-
-  <xsl:template match="property">
-    <xsl:variable name="varname">
-      <xsl:value-of select="translate(@name,
-			    'abcdefghijklmnopqrstuvwxyz. ',
-			    'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
-    </xsl:variable>
-    <xsl:variable name="intname">
-      <xsl:choose>
-        <xsl:when test="starts-with(../@name, 'org.freedesktop.ModemManager1.')">
-          <xsl:value-of select="translate(substring-after(../@name, 'org.freedesktop.ModemManager1.'),
-			       'abcdefghijklmnopqrstuvwxyz. ',
-			       'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
-         </xsl:when>
-         <xsl:otherwise>
-           <xsl:text>MANAGER</xsl:text>
-         </xsl:otherwise>
-       </xsl:choose>
-    </xsl:variable>
-#define <xsl:value-of select="concat('MM_', $intname, '_PROPERTY_', $varname)"/> "<xsl:value-of select="@name"/>"</xsl:template>
-
-  <xsl:template match="method">
-    <xsl:variable name="varname">
-      <xsl:value-of select="translate(@name,
-			    'abcdefghijklmnopqrstuvwxyz. ',
-                            'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
-    </xsl:variable>
-    <xsl:variable name="intname">
-      <xsl:choose>
-        <xsl:when test="starts-with(../@name, 'org.freedesktop.ModemManager1.')">
-          <xsl:value-of select="translate(substring-after(../@name, 'org.freedesktop.ModemManager1.'),
-			       'abcdefghijklmnopqrstuvwxyz. ',
-			       'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
-         </xsl:when>
-         <xsl:otherwise>
-           <xsl:text>MANAGER</xsl:text>
-         </xsl:otherwise>
-       </xsl:choose>
-    </xsl:variable>
-#define <xsl:value-of select="concat('MM_', $intname, '_METHOD_', $varname)"/> "<xsl:value-of select="@name"/>"</xsl:template>
-
-  <xsl:output method="text" indent="no" encoding="ascii"
-    omit-xml-declaration="yes" />
-
-  <xsl:template match="/tp:spec">
-/* Generated Header file do not edit */
-
-/*
- * ModemManager Interface Specification
- * Version 0.6
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA.
- *
- * Copyright (C) 2008 - 2009 Novell, Inc.
- * Copyright (C) 2009 - 2011 Red Hat, Inc.
- * Copyright (C) 2011 Google, Inc.
- */
-
-#ifndef _MODEM_MANAGER_NAMES_H_
-#define _MODEM_MANAGER_NAMES_H_
-
-#define MM_DBUS_PATH    "/org/freedesktop/ModemManager1"
-#define MM_DBUS_SERVICE "org.freedesktop.ModemManager1"
-
-/**************
- * Interfaces *
- **************/
-<xsl:for-each select="node/interface">
-  <xsl:apply-templates select="tp:docstring"/>
-  <xsl:variable name="varname">
-    <xsl:choose>
-      <xsl:when test="starts-with(@name, 'org.freedesktop.ModemManager1.')">
-        <xsl:value-of select="translate(substring-after(@name, 'org.freedesktop.ModemManager1.'),
-                              'abcdefghijklmnopqrstuvwxyz. ',
-                              'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:text></xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:variable name="prefix">
-    <xsl:choose>
-      <xsl:when test="string-length($varname) > 0">
-        <xsl:text>_</xsl:text>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:text></xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:if test="starts-with(@name, 'org.freedesktop.ModemManager1')">
-#define <xsl:value-of select="concat('MM_DBUS_INTERFACE', $prefix, $varname)"/> "<xsl:value-of select="@name"/>"</xsl:if></xsl:for-each>
-
-/******************************
- * Methods/Signals/Properties *
- ******************************/
-<xsl:for-each select="node/interface">
-/*
- * Interface '<xsl:value-of select="@name"/>'
- */
- <xsl:apply-templates select="method"/>
- <xsl:if test="count(method[*])!=0">
-   <xsl:text></xsl:text>
- </xsl:if>
- <xsl:apply-templates select="signal"/>
- <xsl:if test="count(signal[*])!=0">
-   <xsl:text></xsl:text>
- </xsl:if>
- <xsl:apply-templates select="property"/>
- <xsl:if test="count(property[*])!=0">
-   <xsl:text></xsl:text>
- </xsl:if>
-</xsl:for-each>
-
-#endif /*  _MODEM_MANAGER_NAMES_H_ */
-
-<!-- Ensure that the file ends with a newline -->
-<xsl:text>
-</xsl:text>
-</xsl:template>
-</xsl:stylesheet>
-
-<!-- vim:set sw=2 sts=2 et: -->
diff --git a/build-aux/header-generator.xsl b/build-aux/header-generator.xsl
index b97416c8..4cd0dea0 100644
--- a/build-aux/header-generator.xsl
+++ b/build-aux/header-generator.xsl
@@ -1,6 +1,7 @@
 <!-- Generate a C header file from the Modem Manager specification.
 
 Copyright (C) 2006, 2007 Collabora Limited
+Copyright (C) 2011 Google, Inc.
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
@@ -19,148 +20,39 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
   exclude-result-prefixes="tp">
+
   <!--Don't move the declaration of the HTML namespace up here - XMLNSs
   don't work ideally in the presence of two things that want to use the
   absence of a prefix, sadly. -->
 
-  <xsl:strip-space elements="node interface property tp:errors tp:mapping tp:member"/>
+  <xsl:strip-space elements="node interface"/>
   <xsl:template match="*" mode="identity">
     <xsl:copy>
       <xsl:apply-templates mode="identity"/>
     </xsl:copy>
   </xsl:template>
-  <xsl:template name="CamelCase">
-    <xsl:param name="text" />
-    <xsl:variable name="lowercase" select="'abcdefghijklmnopqrstuvwxyz'"/>
-    <xsl:variable name="uppercase" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'"/>
-    <xsl:if test="$text">
-      <!-- get word to title-case -->
-      <xsl:variable name="word">
-	<xsl:choose>
-	  <xsl:when test="contains($text, '_')">
-	    <xsl:value-of select="substring-before($text, '_')"/>
-	  </xsl:when>
-	  <xsl:otherwise>
-	    <xsl:value-of select="$text"/>
-	  </xsl:otherwise>
-	</xsl:choose>
-      </xsl:variable>
-      <!-- uppercase first character in word -->
-      <xsl:value-of select="translate(substring($word,1,1), $lowercase, $uppercase)"/>
-      <!-- lowercase all remaining characters in word -->
-      <xsl:value-of select="translate(substring($word,2), $uppercase, $lowercase)"/>
-      <!-- if any next chunk, recall template -->
-      <xsl:call-template name="CamelCase">
-	<xsl:with-param name="text" select="substring-after(substring($text,2), '_')"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:template>
-  <xsl:template match="tp:docstring">
-  </xsl:template>
-  <xsl:template match="tp:realdocstring">
-/* <xsl:apply-templates select="node()" mode="identity"/> */
-  </xsl:template>
-  <xsl:template match="tp:errors">
-    <xsl:apply-templates/>
-  </xsl:template>
-  <xsl:template match="tp:generic-types">
-    <xsl:call-template name="do-types"/>
-  </xsl:template>
-  <xsl:template name="do-types">
-    <xsl:if test="tp:simple-type">
-      <xsl:apply-templates select="tp:simple-type"/>
-    </xsl:if>
-    <xsl:if test="tp:enum">
-      <xsl:apply-templates select="tp:enum"/>
-    </xsl:if>
-    <xsl:if test="tp:flags">
-      <xsl:apply-templates select="tp:flags"/>
-    </xsl:if>
-  </xsl:template>
-  <xsl:template match="tp:error">
-    <xsl:apply-templates select="tp:docstring"/>
-    <xsl:variable name="nameprefix">
-        <xsl:value-of select="translate(substring-after(../@namespace, 'org.freedesktop.ModemManager.'),
-			      'abcdefghijklmnopqrstuvwxyz. ',
-			      'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
-      </xsl:variable>
-    <xsl:variable name="name">
+
+  <xsl:template match="signal">
+    <xsl:variable name="varname">
       <xsl:value-of select="translate(@name,
 			    'abcdefghijklmnopqrstuvwxyz. ',
-			    'ABCDEFGHIJKLMNOPQRSTUVWXYZ__')"/>
-      </xsl:variable>
-#define <xsl:value-of select="concat('MM_ERROR_', $nameprefix, '_', $name)"/> "<xsl:value-of select="translate(@name, ' ', '')"/>"</xsl:template>
-
-  <xsl:template match="tp:flags">
-/* <xsl:value-of select="@name"/> flag values */
-    <xsl:apply-templates select="tp:docstring" />
-    <xsl:variable name="value-prefix">
-      <xsl:choose>
-	<xsl:when test="@value-prefix">
-	  <xsl:value-of select="@value-prefix"/>
-	</xsl:when>
-	<xsl:otherwise>
-	  <xsl:value-of select="@name"/>
-	</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="enum-name">
-      <xsl:call-template name="CamelCase">
-	<xsl:with-param name="text" select="substring-after(@name,'MM_')"/>
-      </xsl:call-template>
+			    'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
     </xsl:variable>
-typedef enum {
-<xsl:for-each select="tp:flag">
-<xsl:text>    </xsl:text><xsl:value-of select="concat($value-prefix, '_', @suffix)"/><xsl:text> = </xsl:text><xsl:value-of select="@value"/><xsl:text>,
-</xsl:text>
-</xsl:for-each>
-<xsl:text>} </xsl:text><xsl:value-of select="concat('MM',$enum-name)"/><xsl:text>;
-</xsl:text>
-  </xsl:template>
-
-  <xsl:template match="tp:enum">
-/* <xsl:value-of select="@name"/> enum values */
-    <xsl:apply-templates select="tp:docstring" />
-    <xsl:variable name="value-prefix">
+    <xsl:variable name="intname">
       <xsl:choose>
-	<xsl:when test="@value-prefix">
-	  <xsl:value-of select="@value-prefix"/>
-	</xsl:when>
-	<xsl:otherwise>
-	  <xsl:value-of select="@name"/>
-	</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="enum-name">
-      <xsl:call-template name="CamelCase">
-	<xsl:with-param name="text" select="substring-after(@name,'MM_')"/>
-      </xsl:call-template>
+        <xsl:when test="starts-with(../@name, 'org.freedesktop.ModemManager1.')">
+          <xsl:value-of select="translate(substring-after(../@name, 'org.freedesktop.ModemManager1.'),
+			       'abcdefghijklmnopqrstuvwxyz. ',
+			       'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
+         </xsl:when>
+         <xsl:otherwise>
+           <xsl:text>MANAGER</xsl:text>
+         </xsl:otherwise>
+       </xsl:choose>
     </xsl:variable>
-typedef enum {
-<xsl:for-each select="tp:enumvalue">
-<xsl:text>    </xsl:text><xsl:value-of select="concat($value-prefix, '_', @suffix)"/><xsl:text> = </xsl:text><xsl:value-of select="@value"/><xsl:text>,
-</xsl:text>
-</xsl:for-each>
-<xsl:text>} </xsl:text><xsl:value-of select="concat('MM',$enum-name)"/><xsl:text>;
-</xsl:text>
-  </xsl:template>
-
-  <xsl:template match="tp:possible-errors/tp:error">
-    <xsl:variable name="name" select="@name"/>
-    <xsl:choose>
-      <xsl:when test="tp:docstring">
-        <xsl:apply-templates select="tp:docstring"/>
-      </xsl:when>
-      <xsl:when test="//tp:errors/tp:error[concat(../@namespace, '.', translate(@name, ' ', ''))=$name]/tp:docstring">
-        <xsl:apply-templates select="//tp:errors/tp:error[concat(../@namespace, '.', translate(@name, ' ', ''))=$name]/tp:docstring"/> <em xmlns="http://www.w3.org/1999/xhtml">(generic description)</em>
-      </xsl:when>
-      <xsl:otherwise>
-        (Undocumented.)
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
+#define <xsl:value-of select="concat('MM_', $intname, '_SIGNAL_', $varname)"/> "<xsl:value-of select="@name"/>"</xsl:template>
 
-  <xsl:template match="signal">
+  <xsl:template match="property">
     <xsl:variable name="varname">
       <xsl:value-of select="translate(@name,
 			    'abcdefghijklmnopqrstuvwxyz. ',
@@ -168,8 +60,8 @@ typedef enum {
     </xsl:variable>
     <xsl:variable name="intname">
       <xsl:choose>
-        <xsl:when test="starts-with(../@name, 'org.freedesktop.ModemManager.')">
-          <xsl:value-of select="translate(substring-after(../@name, 'org.freedesktop.ModemManager.'),
+        <xsl:when test="starts-with(../@name, 'org.freedesktop.ModemManager1.')">
+          <xsl:value-of select="translate(substring-after(../@name, 'org.freedesktop.ModemManager1.'),
 			       'abcdefghijklmnopqrstuvwxyz. ',
 			       'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
          </xsl:when>
@@ -178,7 +70,7 @@ typedef enum {
          </xsl:otherwise>
        </xsl:choose>
     </xsl:variable>
-#define <xsl:value-of select="concat('MM_', $intname, '_SIGNAL_', $varname)"/> "<xsl:value-of select="@name"/>"</xsl:template>
+#define <xsl:value-of select="concat('MM_', $intname, '_PROPERTY_', $varname)"/> "<xsl:value-of select="@name"/>"</xsl:template>
 
   <xsl:template match="method">
     <xsl:variable name="varname">
@@ -188,8 +80,8 @@ typedef enum {
     </xsl:variable>
     <xsl:variable name="intname">
       <xsl:choose>
-        <xsl:when test="starts-with(../@name, 'org.freedesktop.ModemManager.')">
-          <xsl:value-of select="translate(substring-after(../@name, 'org.freedesktop.ModemManager.'),
+        <xsl:when test="starts-with(../@name, 'org.freedesktop.ModemManager1.')">
+          <xsl:value-of select="translate(substring-after(../@name, 'org.freedesktop.ModemManager1.'),
 			       'abcdefghijklmnopqrstuvwxyz. ',
 			       'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
          </xsl:when>
@@ -200,9 +92,6 @@ typedef enum {
     </xsl:variable>
 #define <xsl:value-of select="concat('MM_', $intname, '_METHOD_', $varname)"/> "<xsl:value-of select="@name"/>"</xsl:template>
 
-  <xsl:template match="tp:copyright">
-  </xsl:template>
-
   <xsl:output method="text" indent="no" encoding="ascii"
     omit-xml-declaration="yes" />
 
@@ -210,8 +99,8 @@ typedef enum {
 /* Generated Header file do not edit */
 
 /*
- * <xsl:value-of select="tp:title"/>
- * version <xsl:value-of select="tp:version"/>
+ * ModemManager Interface Specification
+ * Version 0.6
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -230,13 +119,14 @@ typedef enum {
  *
  * Copyright (C) 2008 - 2009 Novell, Inc.
  * Copyright (C) 2009 - 2011 Red Hat, Inc.
+ * Copyright (C) 2011 Google, Inc.
  */
 
-#ifndef _MODEM_MANAGER_H_
-#define _MODEM_MANAGER_H_
+#ifndef _MODEM_MANAGER_NAMES_H_
+#define _MODEM_MANAGER_NAMES_H_
 
-#define MM_DBUS_PATH    "/org/freedesktop/ModemManager"
-#define MM_DBUS_SERVICE "org.freedesktop.ModemManager"
+#define MM_DBUS_PATH    "/org/freedesktop/ModemManager1"
+#define MM_DBUS_SERVICE "org.freedesktop.ModemManager1"
 
 /**************
  * Interfaces *
@@ -245,56 +135,51 @@ typedef enum {
   <xsl:apply-templates select="tp:docstring"/>
   <xsl:variable name="varname">
     <xsl:choose>
-      <xsl:when test="starts-with(@name, 'org.freedesktop.ModemManager.')">
-	<xsl:value-of select="translate(substring-after(@name, 'org.freedesktop.ModemManager.'),
-			      'abcdefghijklmnopqrstuvwxyz. ',
-			      'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
+      <xsl:when test="starts-with(@name, 'org.freedesktop.ModemManager1.')">
+        <xsl:value-of select="translate(substring-after(@name, 'org.freedesktop.ModemManager1.'),
+                              'abcdefghijklmnopqrstuvwxyz. ',
+                              'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
       </xsl:when>
       <xsl:otherwise>
-	<xsl:text></xsl:text>
+        <xsl:text></xsl:text>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:variable>
   <xsl:variable name="prefix">
     <xsl:choose>
       <xsl:when test="string-length($varname) > 0">
-	<xsl:text>_</xsl:text>
+        <xsl:text>_</xsl:text>
       </xsl:when>
       <xsl:otherwise>
-	<xsl:text></xsl:text>
+        <xsl:text></xsl:text>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:variable>
-  <xsl:if test="starts-with(@name, 'org.freedesktop.ModemManager')">
+  <xsl:if test="starts-with(@name, 'org.freedesktop.ModemManager1')">
 #define <xsl:value-of select="concat('MM_DBUS_INTERFACE', $prefix, $varname)"/> "<xsl:value-of select="@name"/>"</xsl:if></xsl:for-each>
 
-/***********************
- * Methods/Enums/Flags *
- ***********************/
+/******************************
+ * Methods/Signals/Properties *
+ ******************************/
 <xsl:for-each select="node/interface">
 /*
- * Interface <xsl:value-of select="@name"/>
+ * Interface '<xsl:value-of select="@name"/>'
  */
-  <xsl:apply-templates select="method"/>
-  <xsl:if test="count(method[*])!=0">
-  <xsl:text>
-</xsl:text>
-  </xsl:if>
-  <xsl:apply-templates select="signal"/>
-  <xsl:if test="count(signal[*])!=0">
-  <xsl:text>
-</xsl:text>
-  </xsl:if>
-  <xsl:apply-templates select="tp:enum"/>
-  <xsl:apply-templates select="tp:flags"/>
+ <xsl:apply-templates select="method"/>
+ <xsl:if test="count(method[*])!=0">
+   <xsl:text></xsl:text>
+ </xsl:if>
+ <xsl:apply-templates select="signal"/>
+ <xsl:if test="count(signal[*])!=0">
+   <xsl:text></xsl:text>
+ </xsl:if>
+ <xsl:apply-templates select="property"/>
+ <xsl:if test="count(property[*])!=0">
+   <xsl:text></xsl:text>
+ </xsl:if>
 </xsl:for-each>
 
-/**********
- * Errors *
- **********/
-<xsl:apply-templates select="tp:errors"/>
-
-#endif /*  _MODEM_MANAGER_H_ */
+#endif /*  _MODEM_MANAGER_NAMES_H_ */
 
 <!-- Ensure that the file ends with a newline -->
 <xsl:text>
-- 
cgit v1.2.3-70-g09d2